diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
index c6f6b41..796dc6f 100644
--- a/.github/workflows/backend.yml
+++ b/.github/workflows/backend.yml
@@ -3,6 +3,7 @@ name: Backend CI
 on:
   push:
     paths:
+      - '.github/workflows/**'
       - 'backend/**'
       - '!frontend/**'
 
@@ -22,14 +23,15 @@ jobs:
     - name: Build release and call executable
       working-directory: ./backend
       run: cargo run --release -- --help
-    - name: Build and Push template image
-      uses: docker/build-push-action@v1 # https://github.com/docker/build-push-action
+    - name: Login to Dockerhub
+      uses: docker/login-action@v1
       with:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
-        path: ./backend/
-        dockerfile: ./backend/Dockerfile
-        repository: parity/substrate-telemetry-backend
+    - name: Build and Push template image
+      uses: docker/build-push-action@v2 # https://github.com/docker/build-push-action
+      with:
+        context: './backend'
         push: ${{ startsWith(github.ref, 'refs/tags/') }}
-        tags: latest
-        add_git_labels: true
+        tags: parity/substrate-telemetry-backend:latest
+        # add_git_labels: true
diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
index f5f7040..b6b55ef 100644
--- a/.github/workflows/frontend.yml
+++ b/.github/workflows/frontend.yml
@@ -6,6 +6,7 @@ name: Frontend CI
 on:
   push:
     paths:
+      - '.github/workflows/**'
       - 'frontend/**'
       - '!backend/**'
 
@@ -36,15 +37,16 @@ jobs:
     - name: Build
       working-directory: ./frontend
       run: yarn build
-    - name: Build and Push template image
-      uses: docker/build-push-action@v1 # https://github.com/docker/build-push-action
-      if: matrix.node-version == '12.x'
+    - name: Login to Dockerhub
+      uses: docker/login-action@v1
       with:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
-        path: ./frontend/
-        dockerfile: ./frontend/Dockerfile
-        repository: parity/substrate-telemetry-frontend
+    - name: Build and Push template image
+      uses: docker/build-push-action@v2 # https://github.com/docker/build-push-action
+      if: matrix.node-version == '12.x'
+      with:
+        context: './frontend'
         push: ${{ startsWith(github.ref, 'refs/tags/') }}
-        tags: latest
-        add_git_labels: true
+        tags: parity/substrate-telemetry-frontend:latest
+        # add_git_labels: true