diff --git a/.github/workflows/push-master.yml b/.github/workflows/push-master.yml
index 2057c9fa..6007f64a 100644
--- a/.github/workflows/push-master.yml
+++ b/.github/workflows/push-master.yml
@@ -82,7 +82,7 @@ jobs:
       - name: Wake-up docker
         if: matrix.runner == 'ubuntu-24.04-arm'
         run: |
-          sudo systemctl start docker
+          (sudo systemctl start docker) || (echo "Retrying docker" && sleep 5 && sudo systemctl start docker && sleep 5)
 
       # checkout
       - uses: actions/checkout@v4.2.2
diff --git a/.github/workflows/upload-to-github-pages.yml b/.github/workflows/upload-to-github-pages.yml
index 3275de8c..957bad1c 100644
--- a/.github/workflows/upload-to-github-pages.yml
+++ b/.github/workflows/upload-to-github-pages.yml
@@ -79,7 +79,7 @@ jobs:
       - name: Wake-up docker
         if: matrix.runner == 'ubuntu-24.04-arm'
         run: |
-          sudo systemctl start docker
+          (sudo systemctl start docker) || (echo "Retrying docker" && sleep 5 && sudo systemctl start docker && sleep 5)
     
       # checkout
       - uses: actions/checkout@v4.2.2
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7990093a..b918a819 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,6 +9,9 @@ message( STATUS "CMake Version: ${CMAKE_VERSION}" )
 
 PROJECT(HyperHdr)
 
+if (OVERRIDE_ARCHITECTURE)
+	SET ( CMAKE_SYSTEM_PROCESSOR "${OVERRIDE_ARCHITECTURE}")
+endif(OVERRIDE_ARCHITECTURE)
 
 set(OUR_CMAKE_MODULES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_modules)
 set(CMAKE_MODULE_PATH ${OUR_CMAKE_MODULES} ${CMAKE_MODULE_PATH})
diff --git a/build.sh b/build.sh
index 16b53abf..13fad649 100755
--- a/build.sh
+++ b/build.sh
@@ -188,6 +188,10 @@ elif [[ "$CI_NAME" == 'linux' ]]; then
 		BUILD_OPTION="-DUSE_CCACHE_CACHING=OFF ${ARCHIVE_OPTION}"
 		cache_env="true"
 	fi
+
+	if [[ $DOCKER_IMAGE == *"armv6l"* ]] && [[ $CI_TYPE == "github_action" ]]; then
+		BUILD_OPTION="-DOVERRIDE_ARCHITECTURE=armv6l ${BUILD_OPTION}"		
+	fi
 	
 	echo "Build option: ${BUILD_OPTION}, ccache: ${cache_env}"