diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86cee353c9..0a6064926d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,6 +56,11 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
         $<$<COMPILE_LANGUAGE:CXX>:-Wno-vla-extension>
         $<$<COMPILE_LANGUAGE:CXX>:-Wno-zero-length-array>
     )
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND NOT DEFINED CMAKE_CXX_CLANG_TIDY)
+    # The following is not supported by clang, which also causes issues when using clang-tidy
+    add_compile_options(
+        -Wno-format-truncation
+    )
 endif()
 
 find_program(VALGRIND valgrind) # Find valgrind, and use it instead of leak check
diff --git a/docs/doxygen/generate_docs.bash b/docs/doxygen/generate_docs.bash
index db2a650702..c95cf4cd9e 100755
--- a/docs/doxygen/generate_docs.bash
+++ b/docs/doxygen/generate_docs.bash
@@ -70,7 +70,7 @@ function make_version
     echo "[INFO] Building fprime"
     rm -rf "${DOCS_CACHE}"
 
-    fprime-util generate --build-cache ${DOCS_CACHE} -DCMAKE_BUILD_TYPE=Release -DFPRIME_SKIP_TOOLS_VERSION_CHECK=ON 1>/dev/null
+    fprime-util generate --build-cache ${DOCS_CACHE} -DCMAKE_C_COMPILER=gcc-10 -DCMAKE_CXX_COMPILER=g++-10 1>/dev/null
     fprime-util build --build-cache ${DOCS_CACHE} --all -j32 1> /dev/null
 
     if (( $? != 0 ))