diff --git a/.buildkite/hooks/post-command b/.buildkite/hooks/post-command
index dc5d8c0e7..97af6dc6d 100755
--- a/.buildkite/hooks/post-command
+++ b/.buildkite/hooks/post-command
@@ -12,13 +12,13 @@ fi
 if [[ ! $BUILDKITE_BRANCH =~ ^(master|v.*) ]] && [[ $BUILDKITE_COMMAND_EXIT_STATUS == 0 ]]; then
   if [[ $BUILDKITE_LABEL == ":hammer_and_wrench: Unit Test" ]]; then
     echo "--- :codecov: Upload coverage reports"
-    bash <(curl -s https://codecov.io/bash) -c -f "coverage.txt" -F backend
-    bash <(curl -s https://codecov.io/bash) -c -F frontend
+    bash <(curl -s --connect-timeout 10 --retry 10 --retry-max-time 0 https://codecov.io/bash) -Z -c -f "coverage.txt" -F backend
+    bash <(curl -s --connect-timeout 10 --retry 10 --retry-max-time 0 https://codecov.io/bash) -Z -c -F frontend
   fi
 
   if [[ $BUILDKITE_LABEL =~ ":selenium:" ]]; then
     echo "--- :codecov: Upload coverage reports"
-    bash <(curl -s https://codecov.io/bash) -c -f "coverage.txt" -F backend
+    bash <(curl -s --connect-timeout 10 --retry 10 --retry-max-time 0 https://codecov.io/bash) -Z -c -f "coverage.txt" -F backend
   fi
 fi
 
diff --git a/cmd/authelia-scripts/cmd_docker.go b/cmd/authelia-scripts/cmd_docker.go
index fa2f17de0..76184d693 100644
--- a/cmd/authelia-scripts/cmd_docker.go
+++ b/cmd/authelia-scripts/cmd_docker.go
@@ -46,7 +46,7 @@ func dockerBuildOfficialImage(arch string) error {
 	// Set default Architecture Dockerfile to amd64.
 	dockerfile := "Dockerfile"
 	// Set version of QEMU.
-	qemuversion := "v4.2.0-7"
+	qemuversion := "v5.0.0-2"
 
 	// If not the default value.
 	if arch != defaultArch {