diff --git a/.github/workflows/api-staging-cd.yml b/.github/workflows/api-staging-cd.yml
index df94bdf..9f24878 100644
--- a/.github/workflows/api-staging-cd.yml
+++ b/.github/workflows/api-staging-cd.yml
@@ -80,10 +80,10 @@ jobs:
           service: "api-springboot-staging"
           image: "europe-west10-docker.pkg.dev/beer-pong-441815/api-beerpong/api-staging:${{ github.sha }}"
           region: europe-west10
-          flags: "--port=8080 --add-cloudsql-instances=beer-pong-441815:europe-west10:beerpong-staging-db --no-cpu-throttling --min-instances 0 --max-instances 1 --allow-unauthenticated"
+          flags: "--port=8080 --add-cloudsql-instances=beer-pong-441815:europe-west10:api-beerpong-pg --no-cpu-throttling --min-instances 0 --max-instances 1 --allow-unauthenticated"
           env_vars: |
             POSTGRES_USER=postgres
-            POSTGRES_URL=jdbc:postgresql:///beerpong?cloudSqlInstance=beer-pong-441815:europe-west10:beerpong-staging-db&socketFactory=com.google.cloud.sql.postgres.SocketFactory
+            POSTGRES_URL=jdbc:postgresql:///beerpong-staging?cloudSqlInstance=beer-pong-441815:europe-west10:api-beerpong-pg&socketFactory=com.google.cloud.sql.postgres.SocketFactory
             API_BASE_URL=https://beerpong.lb.staging.laurinnotemann.dev
           secrets: |-
-            POSTGRES_PASSWORD=api-staging-postrgres-password:latest
+            POSTGRES_PASSWORD=api-pg-password:latest