diff --git a/.circleci/config.yml b/.circleci/config.yml
index 44eb3d3..326d2b2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -227,9 +227,18 @@ jobs:
           name: Docker pull
           command: docker pull $IMAGE_NAME:$CIRCLE_SHA1
       - run:
+          name: Checkout with tags
           command: |
-            git fetch --tags --prune --progress --no-recurse-submodules origin
-            #git checkout --progress --force $CIRCLE_SHA1
+            git fetch --force origin "refs/tags/${CIRCLE_TAG}:refs/tags/${CIRCLE_TAG}"
+            if [ -n "$CIRCLE_BRANCH" ]
+            then
+            git reset --hard $CIRCLE_SHA1
+            git checkout -q -B $CIRCLE_BRANCH
+            fi
+            git reset --hard $CIRCLE_SHA1
+      - run:
+          command: |
+
             docker run --rm -v "$(pwd):/repo" gittools/gitversion:latest-linux-netcoreapp2.1 /repo /showvariable SemVer
       - run:
           name: Docker tag image