diff --git a/.github/workflows/publish_docker.yml b/.github/workflows/publish_docker.yml
index d2236ca..c0ba9cc 100644
--- a/.github/workflows/publish_docker.yml
+++ b/.github/workflows/publish_docker.yml
@@ -28,9 +28,27 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
 
+      - name: Determine compose-runner version
+        id: get_version
+        run: |
+          if [[ "${GITHUB_REF_TYPE}" == "branch" ]]; then
+            VERSION="${GITHUB_SHA::12}"
+          elif [[ "${GITHUB_REF_TYPE}" == "tag" ]]; then
+            VERSION="${GITHUB_REF_NAME}"
+          elif [[ "${GITHUB_REF_TYPE}" == "release" ]]; then
+            VERSION="${GITHUB_REF_NAME}"
+          else
+            VERSION="${GITHUB_SHA::12}"
+          fi
+          echo "version=${VERSION}" >> "$GITHUB_OUTPUT"
+
       - name: Build and push Docker image
         uses: docker/build-push-action@v2
         with:
           context: .
           push: true
-          tags: ghcr.io/neurostuff/nsc-runner:${{ github.ref_name == 'main' && 'latest' || github.ref_name }}
+          build-args: |
+            COMPOSE_RUNNER_VERSION=${{ steps.get_version.outputs.version }}
+          tags: |
+            ghcr.io/neurostuff/nsc-runner:${{ steps.get_version.outputs.version }}
+            ghcr.io/neurostuff/nsc-runner:${{ github.ref_name == 'main' && 'latest' || steps.get_version.outputs.version }}