diff --git a/.github/actions/git-tag/action.yml b/.github/actions/git-tag/action.yml
index e469acba7..99e001705 100644
--- a/.github/actions/git-tag/action.yml
+++ b/.github/actions/git-tag/action.yml
@@ -25,12 +25,15 @@ runs:
           VERSION=$(jq -cr '.version' < package.json)
           echo "git tag -a ${VERSION} -m ${VERSION}"
 
-          if [[ "${{ inputs.dry-run }}" != "true" ]]; then
-            git tag -a ${VERSION} -m "${VERSION} [ci skip] "
-            git remote rm origin
-            GITHUB_REPO=https://${{ inputs.github_token }}:x-oauth-basic@github.com/Alfresco/alfresco-content-app.git
-            git remote add origin $GITHUB_REPO
-            git push origin --tags
-          fi;
-
-        fi;
+          if [ $(git tag -l "$VERSION") ]; then
+            echo "Tag \"$VERSION\" already exists. Skipping."
+          else
+              if [[ "${{ inputs.dry-run }}" != "true" ]]; then
+                git tag -a ${VERSION} -m "${VERSION} [ci skip] "
+                git remote rm origin
+                GITHUB_REPO=https://${{ inputs.github_token }}:x-oauth-basic@github.com/Alfresco/alfresco-content-app.git
+                git remote add origin $GITHUB_REPO
+                git push origin --tags
+              fi
+          fi
+        fi
diff --git a/.github/actions/publish-libs/action.yml b/.github/actions/publish-libs/action.yml
index 13f23b6f2..eaa228d31 100644
--- a/.github/actions/publish-libs/action.yml
+++ b/.github/actions/publish-libs/action.yml
@@ -37,10 +37,10 @@ runs:
       run: |
         export DIST_DIR=./dist/@alfresco
         PROJECTS_DIR=./projects
-        VERSION_IN_PACKAGE_JSON=$(node -p "require('./package.json').version;")
+        VERSION_IN_PACKAGE_JSON=$(jq -cr '.version' < package.json)
 
         if [[ ${{ inputs.branch_name }} =~ ^master.*?$ ]] ; then
-          NEW_LIBRARY_VERSION=VERSION_IN_PACKAGE_JSON
+          NEW_LIBRARY_VERSION="$VERSION_IN_PACKAGE_JSON"
         else
           NEW_LIBRARY_VERSION="${VERSION_IN_PACKAGE_JSON}-${{ github.run_id }}"
         fi
@@ -58,9 +58,9 @@ runs:
         );
 
         for PROJECT in "${PROJECTS[@]}"; do
-          echo "Update ${PROJECT} version to ${NEW_LIBRARY_VERSION}"
+          echo "Update \"$PROJECT\" to version \"$NEW_LIBRARY_VERSION\""
           if [[ "${{ inputs.dry-run }}" != "true" ]]; then
-            (cd cd $PROJECTS_DIR/${PROJECT} && npm version --allow-same-version --no-git-tag-version --force ${NEW_LIBRARY_VERSION})
+            (cd $PROJECTS_DIR/${PROJECT} && npm version --allow-same-version --no-git-tag-version --force "$NEW_LIBRARY_VERSION")
           fi
         done