diff --git a/.github/workflows/create-branch-on-go-version-change.yml b/.github/workflows/create-branch-on-go-version-change.yml
index f71aea4..2025eb1 100644
--- a/.github/workflows/create-branch-on-go-version-change.yml
+++ b/.github/workflows/create-branch-on-go-version-change.yml
@@ -35,7 +35,7 @@ jobs:
           else
             git config user.name "${{ github.actor }}"
             git config user.email "${{ github.actor }}@users.noreply.github.com"
-            git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git
+            git remote set-url origin https://x-access-token:${{ secrets.MARVIN_GITHUB_TOKEN }}@github.com/${{ github.repository }}.git
             git checkout -b "$branch_name"
             git push origin "$branch_name"
             echo "Created Git branch $branch_name"
diff --git a/.github/workflows/create-tag-on-version-change.yml b/.github/workflows/create-tag-on-version-change.yml
index 1db6948..4eaf4ec 100644
--- a/.github/workflows/create-tag-on-version-change.yml
+++ b/.github/workflows/create-tag-on-version-change.yml
@@ -31,14 +31,14 @@ jobs:
       - name: Create and push new tag (if not exists)
         run: |
           tag_name=${{ steps.generate-tag-name.outputs.tag_name }}
-          count=$(git ls-remote --tags origin "$tag_name" | grep -c "refs/tags/$tag_name")
+          count=$(git ls-remote --tags origin "$tag_name" | grep -c "refs/tags/$tag_name" || :)
           if [ "$count" -gt 0 ] ; then
             echo "Git tag $tag_name already exists. Using new tag $tag_name-$count."
             tag_name="$tag_name-$count"
           fi
           git config user.name "${{ github.actor }}"
           git config user.email "${{ github.actor }}@users.noreply.github.com"
-          git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git
+          git remote set-url origin https://x-access-token:${{ secrets.MARVIN_GITHUB_TOKEN }}@github.com/${{ github.repository }}.git
           git tag -a "$tag_name" -m "Release $tag_name"
           git push origin "$tag_name"
           echo "Created Git tag $tag_name"