diff --git a/ci/scripts/linter.sh b/ci/scripts/linter.sh
index 65da7d65f..b706e659f 100755
--- a/ci/scripts/linter.sh
+++ b/ci/scripts/linter.sh
@@ -2,7 +2,7 @@
 #
 # Apply Linter to changed files in PR
 
-git fetch origin master:master
+git fetch --no-tags origin master:master
 current_branch=$(git rev-parse --abbrev-ref HEAD)
 
 echo "current branch $current_branch"
@@ -10,7 +10,7 @@ echo "github base ref = $GITHUB_BASE_REF"
 echo "github ref name= $GITHUB_REF_NAME"
 echo "github ref full= $GITHUB_REF"
 echo "github sha= $GITHUB_SHA"
-BASE_SHA=$(git merge-base $GITHUB_BASE_REF $GITHUB_REF)
+BASE_SHA=$(git merge-base $GITHUB_BASE_REF $GITHUB_SHA)
 
 echo "base sha = ${BASE_SHA}"