diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index f414a963..8e1ce886 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,9 +1,9 @@
 name: Docker
 
 on:
-  push:
-    branches:
-      - main
+  release:
+    types:
+      - [published, prereleased]
 
 jobs:
   docker:
@@ -12,9 +12,19 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Build
-        run: docker build -t ghcr.io/hyperledger/firefly-ethconnect:latest .
-
-      - name: Push
+        run: docker build -t ghcr.io/hyperledger/firefly-ethconnect:$GITHUB_REF .
+      
+      - name: Tag release
+        if: github.event.action == 'published'
+        run: docker tag ghcr.io/hyperledger/firefly-ethconnect:latest ghcr.io/hyperledger/firefly-ethconnect:latest
+      
+      - name: Push docker image
+        run: |
+          echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
+          docker push ghcr.io/hyperledger/firefly-ethconnect:$GITHUB_REF
+      
+      - name: Push latest tag
+        if: github.event.action == 'published'
         run: |
           echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
-          docker push ghcr.io/hyperledger/firefly-ethconnect:latest
+          docker push ghcr.io/hyperledger/firefly-ethconnect:$latest
\ No newline at end of file