diff --git a/.ci/ci_build.sh b/.ci/ci_build.sh
index 887e591fe..1d723b13b 100755
--- a/.ci/ci_build.sh
+++ b/.ci/ci_build.sh
@@ -16,7 +16,7 @@ else
 	CI_NAME="$(uname -s | tr '[:upper:]' '[:lower:]')"
 fi
 
-if [[ "$USE_CCACHE" == '1' ]]; then
+if [[ "$BUILD_ARCHIVES" == '0' ]]; then
 	IS_ARCHIVE_SKIPPED=" -DDO_NOT_BUILD_ARCHIVES=ON"
 else
 	IS_ARCHIVE_SKIPPED=" -DDO_NOT_BUILD_ARCHIVES=OFF"
diff --git a/.github/workflows/push-master.yml b/.github/workflows/push-master.yml
index d986f021b..18ebc428e 100644
--- a/.github/workflows/push-master.yml
+++ b/.github/workflows/push-master.yml
@@ -7,6 +7,7 @@ env:
     USE_CACHE: "1"
     RESET_CACHE: "0"
     USE_CODEQL: "0"
+    BUILD_ARCHIVES: ${{ startsWith(github.event.ref, 'refs/tags') && 1 || 0 }}
 
 jobs:
 
@@ -21,7 +22,7 @@ jobs:
     strategy:
       matrix:
         linuxVersion: [ bullseye ]
-        dockerImage: [ x86_64, rpi012-armv6l, arm-aarch64 ]
+        dockerImage: [ x86_64, arm-32bit-armv6l, arm-64bit-aarch64 ]
         include:        
           - dockerImage: x86_64
             linuxVersion: bullseye
@@ -31,11 +32,11 @@ jobs:
             linuxVersion: jammy
             dockerName: Ubuntu 22.04 LTS (x86_64)
             platform: linux
-          - dockerImage: rpi012-armv6l
+          - dockerImage: arm-32bit-armv6l
             linuxVersion: bullseye
             dockerName: Debian Bullseye (ARM 32-bit Raspberry Pi OS)
             platform: rpi
-          - dockerImage: arm-aarch64
+          - dockerImage: arm-64bit-aarch64
             linuxVersion: bullseye
             dockerName: Debian Bullseye (ARM 64-bit Raspberry Pi OS)
             platform: rpi            
diff --git a/.github/workflows/upload-to-github-pages.yml b/.github/workflows/upload-to-github-pages.yml
index 9f638169f..2797c9f62 100644
--- a/.github/workflows/upload-to-github-pages.yml
+++ b/.github/workflows/upload-to-github-pages.yml
@@ -21,17 +21,17 @@ jobs:
       matrix:
         niceName: [ Debian ]
         linuxVersion: [ bullseye, bookworm ]
-        dockerImage: [ x86_64, rpi012-armv6l, arm-aarch64 ]
+        dockerImage: [ x86_64, arm-32bit-armv6l, arm-64bit-aarch64 ]
         include:        
           - dockerImage: x86_64
             dockerName: Debian (amd64)
             arch: amd64
             platform: linux
-          - dockerImage: rpi012-armv6l
+          - dockerImage: arm-32bit-armv6l
             dockerName: Debian (armhf)
             arch: armhf
             platform: rpi
-          - dockerImage: arm-aarch64
+          - dockerImage: arm-64bit-aarch64
             dockerName: Debian (arm64)
             arch: arm64
             platform: rpi   
diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt
index 1d9738dca..06dbf6df6 100644
--- a/dependencies/CMakeLists.txt
+++ b/dependencies/CMakeLists.txt
@@ -25,9 +25,11 @@ else ()
 	
 	set(CMAKE_POLICY_DEFAULT_CMP0071 NEW)
 
-	file(READ "${CMAKE_CURRENT_SOURCE_DIR}/external/flatbuffers/CMakeLists.txt" FILE_CONTENTS_FLAT)
-	string(REPLACE "-Werror " "-Wno-stringop-overflow " FILE_CONTENTS_FLAT "${FILE_CONTENTS_FLAT}")
-	file(WRITE "${CMAKE_CURRENT_SOURCE_DIR}/external/flatbuffers/CMakeLists.txt" "${FILE_CONTENTS_FLAT}")
+	if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13.0)
+		file(READ "${CMAKE_CURRENT_SOURCE_DIR}/external/flatbuffers/CMakeLists.txt" FILE_CONTENTS_FLAT)
+		string(REPLACE "-Werror " "-Wno-stringop-overflow " FILE_CONTENTS_FLAT "${FILE_CONTENTS_FLAT}")
+		file(WRITE "${CMAKE_CURRENT_SOURCE_DIR}/external/flatbuffers/CMakeLists.txt" "${FILE_CONTENTS_FLAT}")
+	endif()
 
 	add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/external/flatbuffers)