diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 7e2d932..3d059f2 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -13,16 +13,31 @@ jobs:
   docker:
     name: Build Docker Image
     runs-on: ubuntu-latest
-    needs: pre-commit
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
-      - name: Build and push
-        uses: docker/build-push-action@v1
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: |
+            europe-west4-docker.pkg.dev/stakewiselabs/public/oracle
+          tags: |
+            type=ref,event=branch
+            type=ref,event=tag
+            type=sha
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to GAR
+        uses: docker/login-action@v1
         with:
+          registry: europe-west4-docker.pkg.dev
           username: _json_key
           password: ${{ secrets.GAR_JSON_KEY }}
-          registry: europe-west4-docker.pkg.dev
-          repository: stakewiselabs/public/oracle
-          tag_with_ref: true
-          tag_with_sha: true
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}