diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
index 61223dd4c..04e49a11f 100644
--- a/.github/workflows/build-and-push.yml
+++ b/.github/workflows/build-and-push.yml
@@ -54,7 +54,7 @@ jobs:
       - name: Prepare
         id: prepare
         run: |
-          DOCKER_IMAGE=registry-hkproxy.fit2cloud.com/maxkb/maxkb
+          DOCKER_IMAGE=${{ secrets.FIT2CLOUD_REGISTRY_HOST }}/maxkb/maxkb
           DOCKER_PLATFORMS=${{ github.event.inputs.architecture }}
           TAG_NAME=${{ github.event.inputs.dockerImageTag }}
           if [[ ${TAG_NAME} == *dev* ]]; then
@@ -78,7 +78,7 @@ jobs:
       - name: Login to FIT2CLOUD Registry
         uses: docker/login-action@v3
         with:
-          registry: registry-hkproxy.fit2cloud.com
+          registry: ${{ secrets.FIT2CLOUD_REGISTRY_HOST }}
           username: ${{ secrets.FIT2CLOUD_REGISTRY_USERNAME }}
           password: ${{ secrets.FIT2CLOUD_REGISTRY_PASSWORD }}
       - name: Docker Buildx (build-and-push)