diff --git a/.github/workflows/build-api.yml b/.github/workflows/build-api.yml
index 9bb7f53fb..e3d12e23b 100644
--- a/.github/workflows/build-api.yml
+++ b/.github/workflows/build-api.yml
@@ -50,7 +50,7 @@ jobs:
         env:
           REGISTERY_OWNER: implerhq
           DOCKER_NAME: impler/api
-          IMAGE_TAG: ${{ github.sha }}
+          IMAGE_TAG: ${{ github.event.pull_request.head.sha || github.sha }}
           GH_ACTOR: implerhq
           GH_PASSWORD: ${{ secrets.GH_PACKAGES }}
         run: |
diff --git a/.github/workflows/build-embed.yml b/.github/workflows/build-embed.yml
index 2f49be613..130630b46 100644
--- a/.github/workflows/build-embed.yml
+++ b/.github/workflows/build-embed.yml
@@ -48,7 +48,7 @@ jobs:
         env:
           REGISTERY_OWNER: implerhq
           DOCKER_NAME: impler/embed
-          IMAGE_TAG: ${{ github.sha }}
+          IMAGE_TAG: ${{ github.event.pull_request.head.sha || github.sha }}
           GH_ACTOR: implerhq
           GH_PASSWORD: ${{ secrets.GH_PACKAGES }}
         run: |
diff --git a/.github/workflows/build-queuemanager.yml b/.github/workflows/build-queuemanager.yml
index 87f3160bf..4b28e17a8 100644
--- a/.github/workflows/build-queuemanager.yml
+++ b/.github/workflows/build-queuemanager.yml
@@ -45,7 +45,7 @@ jobs:
         env:
           REGISTERY_OWNER: implerhq
           DOCKER_NAME: impler/queue-manager
-          IMAGE_TAG: ${{ github.sha }}
+          IMAGE_TAG: ${{ github.event.pull_request.head.sha || github.sha }}
           GH_ACTOR: implerhq
           GH_PASSWORD: ${{ secrets.GH_PACKAGES }}
         run: |
diff --git a/.github/workflows/build-web.yml b/.github/workflows/build-web.yml
index 42c39a4f1..6d90fba81 100644
--- a/.github/workflows/build-web.yml
+++ b/.github/workflows/build-web.yml
@@ -45,7 +45,7 @@ jobs:
         env:
           REGISTERY_OWNER: implerhq
           DOCKER_NAME: impler/web
-          IMAGE_TAG: ${{ github.sha }}
+          IMAGE_TAG: ${{ github.event.pull_request.head.sha || github.sha }}
           GH_ACTOR: implerhq
           GH_PASSWORD: ${{ secrets.GH_PACKAGES }}
         run: |
diff --git a/.github/workflows/build-widget.yml b/.github/workflows/build-widget.yml
index 5631ae6f8..87d879018 100644
--- a/.github/workflows/build-widget.yml
+++ b/.github/workflows/build-widget.yml
@@ -49,7 +49,7 @@ jobs:
         env:
           REGISTERY_OWNER: implerhq
           DOCKER_NAME: impler/widget
-          IMAGE_TAG: ${{ github.sha }}
+          IMAGE_TAG: ${{ github.event.pull_request.head.sha || github.sha }}
           GH_ACTOR: implerhq
           GH_PASSWORD: ${{ secrets.GH_PACKAGES }}
         run: |
diff --git a/.github/workflows/publish-prod-packages.yml b/.github/workflows/publish-prod-packages.yml
index 53aa31638..74572f801 100644
--- a/.github/workflows/publish-prod-packages.yml
+++ b/.github/workflows/publish-prod-packages.yml
@@ -46,6 +46,7 @@ jobs:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
         working-directory: libs/shared
         run: |
+          npm config set registry https://registry.npmjs.org/
           npm config set --workspaces=false --include-workspace-root //registry.npmjs.org/:_authToken=$NPM_TOKEN
           npm publish --access public
 
@@ -54,5 +55,6 @@ jobs:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
         working-directory: packages/react
         run: |
+          npm config set registry https://registry.npmjs.org/
           npm config set --workspaces=false --include-workspace-root //registry.npmjs.org/:_authToken=$NPM_TOKEN
           npm publish --access public