diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index 1409c39..032be39 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -30,9 +30,13 @@ steps:
 # push app code to cluster
 - id: 'Deploy to staging'
   name: skaffold
-  args: ['run', '-f=skaffold.yaml']
+  args: 
+    [
+      'run', 
+      '-f=skaffold.yaml',
+      '--default-repo','gcr.io/$PROJECT_ID',
+    ]
   env:
-  - 'SKAFFOLD_DEFAULT_REPO=gcr.io/$PROJECT_ID'
   - 'CLOUDSDK_COMPUTE_ZONE=us-central1-b'
   - 'CLOUDSDK_CONTAINER_CLUSTER=demo-app-staging'
 
diff --git a/skaffold.yaml b/skaffold.yaml
index ce4eb49..eb2f9c4 100644
--- a/skaffold.yaml
+++ b/skaffold.yaml
@@ -16,27 +16,31 @@ apiVersion: skaffold/v1alpha5
 kind: Config
 build:
   artifacts:
-  - image: gcr.io/microservices-demo-app/emailservice
+  # image tags are relative; to specify an image repo (e.g. GCR), you
+  # must provide a "default repo" using one of the methods described 
+  # here:
+  # https://github.com/GoogleContainerTools/skaffold/blob/master/docs/concepts.adoc#2-push
+  - image: emailservice
     context: src/emailservice
-  - image: gcr.io/microservices-demo-app/productcatalogservice
+  - image: productcatalogservice
     context: src/productcatalogservice
-  - image: gcr.io/microservices-demo-app/recommendationservice
+  - image: recommendationservice
     context: src/recommendationservice
-  - image: gcr.io/microservices-demo-app/shippingservice
+  - image: shippingservice
     context: src/shippingservice
-  - image: gcr.io/microservices-demo-app/checkoutservice
+  - image: checkoutservice
     context: src/checkoutservice
-  - image: gcr.io/microservices-demo-app/paymentservice
+  - image: paymentservice
     context: src/paymentservice
-  - image: gcr.io/microservices-demo-app/currencyservice
+  - image: currencyservice
     context: src/currencyservice
-  - image: gcr.io/microservices-demo-app/cartservice
+  - image: cartservice
     context: src/cartservice
-  - image: gcr.io/microservices-demo-app/frontend
+  - image: frontend
     context: src/frontend
-  - image: gcr.io/microservices-demo-app/loadgenerator
+  - image: loadgenerator
     context: src/loadgenerator
-  - image: gcr.io/microservices-demo-app/adservice
+  - image: adservice
     context: src/adservice
   tagPolicy:
     gitCommit: {}