diff --git a/.github/workflows/docker-frontend.yml b/.github/workflows/docker-frontend.yml
new file mode 100644
index 00000000000000..f8542a09f3f47a
--- /dev/null
+++ b/.github/workflows/docker-frontend.yml
@@ -0,0 +1,18 @@
+name: Build and publish frontend docker images to docker hub
+on: 
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: docker/build-push-action@v1
+        with:
+          dockerfile: ./docker/frontend/Dockerfile
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          repository: linkedin/datahub-frontend
+          tags: latest
diff --git a/.github/workflows/docker-gms.yml b/.github/workflows/docker-gms.yml
new file mode 100644
index 00000000000000..750dee43aa94c2
--- /dev/null
+++ b/.github/workflows/docker-gms.yml
@@ -0,0 +1,18 @@
+name: Build and publish gms docker images to docker hub
+on: 
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: docker/build-push-action@v1
+        with:
+          dockerfile: ./docker/gms/Dockerfile
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          repository: linkedin/datahub-gms
+          tags: latest
diff --git a/.github/workflows/docker-mae-consumer.yml b/.github/workflows/docker-mae-consumer.yml
new file mode 100644
index 00000000000000..da324d581a46e6
--- /dev/null
+++ b/.github/workflows/docker-mae-consumer.yml
@@ -0,0 +1,18 @@
+name: Build and publish mae-consumer docker images to docker hub
+on: 
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: docker/build-push-action@v1
+        with:
+          dockerfile: ./docker/mae-consumer/Dockerfile
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          repository: linkedin/datahub-mae-consumer
+          tags: latest
diff --git a/.github/workflows/docker-mce-consumer.yml b/.github/workflows/docker-mce-consumer.yml
new file mode 100644
index 00000000000000..95457696ced175
--- /dev/null
+++ b/.github/workflows/docker-mce-consumer.yml
@@ -0,0 +1,18 @@
+name: Build and publish mce-consumer docker images to docker hub
+on: 
+  push:
+    branches:
+      - master
+
+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: latest
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
deleted file mode 100644
index 5d50aace7d7794..00000000000000
--- a/.github/workflows/docker.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-name: Build and publish docker images to docker hub
-on: 
-  push:
-    branches:
-      - master
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      
-      - uses: docker/build-push-action@v1
-        with:
-          dockerfile: ./docker/gms/Dockerfile
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          repository: linkedin/datahub-gms
-          tags: latest
-
-      - 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: latest
-    
-      - uses: docker/build-push-action@v1
-        with:
-          dockerfile: ./docker/mae-consumer/Dockerfile
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          repository: linkedin/datahub-mae-consumer
-          tags: latest
-                    
-      - uses: docker/build-push-action@v1
-        with:
-          dockerfile: ./docker/frontend/Dockerfile
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          repository: linkedin/datahub-frontend
-          tags: latest