diff --git a/action.sh b/action.sh
index 6945503..826fcc9 100755
--- a/action.sh
+++ b/action.sh
@@ -5,21 +5,21 @@ git config --global user.name "Git runner"
 CURRENT_VERSION=$(jq -r .version package.json)
 echo $CURRENT_VERSION
 git checkout -b $CURRENT_VERSION
-CURRENT_VERSION=$INPUT_PREFIX$CURRENT_VERSION
+PREFIX_VERSION=$INPUT_PREFIX$CURRENT_VERSION
 
 if [[ $INPUT_FORCE_OVERRIDE == true ]];
 then
-  git tag -d $CURRENT_VERSION || true
-  git push --delete origin $CURRENT_VERSION || true
+  git tag -d $PREFIX_VERSION || true
+  git push --delete origin $PREFIX_VERSION || true
 fi
 
 PREVIOUS_VERSIONS=$(git tag -l)
 echo $PREVIOUS_VERSIONS
 
-if [[ $PREVIOUS_VERSIONS != *$CURRENT_VERSION* ]];
+if [[ $PREVIOUS_VERSIONS != *$PREFIX_VERSION* ]];
 then
-  echo "Tag for version $CURRENT_VERSION not found. Creating tag..."
-  git tag -a -m "Version $CURRENT_VERSION" $CURRENT_VERSION
-  git push --follow-tags
+  echo "Tag for version $PREFIX_VERSION not found. Creating tag..."
+  git tag -a -m "Version $PREFIX_VERSION" $PREFIX_VERSION
+  git push --follow-tags --set-upstream origin $CURRENT_VERSION
   echo "Tag created."
 fi