diff --git a/.kontinuous/env/dev/templates/strapi.configmap.yaml b/.kontinuous/env/dev/templates/strapi.configmap.yaml
index 9c0f81e3..8610db73 100644
--- a/.kontinuous/env/dev/templates/strapi.configmap.yaml
+++ b/.kontinuous/env/dev/templates/strapi.configmap.yaml
@@ -4,5 +4,6 @@ metadata:
   name: strapi-env
 data:
   STORAGE_URL: https://fcedev.blob.core.windows.net
+  DATABASE_SSL: "true"
   DATABASE_SSL_SELF: "true"
   FCE_SERVER_URL: "http://server:80"
diff --git a/.kontinuous/env/dev/values.yaml b/.kontinuous/env/dev/values.yaml
index d91047cc..58732b83 100644
--- a/.kontinuous/env/dev/values.yaml
+++ b/.kontinuous/env/dev/values.yaml
@@ -22,8 +22,6 @@ strapi:
         secretKeyRef:
           key: user
           name: pg-strapi-superuser
-    - name: DATABASE_SSL
-      value: "true"
 
 n8n:
   env:
diff --git a/.kontinuous/env/preprod/values.yaml b/.kontinuous/env/preprod/values.yaml
index 3ee25a37..2458d675 100644
--- a/.kontinuous/env/preprod/values.yaml
+++ b/.kontinuous/env/preprod/values.yaml
@@ -1,4 +1,5 @@
 strapi:
+  ~needs: [build-strapi, pg-strapi]
   env:
     - name: DATABASE_NAME
       valueFrom:
@@ -25,10 +26,9 @@ strapi:
         secretKeyRef:
           key: user
           name: pg-strapi-superuser
-    - name: DATABASE_SSL
-      value: "true"
 
 n8n:
+  ~needs: [build-n8n, pg-n8n]
   env:
     - name: DB_POSTGRESDB_DATABASE
       valueFrom:
@@ -82,6 +82,7 @@ n8n:
           name: pg-superuser
 
 server:
+  ~needs: [build-server, pg]
   env:
     - name: PG_DB
       valueFrom:
diff --git a/.kontinuous/env/prod/templates/strapi.configmap.yaml b/.kontinuous/env/prod/templates/strapi.configmap.yaml
index c7ba1457..f690d150 100644
--- a/.kontinuous/env/prod/templates/strapi.configmap.yaml
+++ b/.kontinuous/env/prod/templates/strapi.configmap.yaml
@@ -5,4 +5,5 @@ metadata:
 data:
   STORAGE_URL: https://fceprod2.blob.core.windows.net/strapi
   DATABASE_SSL: "true"
+  DATABASE_SSL_SELF: "true"
   FCE_SERVER_URL: "http://server:80"
diff --git a/.kontinuous/env/prod/values.yaml b/.kontinuous/env/prod/values.yaml
index 2992cc25..ffcb01e1 100644
--- a/.kontinuous/env/prod/values.yaml
+++ b/.kontinuous/env/prod/values.yaml
@@ -1,4 +1,5 @@
 n8n:
+  ~needs: [build-n8n, pg-n8n]
   resources:
     limits:
       cpu: "4"
@@ -62,6 +63,7 @@ redis:
       memory: 1Gi
 
 server:
+  ~needs: [build-server, pg]
   resources:
     limits:
       cpu: "500m"
@@ -96,6 +98,7 @@ server:
       value: "true"
 
 strapi:
+  ~needs: [build-strapi, pg-strapi]
   resources:
     limits:
       cpu: "500m"
@@ -126,8 +129,6 @@ strapi:
         secretKeyRef:
           key: user
           name: pg-strapi-superuser
-    - name: DATABASE_SSL
-      value: "true"
 
 pg:
   ~chart: pg