diff --git a/.github/workflows/build-deploy-pipeline.yaml b/.github/workflows/build-deploy-pipeline.yaml
index 5643449..00fa306 100644
--- a/.github/workflows/build-deploy-pipeline.yaml
+++ b/.github/workflows/build-deploy-pipeline.yaml
@@ -44,8 +44,8 @@ jobs:
 
       - name: Build and push
         uses: docker/build-push-action@v6
+        env:
+          IMAGE_ID: docker.artifactory.brandwatch.com/${{ github.repository.event.name }}:${{ github.ref_name }}
         with:
           push: true
-          tags: |
-            ${{ format('{0}:{1}-{2}', github.event.repository.name, github.ref_name, 'amd64') }}
-            ${{ format('{0}:{1}-{2}', github.event.repository.name, github.ref_name, github.run_id) }}
+          tags: ${{ format('{0}-{1}', env.IMAGE_ID, 'amd64') }},${{ format('{0}-{1}', env.IMAGE_ID, github.run_id) }}