diff --git a/.circleci/config.yml b/.circleci/config.yml
index ddc1328..b76027c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -55,18 +55,10 @@ jobs:
           command: |
             npm i
             npm run ci
-      - run:
-          name: "Build Npmjs Package"
-          command: |
-            cp vscode-mta-tools-*.vsix ./README.md ./LICENSE ./github-rel-env
-            cd ./github-rel-env
-            npm pack
       - persist_to_workspace:
-          root: "./github-rel-env"
+          root: "."
           paths:
-            # https://golang.org/pkg/path/filepath/#Match
             - vscode-mta-tools-*.vsix
-            - young-yang217-vscode-mta-tools-*.tgz
 
   release-to-github:
     docker:
@@ -87,22 +79,14 @@ jobs:
     working_directory: ~/repo
     steps:
       - checkout
-      - run:
-          #Make sure HEAD points to master
-          # TODO: this is horrible as it makes the build non-reproducible
-          #       but the `release` job performs a bump commit as part of the release flow
-          #       so the fetch/rebase is actually needed (unless release process refactored...)
-          name: rebase to master
-          command: |
-            git checkout master
-            git fetch
-            git rebase
+      - attach_workspace:
+          at: ./npmjs-pub-env
       - run:
           name: publish to npm
           command: |
             echo "//registry.npmjs.org/:_authToken=$CLOUD_MTA_BOT_NPM_TOKEN" > .npmrc
-            npm install
-            npm run ci
+            cp ./README.md ./LICENSE ./npmjs-pub-env
+            cd ./npmjs-pub-env
             npm publish
 
 workflows:
@@ -156,3 +140,12 @@ workflows:
               only: /^v[0-9]+(\.[0-9]+)*/
             branches:
               ignore: /.*/
+      - publish-to-npm:
+          requires:
+            - build-node14
+            - build-node16
+          filters:
+            tags:
+              only: /^v[0-9]+(\.[0-9]+)*/
+            branches:
+              ignore: /.*/
diff --git a/github-rel-env/package.json b/npmjs-pub-env/package.json
similarity index 80%
rename from github-rel-env/package.json
rename to npmjs-pub-env/package.json
index b7745ba..a2ca672 100644
--- a/github-rel-env/package.json
+++ b/npmjs-pub-env/package.json
@@ -2,12 +2,12 @@
   "name": "@young-yang217/vscode-mta-tools",
   "displayName": "vscode-mta-tools",
   "description": "VS Code Multi-Target Application tools",
-  "version": "1.4.25",
+  "version": "1.4.26",
   "publisher": "SAPSE",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
-    "url": "git@github.com/SAP/vscode-mta-tools.git"
+    "url": "git@github.com/young-yang03/vscode-mta-tools.git"
   },
   "publishConfig": {
     "access": "public"
diff --git a/package-lock.json b/package-lock.json
index 55fafde..857803c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "vscode-mta-tools",
-  "version": "1.4.25",
+  "version": "1.4.26",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "vscode-mta-tools",
-      "version": "1.4.25",
+      "version": "1.4.26",
       "license": "Apache-2.0",
       "dependencies": {
         "@sap/cf-tools": "2.0.1",
diff --git a/package.json b/package.json
index ee68061..be28a0a 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "vscode-mta-tools",
   "displayName": "vscode-mta-tools",
   "description": "VS Code Multi-Target Application tools",
-  "version": "1.4.25",
+  "version": "1.4.26",
   "publisher": "SAPSE",
   "license": "Apache-2.0",
   "repository": {