diff --git a/.github/workflows/ci-e2e-tests.yml b/.github/workflows/ci-e2e-tests.yml
index 70a2bee..39df4fe 100644
--- a/.github/workflows/ci-e2e-tests.yml
+++ b/.github/workflows/ci-e2e-tests.yml
@@ -66,7 +66,7 @@ jobs:
           tenant_id=${{ steps.tenant.outputs.id }}
           services=$(curl http://localhost:8080/tenant/${tenant_id}/cluster-resources | jq -r '.services[].metadata.name' | tr " " "\n" | sort -g | tr "\n" " " | xargs)
           echo "Services: $services"
-          if [ "${services}" != "cartservice frontend postgres productcatalogservice" ]; then exit 1; fi
+          if [ "${services}" != "cartservice frontend frontend-baseline postgres productcatalogservice" ]; then exit 1; fi
           deployments=$(curl http://localhost:8080/tenant/${tenant_id}/cluster-resources | jq -r '.deployments[].metadata.name' | tr " " "\n" | sort -g | tr "\n" " " | xargs)
           echo "Deployments: $deployments"
           if [ "${deployments}" != "cartservice-baseline frontend-baseline postgres-baseline productcatalogservice-baseline" ]; then exit 1; fi
@@ -74,7 +74,7 @@ jobs:
         run: |
           tenant_id=${{ steps.tenant.outputs.id }}
           nodes=$(curl http://localhost:8080/tenant/${tenant_id}/topology | jq -r '.nodes[].id' | tr " " "\n" | sort -g | tr "\n" " " | xargs)
-          if [ "${nodes}" != "cartservice free-currency-api frontend frontend-external postgres productcatalogservice" ]; then exit 1; fi
+          if [ "${nodes}" != "cartservice free-currency-api frontend ingress postgres productcatalogservice" ]; then exit 1; fi
 
       - name: Create, validate and delete flow
         run: |
@@ -84,7 +84,8 @@ jobs:
           tenant_id=${{ steps.tenant.outputs.id }}
           deployments=$(curl http://localhost:8080/tenant/${tenant_id}/cluster-resources | jq -r '.deployments[].metadata.name' | tr " " "\n" | sort -g | tr "\n" " " | xargs)
           echo "Deployments: $deployments"
-          if [ "${deployments}" != "cartservice-baseline cartservice-${flow_id} frontend-baseline frontend-${flow_id} postgres-baseline postgres-${flow_id} productcatalogservice-baseline" ]; then exit 1; fi
+          if [ "${deployments}" != "cartservice-baseline cartservice-dev-${flow_id} frontend-baseline frontend-dev-${flow_id} postgres-baseline postgres-dev-${flow_id} productcatalogservice-baseline" ]; then exit 1; fi
+
           KARDINAL_CLI_DEV_MODE=TRUE $KARDINAL_CLI flow ls | grep ${flow_id}
           KARDINAL_CLI_DEV_MODE=TRUE $KARDINAL_CLI flow delete ${flow_id}
 
@@ -96,7 +97,7 @@ jobs:
           tenant_id=${{ steps.tenant.outputs.id }}
           deployments=$(curl http://localhost:8080/tenant/${tenant_id}/cluster-resources | jq -r '.deployments[].metadata.name' | tr " " "\n" | sort -g | tr "\n" " " | xargs)
           echo "Deployments: $deployments"
-          if [ "${deployments}" != "cartservice-baseline cartservice-${flow_id} frontend-baseline frontend-${flow_id} postgres-baseline postgres-${flow_id} productcatalogservice-baseline productcatalogservice-${flow_id}" ]; then exit 1; fi
+          if [ "${deployments}" != "cartservice-baseline cartservice-dev-${flow_id} frontend-baseline frontend-dev-${flow_id} postgres-baseline postgres-dev-${flow_id} productcatalogservice-baseline productcatalogservice-dev-${flow_id}" ]; then exit 1; fi
           KARDINAL_CLI_DEV_MODE=TRUE $KARDINAL_CLI flow ls | grep ${flow_id}
           KARDINAL_CLI_DEV_MODE=TRUE $KARDINAL_CLI flow delete ${flow_id}