diff --git a/.github/workflows/version_bump.yaml b/.github/workflows/version_bump.yaml
index b07f821..c3d7584 100644
--- a/.github/workflows/version_bump.yaml
+++ b/.github/workflows/version_bump.yaml
@@ -38,7 +38,7 @@ jobs:
           git config user.email github-actions@github.com
           git pull origin HEAD:${{ github.event.pull_request.head.sha }} --rebase
           export CURRENT_BUILD_VERSION=$(grep BuildVersion version.go | awk -F= '{print $2}' | cut -d'"' -f 2-2 )
-          export CURRENT_BUILD_NUMBER=$(grep BuildVersion version.go | awk -F= '{print $2}' | cut -d'"' -f 2-2 )
+          export CURRENT_BUILD_NUMBER=$(grep BuildNumber version.go | awk -F= '{print $2}' | cut -d'"' -f 2-2 )
           export CURRENT_BUILD_TIME=$(date)
           export PR_CHANGE_BUILD_VERION=$(echo $CURRENT_BUILD_VERSION | awk -F. '{print $3}' )
           export OLD_BUILD_VERION_PART=$(echo $CURRENT_BUILD_VERSION | awk -F. '{print $1"."$2}')
@@ -50,4 +50,5 @@ jobs:
           git add .
           git commit -m "Automatic Version bump from GitHub Action at: `date` $CHANGE_BUILD_VERSION"
           git tag -a $CHANGE_BUILD_VERSION -m $CHANGE_BUILD_NUMBER $CHANGE_BUILD_VERSION
+          git rebase --skip
           git push origin HEAD:master