diff --git a/applications/infisical/Infisical-secrets/searxng-infisicalsecret.yaml b/applications/infisical/Infisical-secrets/searxng-infisicalsecret.yaml
deleted file mode 100644
index 5218eeb..0000000
--- a/applications/infisical/Infisical-secrets/searxng-infisicalsecret.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-apiVersion: secrets.infisical.com/v1alpha1
-kind: InfisicalSecret
-metadata:
-  name: searxng-secrets
-  namespace: infisical
-spec:
-  hostAPI: https://infisical.jsme.be
-  resyncInterval: 30
-  authentication:
-    kubernetesAuth:
-      identityId: "5458def7-7c63-40d2-95da-41c614d0933a"
-      serviceAccountRef:
-        name: infisical-auth
-        namespace: infisical
-      autoCreateServiceAccountToken: true
-      secretsScope:
-        projectSlug: "kubernetes"
-        envSlug: "prod"
-        secretsPath: "/searxng"
-        recursive: true
-  managedSecretReference:
-    secretName: searxng-secrets
-    secretNamespace: searxng
-    secretType: Opaque
diff --git a/applications/infisical/Infisical-secrets/outline-infisicalsecret.yaml b/applications/passbolt/mariadb/infisicalsecret.yaml
similarity index 67%
rename from applications/infisical/Infisical-secrets/outline-infisicalsecret.yaml
rename to applications/passbolt/mariadb/infisicalsecret.yaml
index 425f0fa..5e75138 100644
--- a/applications/infisical/Infisical-secrets/outline-infisicalsecret.yaml
+++ b/applications/passbolt/mariadb/infisicalsecret.yaml
@@ -1,7 +1,7 @@
 apiVersion: secrets.infisical.com/v1alpha1
 kind: InfisicalSecret
 metadata:
-  name: outline-secrets
+  name: passbolt-mariadb-secrets
   namespace: infisical
 spec:
   hostAPI: https://infisical.jsme.be
@@ -16,9 +16,10 @@ spec:
       secretsScope:
         projectSlug: "kubernetes"
         envSlug: "prod"
-        secretsPath: "/outline"
-        recursive: true
+        secretsPath: "/passbolt/mariadb"
+        # Non-recursive: keys are already named as the container expects.
+        recursive: false
   managedSecretReference:
-    secretName: outline-secrets
-    secretNamespace: outline
+    secretName: passbolt-mariadb-secrets
+    secretNamespace: passbolt
     secretType: Opaque
diff --git a/applications/passbolt/mariadb/passbolt-mariadb-statefulset.yaml b/applications/passbolt/mariadb/passbolt-mariadb-statefulset.yaml
index eeddf04..b474592 100644
--- a/applications/passbolt/mariadb/passbolt-mariadb-statefulset.yaml
+++ b/applications/passbolt/mariadb/passbolt-mariadb-statefulset.yaml
@@ -31,24 +31,9 @@ spec:
               mountPath: /var/lib/mysql
           ports:
             - containerPort: 3306 
-          env:
-            - name: MYSQL_RANDOM_ROOT_PASSWORD
-              value: "true"
-            - name: MYSQL_DATABASE
-              valueFrom:
-                secretKeyRef:
-                  name: passbolt-secrets
-                  key: db_name
-            - name: MYSQL_USER
-              valueFrom:
-                secretKeyRef:
-                  name: passbolt-secrets
-                  key: db_user
-            - name: MYSQL_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: passbolt-secrets
-                  key: db_password
+          envFrom:
+            - secretRef:
+                name: passbolt-mariadb-secrets
       volumes:
         - name: passbolt-mariadb-volume
           persistentVolumeClaim:
diff --git a/applications/infisical/Infisical-secrets/passbolt-infisicalsecret.yaml b/applications/passbolt/passbolt/infisicalsecret.yaml
similarity index 72%
rename from applications/infisical/Infisical-secrets/passbolt-infisicalsecret.yaml
rename to applications/passbolt/passbolt/infisicalsecret.yaml
index 94f3399..0200f2a 100644
--- a/applications/infisical/Infisical-secrets/passbolt-infisicalsecret.yaml
+++ b/applications/passbolt/passbolt/infisicalsecret.yaml
@@ -1,7 +1,7 @@
 apiVersion: secrets.infisical.com/v1alpha1
 kind: InfisicalSecret
 metadata:
