diff --git a/.github/workflows/images_build.yml b/.github/workflows/images_build.yml
index 778c1cc13..e5cd1340a 100644
--- a/.github/workflows/images_build.yml
+++ b/.github/workflows/images_build.yml
@@ -490,8 +490,8 @@ jobs:
          BASE_IMAGE: ${{ env.BASE_BUILD_NAME }}
          IMAGES_PREFIX: ${{ env.IMAGES_PREFIX }}
         run: |
-            BASE_TAG=$(cat "$BASE_IMAGE_$MATRIX_OS")
-            BUILD_BASE_IMAGE="$DOCKER_REPOSITORY/$IMAGES_PREFIX$BASE_IMAGE@${BASE_TAG}"
+            BASE_TAG=$(cat "${BASE_IMAGE}_${MATRIX_OS}")
+            BUILD_BASE_IMAGE="${DOCKER_REPOSITORY}/${IMAGES_PREFIX}${BASE_IMAGE}@${BASE_TAG}"
 
             echo "::group::Base build image information"
             echo "base_tag=${BASE_TAG}"
@@ -787,7 +787,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ env.DOCKER_REPOSITORY }}/zabbix-${{ matrix.build }}
+          images: ${{ env.DOCKER_REPOSITORY }}/${{ env.IMAGES_PREFIX}}${{ matrix.build }}
           tags: |
             type=semver,enable=${{ needs.init_build.outputs.current_branch != 'trunk' }},pattern={{version}},prefix=${{ matrix.os }}-
             type=semver,enable=${{ needs.init_build.outputs.current_branch != 'trunk' }},pattern={{version}},suffix=-${{ matrix.os }}
@@ -813,9 +813,10 @@ jobs:
           BUILD_BASE: ${{ steps.build_base_image.outputs.build_base }}
           MATRIX_OS: ${{ matrix.os }}
           DOCKER_REPOSITORY: ${{ env.DOCKER_REPOSITORY }}
+          IMAGES_PREFIX: ${{ env.IMAGES_PREFIX }}
         run: |
             BASE_TAG=$(cat "${BUILD_BASE}_${MATRIX_OS}")
-            BUILD_BASE_IMAGE=$DOCKER_REPOSITORY/zabbix-$BUILD_BASE@${BASE_TAG}
+            BUILD_BASE_IMAGE=${DOCKER_REPOSITORY}/${IMAGES_PREFIX}${BUILD_BASE}@${BASE_TAG}
 
             echo "::group::Base build image information"
             echo "base_tag=${BASE_TAG}"