diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 504ef7f..920f7b9 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -11,18 +11,37 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - uses: docker/build-push-action@v2
+      - name: Docker meta apiserver
+        id: meta_apiserver
+        uses: docker/metadata-action@v4
+        with:
+          images: spacemeshos/explorer-apiserver
+
+      - name: Docker meta collector
+        id: meta_collector
+        uses: docker/metadata-action@v4
+        with:
+          images: spacemeshos/explorer-collector
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - uses: docker/build-push-action@v2
+        with:
+          context: .
           repository: spacemeshos/explorer-apiserver
-          dockerfile: Dockerfile.apiserver
-          tag_with_ref: true
+          file: ./Dockerfile.apiserver
+          push: true
+          tags: ${{ steps.meta_apiserver.outputs.tags }}
 
       - uses: docker/build-push-action@v2
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+          context: .
           repository: spacemeshos/explorer-collector
-          dockerfile: Dockerfile.collector
-          tag_with_ref: true
+          file: ./Dockerfile.collector
+          push: true
+          tags: ${{ steps.meta_collector.outputs.tags }}
+