diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml
index 5a0f99ec972700a6260ca0eba8b2949e31e552bf..06acf0ad5f0a69bd6281d054352706e01af3ba5f 100644
--- a/.github/workflows/build-container.yml
+++ b/.github/workflows/build-container.yml
@@ -10,8 +10,9 @@ jobs:
   build:
     runs-on: ubuntu-20.04
     env:
-      DOCKER_REPO_PREFIX: inspircd
-      DOCKER_REPO_NAME: inspircd-docker
+      DOCKER_REPO: inspircd/inspircd-docker
+      GITHUB_BRANCH: master
+      GITHUB_REPO: inspircd/inspircd-docker
       INSP_VERSION: v3.15.0
     steps:
       -
@@ -20,24 +21,22 @@ jobs:
         name: Pipeline variables
         id: pipeline_vars
         run: |
-          EXPECTED="inspircd/inspircd-docker refs/heads/master";
-          ACTUAL="$REPO $REF";
-
+          EXPECTED="$GITHUB_REPO $GITHUB_BRANCH"
           echo "Expected: $EXPECTED"
+
+          ACTUAL="${{ github.repository }} ${{ github.ref_name }}"
           echo "Actual:   $ACTUAL"
 
-          if [ "$EXPECTED" == "$ACTUAL" ]; then
-            echo "On inspircd/inspircd-docker repo, master branch - building all architectures and pushing to Docker Hub"
+          if [ "$EXPECTED" == "$ACTUAL" ]
+          then
+            echo "On $GITHUB_REPO repo, $GITHUB_BRANCH branch - building all architectures and pushing to Docker Hub"
             echo "push=true" >> $GITHUB_OUTPUT
             echo "platforms=linux/amd64,linux/arm64" >> $GITHUB_OUTPUT
           else
-            echo "Not on main repo and master branch - only building amd64 architecture and not pushing to Docker Hub"
+            echo "Not on $GITHUB_REPO repo and $GITHUB_BRANCH branch - only building amd64 architecture and not pushing to Docker Hub"
             echo "push=false" >> $GITHUB_OUTPUT
             echo "platforms=linux/amd64" >> $GITHUB_OUTPUT
           fi
-        env:
-          REPO: ${{ github.repository }}
-          REF: ${{ github.ref }}
       -
         name: Prepare environment
         run: |
@@ -64,7 +63,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@v4
         with:
-          images: ${{ env.DOCKER_REPO_PREFIX }}/${{ env.DOCKER_REPO_NAME }}
+          images: ${{ env.DOCKER_REPO }}
           tags: |
             type=semver,pattern={{version}},value=${{ env.INSP_VERSION }}
             type=semver,pattern={{major}}.{{minor}},value=${{ env.INSP_VERSION }}
@@ -76,8 +75,8 @@ jobs:
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
       -
-        name: Login to DockerHub
-        if: github.repository == 'inspircd/inspircd-docker' && github.ref == 'refs/heads/master'
+        name: Log in to Docker Hub
+        if: github.repository == env.GITHUB_REPO && github.ref_name == env.GITHUB_BRANCH
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
@@ -92,12 +91,12 @@ jobs:
           push: ${{ steps.pipeline_vars.outputs.push }}
           tags: ${{ steps.meta.outputs.tags }}
       -
-        name: Docker Hub Description
-        if: github.repository == 'inspircd/inspircd-docker' && github.ref == 'refs/heads/master'
+        name: Update description on Docker Hub
+        if: github.repository == env.GITHUB_REPO && github.ref_name == env.GITHUB_BRANCH
         uses: peter-evans/dockerhub-description@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-          repository: ${{ env.DOCKER_REPO_PREFIX }}/${{ env.DOCKER_REPO_NAME }}
+          repository: ${{ env.DOCKER_REPO }}
           short-description: Official image for InspIRCd Internet Relay Chat server. https://www.inspircd.org
           readme-filepath: README.md