diff --git a/.github/workflows/flow.yml b/.github/workflows/flow.yml
index 237f62f061..b17178809b 100644
--- a/.github/workflows/flow.yml
+++ b/.github/workflows/flow.yml
@@ -15,11 +15,10 @@ jobs:
     timeout-minutes: 30
     services:
       catalog:
-        container_name: catalog
         image: imresamu/postgis:15-3.4-alpine
         ports:
           - 9901:5432
-        environment:
+        env:
           PGUSER: postgres
           POSTGRES_PASSWORD: postgres
           POSTGRES_DB: postgres
@@ -33,11 +32,9 @@ jobs:
           start_period: 60s
 
       temporal:
-        container_name: temporal
         depends_on:
-          catalog:
-            condition: service_healthy
-        environment:
+          - catalog
+        env:
           - DB=postgresql
           - DB_PORT=5432
           - POSTGRES_USER=postgres
@@ -53,10 +50,9 @@ jobs:
           kompose.volume.type: configMap
 
       temporal-admin-tools:
-        container_name: temporal-admin-tools
         depends_on:
           - temporal
-        environment:
+        env:
           - TEMPORAL_ADDRESS=temporal:7233
           - TEMPORAL_CLI_ADDRESS=temporal:7233
           - TEMPORAL_CLI_SHOW_STACKS=1
diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml
index 3b6cde3b39..65b71653c6 100644
--- a/docker-compose-ci.yml
+++ b/docker-compose-ci.yml
@@ -21,23 +21,6 @@ x-flow-worker-env: &flow-worker-env
   AWS_ENDPOINT: ${AWS_ENDPOINT:-}
 
 services:
-  flow-api:
-    container_name: flow_api
-    build:
-      context: .
-      dockerfile: stacks/flow.Dockerfile
-      target: flow-api
-      args:
-        PEERDB_VERSION_SHA_SHORT: ${PEERDB_VERSION_SHA_SHORT:-}
-    ports:
-      - 8112:8112
-      - 8113:8113
-    environment:
-      <<: [*catalog-config, *flow-worker-env]
-    depends_on:
-      temporal-admin-tools:
-        condition: service_healthy
-
   flow-snapshot-worker:
     container_name: flow-snapshot-worker
     build: