diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7ec0b69e182..6f321ce4124 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,7 +5,7 @@ orbs:
 jobs:
   publish:
     docker:
-      - image: oryd/sdk:v0.0.54
+      - image: oryd/sdk:latest
     working_directory: /sdk
     steps:
       - checkout
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index aec5b437d06..ce9ec3d7028 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -9,10 +9,16 @@ jobs:
     steps:
       - name: Check out the repo
         uses: actions/checkout@v2
+      - name: Extract version
+        id: get_version
+        run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
       - name: Push to Docker Hub
         uses: docker/build-push-action@v1
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_SECRET_AREKKAS }}
           repository: oryd/sdk
-          tag_with_ref: true
+          push: true
+          tags: |
+            oryd/sdk:${{ env.VERSION }}
+            oryd/sdk:latest
\ No newline at end of file