diff --git a/apps/meet/calcom-kustomization.yaml b/apps/meet/calcom-kustomization.yaml
index cef0880..7fd0742 100644
--- a/apps/meet/calcom-kustomization.yaml
+++ b/apps/meet/calcom-kustomization.yaml
@@ -26,6 +26,8 @@ spec:
         name: stackspin-cluster-variables
       - kind: ConfigMap
         name: stackspin-calcom-kustomization-variables
+      - kind: Secret
+        name: stackspin-calcom-variables
       # OIDC
       - kind: Secret
         name: stackspin-calcom-oauth-variables
diff --git a/apps/meet/calcom-secrets/calcom-keys.yaml b/apps/meet/calcom-secrets/calcom-keys.yaml
deleted file mode 100644
index 9f75874..0000000
--- a/apps/meet/calcom-secrets/calcom-keys.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: secretgenerator.mittwald.de/v1alpha1
-kind: StringSecret
-metadata:
-  name: stackspin-calcom-keys
-  namespace: stackspout
-spec:
-  # DATABASE_URL
-  # NEXT_PUBLIC_WEBAPP_URL
-  fields:
-  - fieldName: NEXTAUTH_SECRET
-  - fieldName: CALENDSO_ENCRYPTION_KEY
diff --git a/apps/meet/calcom-secrets/calcom-postgres.yaml b/apps/meet/calcom-secrets/calcom-postgres.yaml
deleted file mode 100644
index c3065e4..0000000
--- a/apps/meet/calcom-secrets/calcom-postgres.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-apiVersion: secretgenerator.mittwald.de/v1alpha1
-kind: StringSecret
-metadata:
-  name: stackspin-calcom-postgres
-  namespace: stackspout
-spec:
-  fields:
-  - fieldName: password
-  - fieldName: postgres-password
diff --git a/apps/meet/calcom-secrets/calcom-variables.yaml b/apps/meet/calcom-secrets/calcom-variables.yaml
new file mode 100644
index 0000000..56c6692
--- /dev/null
+++ b/apps/meet/calcom-secrets/calcom-variables.yaml
@@ -0,0 +1,11 @@
+apiVersion: secretgenerator.mittwald.de/v1alpha1
+kind: StringSecret
+metadata:
+  name: stackspin-calcom-variables
+  namespace: flux-system
+spec:
+  fields:
+  - fieldName: postgresql_password
+  - fieldName: postgresql_postgres_password
+  - fieldName: nextauth_secret
+  - fieldName: calendso_key
diff --git a/apps/meet/calcom/calcom-keys.yaml b/apps/meet/calcom/calcom-keys.yaml
new file mode 100644
index 0000000..d137cf0
--- /dev/null
+++ b/apps/meet/calcom/calcom-keys.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: stackspin-calcom-keys
+  namespace: stackspout
+type: Opaque
+data:
+  DATABASE_URL: "postgresql://calcom:${postgresql_password}@calcom-postgresql/calcom"
+  NEXT_PUBLIC_WEBAPP_URL: "https://${calcom_domain}"
+  NEXTAUTH_SECRET: "${nextauth_secret}"
+  CALENDSO_ENCRYPTION_KEY: "${calendso_key}"
diff --git a/apps/meet/calcom/calcom-values-configmap.yaml b/apps/meet/calcom/calcom-values-configmap.yaml
index 58b2b6d..aa087c8 100644
--- a/apps/meet/calcom/calcom-values-configmap.yaml
+++ b/apps/meet/calcom/calcom-values-configmap.yaml
@@ -14,7 +14,8 @@ data:
       auth:
         database: calcom
         username: calcom
-        existingSecret: "stackspin-calcom-postgres"
+        password: "${postgresql_password}"
+        postgresPassword: "${postgresql_postgres_password}"
       primary:
         persistence:
           existingClaim: calcom-postgres
diff --git a/apps/status/gatus/gatus-release.yaml b/apps/status/gatus/gatus-release.yaml
index be81437..290f3dc 100644
--- a/apps/status/gatus/gatus-release.yaml
+++ b/apps/status/gatus/gatus-release.yaml
@@ -8,7 +8,7 @@ spec:
   chart:
     spec:
       chart: gatus
-      version: 1.0 # TODO
+      version: 3.4.1
       sourceRef:
         kind: HelmRepository
         name: minicloudlabs