-  name: passbolt-secrets
+  name: passbolt-app-secrets
   namespace: infisical
 spec:
   hostAPI: https://infisical.jsme.be
@@ -16,9 +16,10 @@ spec:
       secretsScope:
         projectSlug: "kubernetes"
         envSlug: "prod"
-        secretsPath: "/passbolt"
-        recursive: true
+        secretsPath: "/passbolt/passbolt"
+        # Non-recursive: keys are already named as the container expects.
+        recursive: false
   managedSecretReference:
-    secretName: passbolt-secrets
+    secretName: passbolt-app-secrets
     secretNamespace: passbolt
     secretType: Opaque
diff --git a/applications/passbolt/passbolt/passbolt-statefulset.yaml b/applications/passbolt/passbolt/passbolt-statefulset.yaml
index 794e8f2..fa35857 100644
--- a/applications/passbolt/passbolt/passbolt-statefulset.yaml
+++ b/applications/passbolt/passbolt/passbolt-statefulset.yaml
@@ -36,60 +36,9 @@ spec:
               subPath: passbolt-ssl.conf
           ports:
             - containerPort: 80
-          env:
-            - name: APP_FULL_BASE_URL
-              value: https://passbolt.jsme.be
-            - name: APP_DEFAULT_TIMEZONE
-              value: Europe/Brussels
-            - name: PASSBOLT_SECURITY_CSP
-              value: "default-src 'self'; script-src 'self' chrome-extension: moz-extension:; style-src 'self' 'unsafe-inline'; img-src 'self'; frame-src 'self' chrome-extension: moz-extension: https://*.duosecurity.com; connect-src 'self' chrome-extension: moz-extension:; worker-src 'self' chrome-extension: moz-extension:; frame-ancestors 'none'; form-action 'self' https://*.duosecurity.com"
-            - name: DATASOURCES_DEFAULT_PORT
-              valueFrom:
-                secretKeyRef:
-                  name: passbolt-secrets
-                  key: db_port
-            - name: DATASOURCES_DEFAULT_HOST
-              valueFrom:
-                secretKeyRef:
-                  name: passbolt-secrets
-                  key: db_host
-            - name: DATASOURCES_DEFAULT_USERNAME
-              valueFrom:
-                secretKeyRef:
-                  name: passbolt-secrets
-                  key: db_user
-            - name: DATASOURCES_DEFAULT_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: passbolt-secrets
-                  key: db_password
-            - name: DATASOURCES_DEFAULT_DATABASE
-              valueFrom:
-                secretKeyRef:
-                  name: passbolt-secrets
-                  key: db_name
-            - name: EMAIL_DEFAULT_FROM
-              value: passbolt@jsme.be
-            - name: EMAIL_TRANSPORT_DEFAULT_HOST
-              value: smtp.office365.com
-            - name: EMAIL_TRANSPORT_DEFAULT_PORT
-              value: "587"
-            - name: EMAIL_TRANSPORT_DEFAULT_USERNAME
-              valueFrom:
-                secretKeyRef:
-                  name: passbolt-secrets
-                  key: smtp_username
-            - name: EMAIL_TRANSPORT_DEFAULT_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: passbolt-secrets
-                  key: smtp_password
-            - name: EMAIL_TRANSPORT_DEFAULT_TLS
-              value: "true"
-            - name: PASSBOLT_KEY_EMAIL
-              value: passbolt@jsme.be
-            - name: PASSBOLT_GPG_SERVER_KEY_FINGERPRINT_FORCE
-              value: "true"
+          envFrom:
+            - secretRef:
+                name: passbolt-app-secrets
       volumes:
         - name: gpg-volume
           persistentVolumeClaim: