diff --git a/.github/workflows/build-and-push.yaml b/.github/workflows/build-and-push.yaml
index ed1ddad..34b5844 100644
--- a/.github/workflows/build-and-push.yaml
+++ b/.github/workflows/build-and-push.yaml
@@ -36,7 +36,10 @@ jobs:
         id: meta
         uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
         with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          images: |
+            ${{ env.REGISTRY }}
+          tags: |
+            ${{ env.IMAGE_NAME }}:${{ github.sha }}
       # This step uses the `docker/build-push-action` action to build the image, based on your repository's `Dockerfile`. If the build succeeds, it pushes the image to GitHub Packages.
       # It uses the `context` parameter to define the build's context as the set of files located in the specified path. For more information, see "[Usage](https://github.com/docker/build-push-action#usage)" in the README of the `docker/build-push-action` repository.
       # It uses the `tags` and `labels` parameters to tag and label the image with the output from the "meta" step.
@@ -46,7 +49,7 @@ jobs:
         with:
           context: .
           push: true
-          tags: ghcr.io/omrishiv/backstage-app:${{ github.sha }}
+          tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
 
       # This step generates an artifact attestation for the image, which is an unforgeable statement about where and how it was built. It increases supply chain security for people who consume the image. For more information, see "[AUTOTITLE](/actions/security-guides/using-artifact-attestations-to-establish-provenance-for-builds)."
diff --git a/Dockerfile b/Dockerfile
index 86ce284..817041c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -115,4 +115,3 @@ COPY --chown=node:node app-config.yaml ./
 ENV NODE_ENV production
 
 CMD ["node", "packages/backend", "--config", "app-config.yaml"]
-LABEL org.opencontainers.image.source=https://github.com/OmriShiv/backstage-app