diff --git a/.github/workflows/docker-frontend.yml b/.github/workflows/docker-frontend.yml
index 75da4a9d66521d..59adee9d0005c4 100644
--- a/.github/workflows/docker-frontend.yml
+++ b/.github/workflows/docker-frontend.yml
@@ -3,6 +3,8 @@ on:
   push:
     branches:
       - master
+  release:
+    types: [published, edited]
 
 jobs:
   build:
@@ -15,4 +17,4 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
           repository: linkedin/datahub-frontend
-          tags: latest
+          tag_with_ref: true
diff --git a/.github/workflows/docker-gms.yml b/.github/workflows/docker-gms.yml
index ab763a1499c2f2..f9fef088793a9c 100644
--- a/.github/workflows/docker-gms.yml
+++ b/.github/workflows/docker-gms.yml
@@ -3,6 +3,8 @@ on:
   push:
     branches:
       - master
+  release:
+    types: [published, edited]
 
 jobs:
   build:
@@ -15,4 +17,4 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
           repository: linkedin/datahub-gms
-          tags: latest
+          tag_with_ref: true
diff --git a/.github/workflows/docker-mae-consumer.yml b/.github/workflows/docker-mae-consumer.yml
index 309b663e24f5db..6fdef56e0da5ae 100644
--- a/.github/workflows/docker-mae-consumer.yml
+++ b/.github/workflows/docker-mae-consumer.yml
@@ -3,6 +3,8 @@ on:
   push:
     branches:
       - master
+  release:
+    types: [published, edited]
 
 jobs:
   build:
@@ -15,4 +17,4 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
           repository: linkedin/datahub-mae-consumer
-          tags: latest
+          tag_with_ref: true
diff --git a/.github/workflows/docker-mce-consumer.yml b/.github/workflows/docker-mce-consumer.yml
index 89132393d32037..a73a5ed77d33a1 100644
--- a/.github/workflows/docker-mce-consumer.yml
+++ b/.github/workflows/docker-mce-consumer.yml
@@ -3,6 +3,8 @@ on:
   push:
     branches:
       - master
+  release:
+    types: [published, edited]
 
 jobs:
   build:
@@ -15,4 +17,4 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
           repository: linkedin/datahub-mce-consumer
-          tags: latest
+          tag_with_ref: true
diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
deleted file mode 100644
index 7b78573106ed0c..00000000000000
--- a/.github/workflows/docker-release.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: release-tagged docker images
-on: 
-  release:
-    types: [created, edited, published]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: docker/build-push-action@v1
-        with:
-          dockerfile: ./docker/mce-consumer/Dockerfile
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          repository: linkedin/datahub-mce-consumer
-          tags: ${{ github.ref }}