diff --git a/provider/notification-gcp/cloudbuild/cloudbuild.yaml b/provider/notification-gcp/cloudbuild/cloudbuild.yaml
index 43513ffc22854357bd847b8e4baafa2ad6ffd455..43e8b4623ed64c4343eeba5d13eb364761902a7b 100644
--- a/provider/notification-gcp/cloudbuild/cloudbuild.yaml
+++ b/provider/notification-gcp/cloudbuild/cloudbuild.yaml
@@ -20,11 +20,11 @@ steps:
       'build',
       '--build-arg', 'PROVIDER_NAME=${_PROVIDER_NAME}',
       '--build-arg', 'PORT=${_PORT}',
-      '-t', 'gcr.io/$PROJECT_ID/os-notification/notification-${_PROVIDER_NAME}:${_SHORT_SHA}',
-      '-t', 'gcr.io/$PROJECT_ID/os-notification/notification-${_PROVIDER_NAME}:latest',
-      '-f', 'provider/notification-${_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/os-notification/notification-${_PROVIDER_NAME}'
+  - 'gcr.io/$PROJECT_ID/${_APPLICATION_NAME}/${_GCP_SERVICE}-${_PROVIDER_NAME}'