diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
index 5468a19a..933cbf8a 100644
--- a/.github/workflows/dockerimage.yml
+++ b/.github/workflows/dockerimage.yml
@@ -10,47 +10,35 @@ on:
 
 jobs:
   build:
+    name: Build and Push image
     runs-on: ubuntu-latest
+
     steps:
-    - uses: actions/checkout@v2
-
-    - name: Branch name
-      id: branch_name
-      run: |
-        echo ::set-output name=VERSION::$([[ $GITHUB_REF =~ "refs/tags" ]] && echo ${GITHUB_REF#refs/tags/} || echo "${GITHUB_SHA:0:7}")
-
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1
-
-    - name: Log in to Docker Hub
-      uses: docker/login-action@v1
-      with:
-        username: ${{ secrets.docker_hub_username }}
-        password: ${{ secrets.docker_hub_token }}
-
-    - name: Login to GitHub Container Registry
-      uses: docker/login-action@v1
-      with:
-        registry: ghcr.io
-        username: ${{ github.actor }}
-        password: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Extract metadata (tags, labels) for Docker
-      id: meta
-      uses: docker/metadata-action@v3
-      with:
-        images: dfuse/dfuse-eosio
-
-    - name: Build and push Docker image
-      uses: docker/build-push-action@v2
-      with:
-        context: .
-        push: true
-        build-args: |
-          VERSION=${{ steps.branch_name.outputs.VERSION }}
-          COMMIT=${GITHUB_SHA:0:7}
-        tags: |
-          dfuse/dfuse-eosio:latest
-          dfuse/dfuse-eosio:${{ steps.branch_name.outputs.VERSION }}
-          ghcr.io/dfuse-io/dfuse-eosio:latest
-          ghcr.io/dfuse-io/dfuse-eosio:${{ steps.branch_name.outputs.VERSION }}
\ No newline at end of file
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Get branch name
+        id: branch_name
+        run: |
+          echo ::set-output name=VERSION::$([[ $GITHUB_REF =~ "refs/tags" ]] && echo ${GITHUB_REF#refs/tags/} || echo "${GITHUB_SHA:0:7}")
+
+      - name: Setup gcloud cli
+        uses: google-github-actions/setup-gcloud@master
+        with:
+          service_account_key: ${{ secrets.GCR_KEY }}
+          project_id: dfuse-302310
+          export_default_credentials: true
+
+      - name: Build Image
+        run: |-
+          docker build . -t eu.gcr.io/dfuse-302310/dfuse-eosio:latest -t eu.gcr.io/dfuse-302310/dfuse-eosio:${{ steps.branch_name.outputs.VERSION }}
+
+      - name: Docker config
+        run: |
+          gcloud auth configure-docker -q
+
+      # Push image to Google Container Registry
+      - name: Push Image
+        run: |-
+          docker push eu.gcr.io/dfuse-302310/dfuse-eosio:${{ steps.branch_name.outputs.VERSION }}
+          docker push eu.gcr.io/dfuse-302310/dfuse-eosio:latest
\ No newline at end of file