diff --git a/.github/workflows/fcrp-credential-boundary.yml b/.github/workflows/fcrp-credential-boundary.yml
new file mode 100644
index 00000000..59f9c29b
--- /dev/null
+++ b/.github/workflows/fcrp-credential-boundary.yml
@@ -0,0 +1,18 @@
+name: FCRP Credential Boundary
+
+on:
+  push:
+    branches: [main, master, develop]
+  pull_request:
+    branches: [main, master, develop]
+
+permissions:
+  contents: read
+
+jobs:
+  credential-boundary:
+    uses: safal207/ContractGraph-QA/.github/workflows/credential-boundary-reusable.yml@cc1d1e227bbb1a25776819e6f2829bfb7a66ee58
+    permissions:
+      contents: read
+    with:
+      scanner-ref: cc1d1e227bbb1a25776819e6f2829bfb7a66ee58
diff --git a/deploy/docker-compose.mvp1.yml b/deploy/docker-compose.mvp1.yml
index 3c7c1cfe..2d172a7e 100644
--- a/deploy/docker-compose.mvp1.yml
+++ b/deploy/docker-compose.mvp1.yml
@@ -7,7 +7,7 @@ services:
     container_name: liminal-postgres
     environment:
       POSTGRES_USER: liminal
-      POSTGRES_PASSWORD: liminal
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:?Set POSTGRES_PASSWORD}
       POSTGRES_DB: liminal
     ports:
       - "5432:5432"
@@ -29,8 +29,8 @@ services:
       dockerfile: liminalqa-ingest/Dockerfile
     container_name: liminal-ingest
     environment:
-      LIMINAL_PG_URL: postgres://liminal:liminal@pg:5432/liminal
-      LIMINAL_API_TOKEN: devtoken
+      LIMINAL_PG_URL: ${LIMINAL_PG_URL:?Set LIMINAL_PG_URL}
+      LIMINAL_API_TOKEN: ${LIMINAL_API_TOKEN:?Set LIMINAL_API_TOKEN}
       RUST_LOG: info
       LIMINAL_BIND_ADDR: 0.0.0.0:8088
     ports: