diff --git a/provider/indexer-gcp/cloudbuild/cloudbuild.yaml b/provider/indexer-gcp/cloudbuild/cloudbuild.yaml
index 3e6eccbe7317ad6e6c768b556ba588de194a9399..70c7967582edc9321ff10d25f45cb0589386ddf1 100644
--- a/provider/indexer-gcp/cloudbuild/cloudbuild.yaml
+++ b/provider/indexer-gcp/cloudbuild/cloudbuild.yaml
@@ -20,12 +20,11 @@ steps:
             'build',
             '--build-arg', 'PROVIDER_NAME=${_PROVIDER_NAME}',
             '--build-arg', 'PORT=${_PORT}',
-            '-t', 'gcr.io/$PROJECT_ID/${_APPLICATION_NAME}/indexer-${_PROVIDER_NAME}:${_SHORT_SHA}',
-            '-t', 'gcr.io/$PROJECT_ID/${_APPLICATION_NAME}/indexer-${_PROVIDER_NAME}:latest',
-            '-f', 'provider/indexer-${_PROVIDER_NAME}/cloudbuild/Dockerfile.cloudbuild',
+            '-t', 'gcr.io/$PROJECT_ID/${_APPLICATION_NAME}/{_GCP_SERVICE}-${_PROVIDER_NAME}:${_SHORT_SHA}',
+            '-t', 'gcr.io/$PROJECT_ID/${_APPLICATION_NAME}/{_GCP_SERVICE}-${_PROVIDER_NAME}:latest',
+            '-f', 'provider/{_GCP_SERVICE}-${_PROVIDER_NAME}/cloudbuild/Dockerfile.cloudbuild',
             '.'
     ]
 
 images:
-  - 'gcr.io/$PROJECT_ID/${_APPLICATION_NAME}/indexer-${_PROVIDER_NAME}'
-
+  - 'gcr.io/$PROJECT_ID/${_APPLICATION_NAME}/{_GCP_SERVICE}-${_PROVIDER_NAME}'