diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 6a4fc6848..ee27652fc 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -1,13 +1,8 @@
 name: Docker build image on release
 
-# on:
-#   release:
-#     types: [published]
-
 on:
-  push:
-    branches:
-      - 'master'
+  release:
+    types: [published]
 
 jobs:
   docker:
@@ -35,18 +30,6 @@ jobs:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      # -
-      #   name: Build and push
-      #   uses: docker/build-push-action@v2
-      #   with:
-      #     context: .
-      #     platforms: linux/amd64
-      #     push: true
-      #     tags: |
-      #       ctfd/ctfd:latest
-      #       ghcr.io/ctfd/ctfd:latest
-      #       ctfd/ctfd:${{ github.event.release.tag_name }}
-      #       ghcr.io/ctfd/ctfd:${{ github.event.release.tag_name }}
       -
         name: Build and push
         uses: docker/build-push-action@v2
@@ -55,5 +38,7 @@ jobs:
           platforms: linux/amd64
           push: true
           tags: |
-            ctfd/ctfd:test-github-action
-            ghcr.io/ctfd/ctfd:test-github-action
\ No newline at end of file
+            ctfd/ctfd:latest
+            ghcr.io/ctfd/ctfd:latest
+            ctfd/ctfd:${{ github.event.release.tag_name }}
+            ghcr.io/ctfd/ctfd:${{ github.event.release.tag_name }}