diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index 3d7342292..4f19a27be 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -11,7 +11,9 @@ steps:
   - name: gcr.io/cloud-builders/docker
     entrypoint: docker-compose
     args:
-      - up
+      - 'up'
+      - '--exit-code-from=pytest'
+      - '--abort-on-container-exit'
     env:
       - 'COMMIT_SHA=$COMMIT_SHA'
 options:
diff --git a/docker-compose.yml b/docker-compose.yml
index eba643135..bc95c933c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,7 +16,7 @@ services:
     ports:
       - "6379:6379"
 
-  app:
+  pytest:
     image: "us-central1-docker.pkg.dev/dara-c1b52/cloudbuild-pytest/gooey-server:$COMMIT_SHA"
     depends_on:
       - redis