diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2711b73..033e433 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -40,16 +40,16 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: 'Build and push Docker image $IMAGE_BASE_NAME:${{ github.ref_name }}'
+      - name: 'Build and push Docker image ${{ env.IMAGE_BASE_NAME }}:${{ github.ref_name }}'
         uses: docker/build-push-action@v6
         with:
           platforms: linux/amd64,linux/arm64
           file: build/standard/docker/Dockerfile
           build-args: CONTAINER_VERSION=${{ github.ref_name }}
           push: ${{ github.event_name != 'pull_request' }}
-          tags: $IMAGE_BASE_NAME:${{ github.ref_name }}, $IMAGE_BASE_NAME:latest
+          tags: ${{ env.IMAGE_BASE_NAME }}:${{ github.ref_name }}, ${{ env.IMAGE_BASE_NAME }}:latest
 
-      - name: 'Build and push Docker image $IMAGE_BASE_NAME-$VARIANT:${{ github.ref_name }}'
+      - name: 'Build and push Docker image ${{ env.IMAGE_BASE_NAME }}-$VARIANT:${{ github.ref_name }}'
         env: 
           VARIANT: plugins
         uses: docker/build-push-action@v6
@@ -58,9 +58,9 @@ jobs:
           file: build/$VARIANT/docker/Dockerfile
           build-args: CONTAINER_VERSION=${{ github.ref_name }}
           push: ${{ github.event_name != 'pull_request' }}
-          tags: $IMAGE_BASE_NAME-$VARIANT:${{ github.ref_name }}, $IMAGE_BASE_NAME-$VARIANT:latest
+          tags: ${{ env.IMAGE_BASE_NAME }}-$VARIANT:${{ github.ref_name }}, ${{ env.IMAGE_BASE_NAME }}-$VARIANT:latest
 
-      - name: 'Build and push Docker image $IMAGE_BASE_NAME-$VARIANT:${{ github.ref_name }}'
+      - name: 'Build and push Docker image ${{ env.IMAGE_BASE_NAME }}-$VARIANT:${{ github.ref_name }}'
         env:
           VARIANT: arm-none-eabi
         uses: docker/build-push-action@v6
@@ -69,9 +69,9 @@ jobs:
           file: build/$VARIANT/docker/Dockerfile
           build-args: CONTAINER_VERSION=${{ github.ref_name }}
           push: ${{ github.event_name != 'pull_request' }}
-          tags: $IMAGE_BASE_NAME-$VARIANT:${{ github.ref_name }}, $IMAGE_BASE_NAME-$VARIANT:latest
+          tags: ${{ env.IMAGE_BASE_NAME }}-$VARIANT:${{ github.ref_name }}, ${{ env.IMAGE_BASE_NAME }}-$VARIANT:latest
 
-      - name: 'Build and push Docker image $IMAGE_BASE_NAME-$VARIANT:${{ github.ref_name }}'
+      - name: 'Build and push Docker image ${{ env.IMAGE_BASE_NAME }}-$VARIANT:${{ github.ref_name }}'
         env:
           VARIANT: arm-none-eabi-plugins
         uses: docker/build-push-action@v6
@@ -80,5 +80,5 @@ jobs:
           file: build/$VARIANT/docker/Dockerfile
           build-args: CONTAINER_VERSION=${{ github.ref_name }}
           push: ${{ github.event_name != 'pull_request' }}
-          tags: $IMAGE_BASE_NAME-$VARIANT:${{ github.ref_name }}, $IMAGE_BASE_NAME-$VARIANT:latest
+          tags: ${{ env.IMAGE_BASE_NAME }}-$VARIANT:${{ github.ref_name }}, ${{ env.IMAGE_BASE_NAME }}-$VARIANT:latest