diff --git a/components/airflow-cnpg-database/kustomization.yaml b/components/airflow-cnpg-database/kustomization.yaml
index 0cd20f3..a514d33 100644
--- a/components/airflow-cnpg-database/kustomization.yaml
+++ b/components/airflow-cnpg-database/kustomization.yaml
@@ -24,7 +24,7 @@ secretgenerator:
 - name: airflow-postgres-connection
   type: Secret
   literals:
-  - connection=postgresql://airflow:NotSoSecret@${AIRFLOW_POSTGRES_RW_SERVICE_HOST}:5432/airflow
+  - connection=postgresql://airflow:NotSoSecret@${DB_SERVICE_HOST}:${DB_SERVICE_PORT}/airflow
 
 vars:
 - name: AIRFLOW_DATABASE_SERVICE_NAME
diff --git a/kustomization.yaml b/kustomization.yaml
index b087947..995daac 100644
--- a/kustomization.yaml
+++ b/kustomization.yaml
@@ -7,22 +7,11 @@ generatorOptions:
 components:
 - ./components/airflow-cnpg-database
 
+resources:
+- ./resources/helm.yaml
+
 secretGenerator:
 - name: airflow-webserver-secret-key
   type: secret
   literals:
   - webserver-secret-key=c94b62cffbf4dd1c42747fc65007054432f10c185c5e6160
-
-helmCharts:
-- name: airflow
-  repo: https://airflow.apache.org
-  version: 1.9.0
-  releaseName: airflow
-  valuesInline:
-    postgresql:
-      enabled: false
-    pgbouncer:
-      enabled: true
-    data:
-      metadataSecretName: airflow-postgres-connection
-    webserverSecretKeySecretName: airflow-webserver-secret-key
diff --git a/resources/helm.yaml b/resources/helm.yaml
new file mode 100644
index 0000000..ca0fba9
--- /dev/null
+++ b/resources/helm.yaml
@@ -0,0 +1,18 @@
+helmCharts:
+- name: airflow
+  repo: https://airflow.apache.org
+  version: 1.9.0
+  releaseName: airflow
+  valuesInline:
+    postgresql:
+      enabled: false
+    pgbouncer:
+      enabled: true
+    data:
+      metadataSecretName: airflow-postgres-connection
+    webserverSecretKeySecretName: airflow-webserver-secret-key
+    env:
+    - name: "DB_SERVICE_HOST"
+      value: "$(AIRFLOW_DATABASE_SERVICE_NAME)-rw"
+    - name: "DB_SERVICE_PORT"
+      value: "5432"