diff --git a/.github/actions/publish-to-jamsocket/action.yml b/.github/actions/publish-to-jamsocket/action.yml
index 9f972b8..3944f75 100644
--- a/.github/actions/publish-to-jamsocket/action.yml
+++ b/.github/actions/publish-to-jamsocket/action.yml
@@ -48,21 +48,22 @@ runs:
         username: ${{ env.JAMCR_USER }}
         password: ${{ env.JAMCR_PASS }}
 
-      - name: Extract Docker metadata
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: new.jamcr.io/${{ inputs.jamsocket_account }}/${{ inputs.jamsocket_service }}
-          tags: |
-            type=raw,value=${{ inputs.docker_tag || 'latest' }}
+    - name: Extract Docker metadata
+      id: meta
+      uses: docker/metadata-action@v5
+      with:
+        images: new.jamcr.io/${{ inputs.jamsocket_account }}/${{ inputs.jamsocket_service }}
+        tags: |
+          type=raw,value=${{ inputs.docker_tag }}
 
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v2
-        with:
-          context: ${{ inputs.docker_build_context }}
-          file: ${{ inputs.dockerfile_path }}
-          push: true
-          tags: new.jamcr.io/${{ inputs.jamsocket_account }}/${{ inputs.jamsocket_service }}:${{ inputs.docker_tag || 'latest' }}
+    - name: Build and push Docker image
+      uses: docker/build-push-action@v5
+      with:
+        context: ${{ inputs.docker_build_context }}
+        file: ${{ inputs.dockerfile_path }}
+        push: true
+        tags: ${{ steps.meta.outputs.tags }}
+        labels: ${{ steps.meta.outputs.labels }}
 
 branding:
   icon: 'check-circle'
diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml
index ed0f0bf..5f4709b 100644
--- a/.github/workflows/test-action.yml
+++ b/.github/workflows/test-action.yml
@@ -22,7 +22,6 @@ jobs:
           IMAGE_NAME: testaccount/testservice
           DOCKER_BUILD_CONTEXT: ./server
           DOCKERFILE_PATH: ./server/Dockerfile.jamsocket
-          DOCKER_TAG: mycustomtag
 
 # name: Test Publish to Jamsocket Action