diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml
index 8581e0f..3c4a738 100644
--- a/.github/workflows/containers.yml
+++ b/.github/workflows/containers.yml
@@ -54,13 +54,13 @@ jobs:
         run: |
           echo ::set-output name=docker-hub-namespace::${DOCKER_HUB_NAMESPACE}
 
-          NAME=zmk-${{ matrix.target }}-${{ matrix.architecture }}
-          echo ::set-output name=name::${NAME}
+          REPOSITORY_NAME=zmk-${{ matrix.target }}-${{ matrix.architecture }}
+          echo ::set-output name=repository-name::${REPOSITORY_NAME}
 
-          CANDIDATE_TAG=${NAME}:${{ github.sha }}
+          CANDIDATE_TAG=${REPOSITORY_NAME}:${{ github.sha }}
           echo ::set-output name=candidate-tag::${CANDIDATE_TAG}
 
-          VERSIONS_TAG=${NAME}:${{ env.zephyr-version }}-${{ env.zephyr-sdk-version }}
+          VERSIONS_TAG=${REPOSITORY_NAME}:${{ env.zephyr-version }}-${{ env.zephyr-sdk-version }}
           echo ::set-output name=versions-tag::${VERSIONS_TAG}
 
           MAJOR=$(echo ${{ env.zephyr-version }} | cut -d'.' -f 1)
@@ -68,7 +68,7 @@ jobs:
           MAJOR_MINOR=${MAJOR}.${MINOR}
           echo ::set-output name=major-minor::${MAJOR_MINOR}
 
-          LATEST_TAG=${NAME}:${MAJOR_MINOR}
+          LATEST_TAG=${REPOSITORY_NAME}:${MAJOR_MINOR}
           echo ::set-output name=latest-tag::${LATEST_TAG}
 
           RELEASE_TRIGGER_TAG=${{ env.zephyr-version }}-${{ env.zephyr-sdk-version }}