diff --git a/.circleci/config.yml b/.circleci/config.yml
index 27679d6c..0051221f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -33,6 +33,16 @@ jobs:
     executor: golang
     steps:
       - checkout
+      - run:
+        name: Checkout with tags
+        command: |
+          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
       - restore_cache:
           name: "Restore go modules cache"
           keys: