diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index bb9b891..14e8a1f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -8,7 +8,7 @@ jobs:
       matrix:
         pg_version: [10, 12]
     env:
-        PG_VERSION: ${{ matrix.pg_version }}
+      PG_VERSION: ${{ matrix.pg_version }}
     steps:
       - uses: actions/checkout@v1
 
@@ -16,12 +16,12 @@ jobs:
         run: echo "CLOUDSDK_PYTHON=/usr/bin/python" >> $GITHUB_ENV
 
       - name: Setup gcloud authentication
-        uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+        uses: google-github-actions/setup-gcloud@v0
         with:
           service_account_key: ${{ secrets.GCS }}
 
       - name: Pull base image
-        run: gcloud auth configure-docker && docker pull gcr.io/cartodb-on-gcp-ci-testing/cartodb-postgresql-base:${{ matrix.pg_version }}
+        run: docker pull gcr.io/cartodb-on-gcp-ci-testing/cartodb-postgresql-base:${{ matrix.pg_version }}
 
       - name: Checkout ci tools repository
         uses: actions/checkout@v2
@@ -46,9 +46,9 @@ jobs:
       - name: Run python library tests
         run: docker-compose -f docker-compose.yaml exec -T postgres-server bash -c "cd /dataservices-api/server/ && MAPBOX_API_KEY=$MAPBOX_API_KEY TOMTOM_API_KEY=$TOMTOM_API_KEY GEOCODIO_API_KEY=$GEOCODIO_API_KEY nosetests lib/python/cartodb_services/test"
         env:
-           MAPBOX_API_KEY: ${{ secrets.MAPBOX_API_KEY }}
-           TOMTOM_API_KEY: ${{ secrets.TOMTOM_API_KEY }}
-           GEOCODIO_API_KEY: ${{ secrets.GEOCODIO_API_KEY }}
+          MAPBOX_API_KEY: ${{ secrets.MAPBOX_API_KEY }}
+          TOMTOM_API_KEY: ${{ secrets.TOMTOM_API_KEY }}
+          GEOCODIO_API_KEY: ${{ secrets.GEOCODIO_API_KEY }}
         timeout-minutes: 5
 
       - name: Run server tests