diff --git a/ci-automation/ci-config.env b/ci-automation/ci-config.env
index bdaf65e12fd..de09de631b4 100644
--- a/ci-automation/ci-config.env
+++ b/ci-automation/ci-config.env
@@ -170,5 +170,6 @@ BRIGHTBOX_PARALLEL="${PARALLEL_TESTS:-1}"
 : ${HETZNER_IMAGE_NAME:='flatcar_production_hetzner_image.bin.bz2'}
 : ${HETZNER_amd64_INSTANCE_TYPE:="cpx11"}
 : ${HETZNER_arm64_INSTANCE_TYPE:="cax11"}
+: ${HETZNER_arm64_LOCATION:="fsn1"}
+: ${HETZNER_amd64_LOCATION:="hel1"}
 HETZNER_PARALLEL="${PARALLEL_TESTS:-1}"
-HETZNER_LOCATION="${HETZNER_LOCATION:-fsn1}"
diff --git a/ci-automation/vendor-testing/hetzner.sh b/ci-automation/vendor-testing/hetzner.sh
index 11991694596..88a85d7d526 100755
--- a/ci-automation/vendor-testing/hetzner.sh
+++ b/ci-automation/vendor-testing/hetzner.sh
@@ -13,6 +13,9 @@ source ci-automation/vendor_test.sh
 hetzner_instance_type_var="HETZNER_${CIA_ARCH}_INSTANCE_TYPE"
 hetzner_instance_type="${!hetzner_instance_type_var}"
 
+hetzner_location_var="HETZNER_${CIA_ARCH}_LOCATION"
+hetzner_location="${!hetzner_location_var}"
+
 # HETZNER_TPS_TOKEN should be provided by sdk_container/.env
 
 # We first need to create a temporary project using HETZNER_TPS_TOKEN
@@ -31,7 +34,7 @@ HETZNER_TOKEN=$(curl \
 # Upload the image on Hetzner.
 IMAGE_ID=$(ore hetzner \
   --hetzner-token="${HETZNER_TOKEN}" \
-  --hetzner-location="${HETZNER_LOCATION}" \
+  --hetzner-location="${hetzner_location}" \
   create-image \
   --board="${CIA_ARCH}-usr" \
   --name flatcar-"${CIA_VERNUM}" \
@@ -51,7 +54,7 @@ timeout --signal=SIGQUIT 2h kola run \
   --platform=hetzner \
   --hetzner-token="${HETZNER_TOKEN}" \
   --hetzner-server-type="${hetzner_instance_type}" \
-  --hetzner-location="${HETZNER_LOCATION}" \
+  --hetzner-location="${hetzner_location}" \
   --hetzner-image=${IMAGE_ID} \
   "${@}"