diff --git a/cluster/apps/data/joplin-server/helm-release.yaml b/cluster/apps/data/joplin-server/helm-release.yaml
index 4c870d953..cb1d3a6fc 100644
--- a/cluster/apps/data/joplin-server/helm-release.yaml
+++ b/cluster/apps/data/joplin-server/helm-release.yaml
@@ -40,7 +40,7 @@ spec:
       APP_BASE_URL: https://joplin.${SECRET_CLUSTER_DOMAIN}
       APP_PORT: 22300
       DB_CLIENT: pg
-      POSTGRES_HOST: postgresql
+      POSTGRES_HOST: postgresql-kube.data.svc.cluster.local.
       POSTGRES_PORT: 5432
       POSTGRES_DATABASE: joplin
       POSTGRES_USER: joplin
diff --git a/cluster/apps/data/recipes/helm-release.yaml b/cluster/apps/data/recipes/helm-release.yaml
index f6602bdb4..2a00bdd26 100644
--- a/cluster/apps/data/recipes/helm-release.yaml
+++ b/cluster/apps/data/recipes/helm-release.yaml
@@ -25,15 +25,15 @@ spec:
       tag: 0.15.2
       pullPolicy: IfNotPresent
     env:
-      SECRET_KEY: ${SECRET_POSTGRESQL_RECIPES_SECRET_KEY}
+      SECRET_KEY: ${SECRET_RECIPES_SECRET_KEY}
       DEBUG: "0"
       ALLOWED_HOSTS: "*"
       DB_ENGINE: django.db.backends.postgresql
-      POSTGRES_HOST: postgresql
+      POSTGRES_HOST: postgresql-kube.data.svc.cluster.local.
       POSTGRES_PORT: 5432
       POSTGRES_DB: recipes
       POSTGRES_USER: recipes
-      POSTGRES_PASSWORD: ${SECRET_POSTGRESQL_RECIPES_DB_PASSWORD}
+      POSTGRES_PASSWORD: ${SECRET_RECIPES_DB_PASSWORD}
       GUNICORN_MEDIA: "0"
       TIMEZONE: Europe/Paris
       FRACTION_PREF_DEFAULT: "0"
diff --git a/cluster/apps/data/vikunja/helm-release.yaml b/cluster/apps/data/vikunja/helm-release.yaml
index 9d8dfc9a0..ceb802957 100644
--- a/cluster/apps/data/vikunja/helm-release.yaml
+++ b/cluster/apps/data/vikunja/helm-release.yaml
@@ -54,7 +54,7 @@ spec:
           - name: VIKUNJA_SERVICE_JWTSECRET
             value: ${SECRET_VIKUNJA_JWT_SECRET}
           - name: VIKUNJA_DATABASE_HOST
-            value: postgresql
+            value: postgresql-kube.data.svc.cluster.local.
           - name: VIKUNJA_DATABASE_DATABASE
             value: vikunja
           - name: VIKUNJA_DATABASE_USER
diff --git a/cluster/apps/development/gitea/helm-release.yaml b/cluster/apps/development/gitea/helm-release.yaml
index 421ff2842..fb35d7a3f 100644
--- a/cluster/apps/development/gitea/helm-release.yaml
+++ b/cluster/apps/development/gitea/helm-release.yaml
@@ -53,7 +53,7 @@ spec:
         APP_NAME: "Homelab Gitea"
         database:
           DB_TYPE: postgres
-          HOST: postgresql:5432
+          HOST: postgresql-kube.data.svc.cluster.local.:5432
           NAME: gitea
           USER: gitea
           PASSWD: ${SECRET_GITEA_DB_PASSWORD}
diff --git a/cluster/apps/media/lychee/helm-release.yaml b/cluster/apps/media/lychee/helm-release.yaml
index fa31769c4..ae440d20e 100644
--- a/cluster/apps/media/lychee/helm-release.yaml
+++ b/cluster/apps/media/lychee/helm-release.yaml
@@ -51,7 +51,7 @@ spec:
     env:
       PHP_TZ: Europe/Paris
       DB_CONNECTION: pgsql
-      DB_HOST: postgresql
+      DB_HOST: postgresql-kube.data.svc.cluster.local.
       DB_PORT: 5432
       DB_DATABASE: lychee
       DB_USERNAME: lychee
diff --git a/cluster/apps/monitoring/healthchecks/helm-release.yaml b/cluster/apps/monitoring/healthchecks/helm-release.yaml
index c47313321..972f62e27 100644
--- a/cluster/apps/monitoring/healthchecks/helm-release.yaml
+++ b/cluster/apps/monitoring/healthchecks/helm-release.yaml
@@ -35,7 +35,7 @@ spec:
       EMAIL_USE_TLS: "True"
       ALLOWED_HOSTS: "*"
       DB: postgres
-      DB_HOST: postgresql
+      DB_HOST: postgresql-kube.data.svc.cluster.local.
       DB_PORT: 5432
       DB_NAME: healthchecks
       DB_USER: healthchecks
diff --git a/cluster/apps/networking/authelia/deployment.yaml b/cluster/apps/networking/authelia/deployment.yaml
index afc50963d..21c61f2d5 100644
--- a/cluster/apps/networking/authelia/deployment.yaml
+++ b/cluster/apps/networking/authelia/deployment.yaml
@@ -569,7 +569,7 @@ data:
 
       # Settings to connect to PostgreSQL server
       postgres:
-        host: postgresql
+        host: postgresql-kube.data.svc.cluster.local.
         port: 5432
         database: authelia
         username: authelia
diff --git a/cluster/base-custom/secrets/cluster-secrets.yaml b/cluster/base-custom/secrets/cluster-secrets.yaml
index 629ac4e4d..9a71aa95f 100644
--- a/cluster/base-custom/secrets/cluster-secrets.yaml
+++ b/cluster/base-custom/secrets/cluster-secrets.yaml
@@ -15,7 +15,7 @@ stringData:
     SECRET_AUTHELIA_USER_HELENE_PASSWORD: ENC[AES256_GCM,data:r7RCsvW3dASffA6RvdTLiMxyMdxNFSnu2GvL++2Z99plgB2vPVY8nHdsn5vIE9gl6o9qqStDG/J6ILJFgGiBqDnUyKTce0IfogLXSlZxRaGaQasOuqSbqLhYhkGtLeijAsZj,iv:X5K67H0KK4Nr1jGAKrmAyXjeL6FrLEEu828tpDJftF8=,tag:+j8UDnMunI5Z//p3x70Uxg==,type:str]
     SECRET_AUTHELIA_USER_VISITOR_EMAIL: ENC[AES256_GCM,data:+FlEMqJoC3iPGhv07QB38ZnaRO9z+w==,iv:D5mjemq8R/uJ/Q3GGuOj/bImgNsSh/3BctUo6xGaQGE=,tag:cmnk+vqj68pGl0wbgc2vpQ==,type:str]
     SECRET_AUTHELIA_USER_VISITOR_PASSWORD: ENC[AES256_GCM,data:M3PasS1/apIReK7mvK/Sfigd0EaRWi2UcY1Te4KdxTW9TQZ5xDVcKrz8SeuL4E+ZRW6T78PZZkxjrISMhyDM2iq3tWLoy0zLYymwSY137TmQTji3XD7N2bZRgCpjIPW30qAs,iv:2kZHCAlnV4209ZiykEUg/3baA9t8X4SWFWlgfFniMkw=,tag:8+M2c/TcPZ2XLEgqthBc2Q==,type:str]
-    SECRET_BITWARDENRS_DB_URL: ENC[AES256_GCM,data:6mfMn5ThyMnFUecSyRswOLamkzUeKI+Xd0cQHfyrh4JBOrW90VGSVEmMU/5daSgC3OcdKMWiUfKuDGk8JAe9rRWk2A==,iv:ELiNAtI4vu9BtBxTZls55T7nRQUkqGvyFmyV2unk6oI=,tag:5vMaptG/PG2PcHcH46PT+A==,type:str]
+    SECRET_BITWARDENRS_DB_URL: ENC[AES256_GCM,data:Gybe6AejZu9A6xDkoRPOh4VaHVlev4jeIO67lRH1fhTN88VIlSKH5yAMgxWI4OJXxyGcCfYWfTOWXymmBDviQ1xb91p7i+xT/M9A7qiXfgNp97z9rgFsqcBX1JWLL/vk,iv:Tw96n5cGCzyS+uDoozc6LkfX6cImYE295Nwvj5wI3kk=,tag:oU22U952mxERlI2slaonEw==,type:str]
     SECRET_BOOKSTACK_DB_PASSWORD: ENC[AES256_GCM,data:TteVVQsZT7egxPWuGjAyyA==,iv:7+HLAn51sVBgRIiy2faxMKq1uUfFuq95M0t6q5JQb8Y=,tag:fcA0Ktq7A7tWHLffJllJTg==,type:str]
     SECRET_BOTKUBE_DISCORD_BOTID: ENC[AES256_GCM,data:wrB1X4YA5slmOLZfEdPrJs2D,iv:WZpalYHjQpmhztIBkuQiObU/1QgEzfSVmRlM1+tJYOo=,tag:W5vFrLupQOlKhFzkFNmI0w==,type:str]
     SECRET_BOTKUBE_DISCORD_TOKEN: ENC[AES256_GCM,data:oQysE+qgLQwgfpe5zR+8eF+73DRaaNwkAPEcUj8gtPjQ1B/8h3pEbStSbXMdPVBz5y+I9epvlFkBYXg=,iv:8OW4by4qv1EHRKEKF/8kVj7UKKpqwN0Be+aMIllN4/M=,tag:ncYhQG3slWxaS0G1zLoSuw==,type:str]
@@ -25,7 +25,7 @@ stringData:
     SECRET_CLUSTER_DOMAIN: ENC[AES256_GCM,data:UeIrd+KDHgNisv/HOQF/,iv:X2AwEmMIMdBwahzzBkQqRpVoqvNm+50jbw4ciOsp+D4=,tag:9b+0OIgfLEhkH+lNbDdbbw==,type:str]
     SECRET_CLUSTER_OVH_APPLICATION_KEY: ENC[AES256_GCM,data:BJzUps3iKHYhkkk4UZVf9w==,iv:jS8dChLKXhTqgxLVD1PL5jwo+uYGlz5MJz7mpjK1t4k=,tag:VTASq3rfIPz61MFbmXMvgA==,type:str]
     SECRET_CLUSTER_OVH_CONSUMER_KEY: ENC[AES256_GCM,data:iBP1Xy5nWV69uhzhH4uAV9nejo9553TYrMsaz25jYm0=,iv:gphXUH6rMF/qDyc4d+OBPBpZPmwlpqVvAU26tBDF00Y=,tag:zDtP6+usZd4qvVc7/Fo2HQ==,type:str]
-    SECRET_DRONE_DATABASE_DATASOURCE: ENC[AES256_GCM,data:cHRXNQ3kKQyzvl4g7FMk98iGX1hSNcO2/wxup43UGK4xJwHVkn4lrVdq7LFRDcyrArg+IWyDvcajC8jxuE2TT/5veVwYrYU=,iv:kpLjlIqordLf24qOlzPg6CGNEK85HawvkTBVY8A/n4U=,tag:AXnsI5RTy2a3Qjvw/SThBg==,type:str]
+    SECRET_DRONE_DATABASE_DATASOURCE: ENC[AES256_GCM,data:fk6FSD9EHoMqVcJCpZ+aHu1fQFSoJBV/HxFv6NWdmILjjNDPcEtHNQCf/JVapo1xeTNxx1v2cDxm/wDtZtyx/sQ++WH08HgXbp/TCYlfUhzhyTOYgCBbwvEPuY/QdErBDOCC9Q==,iv:Bq7EOGjbumfsim5lPHQXEG0QGxaCzt/NdG8jLsOELRc=,tag:vrCJNKEVkrr5QEWtrq6LhQ==,type:str]
     SECRET_DRONE_DATABASE_SECRET: ENC[AES256_GCM,data:AdyEPvRMNu7R22dfNz3y7aLQZm/M2c/G4eLyj3qFwDo=,iv:BV9JEt2NxBU/CMI1BV9IPWLG7z8b7cIoibt4ih8tU+8=,tag:NlAkLldggkWculUbRak/Og==,type:str]
     SECRET_DRONE_GITEA_CLIENT_ID: ENC[AES256_GCM,data:iTvDLT5qTc2WvVjtt7ECKcaG+hyo90+FLVxhLrucnC4xLiWV,iv:6GgVzSFIqt9fezaadPwBeC9kGxKa6jy0v2XIjzJqiF8=,tag:J0pNhUsRBX2jMoBkjnbxfA==,type:str]
     SECRET_DRONE_GITEA_CLIENT_SECRET: ENC[AES256_GCM,data:4px2CW9GyixD9nV6d+gSkDDsF8/Dg1eBHGIGO1fLntvh4APz/3NYpugbPpU=,iv:AOC21Pg/dwELmVEPsKY0XZ5zsEMuWqFfuT3ippe5sf8=,tag:RK1pw9WyWmlC0biCcP+Zxg==,type:str]
@@ -35,7 +35,7 @@ stringData:
     SECRET_GITEA_ADMIN_EMAIL: ENC[AES256_GCM,data:KBAcyGqLv2E+gxQXouY28KIW8zFM,iv:MWNo0rbnNlJIbzFwzb7ErnLy1SmXvXcdRTVHykNfvtM=,tag:Sy4KRJhKnbXiKlbPuWm2VA==,type:str]
     SECRET_GITEA_ADMIN_PASSWORD: ENC[AES256_GCM,data:rfFObpWDIcJ4ljgqdMU=,iv:v+AZElA3alqCt1nAbRvyYnHWNL5ifo/kMa0n27kfpNM=,tag:cZOWMNAE+Z6fQm+LZWSKdw==,type:str]
     SECRET_GITEA_DB_PASSWORD: ENC[AES256_GCM,data:4/nWusn3aDGe+crwvXI=,iv:a2562BD27lO3RhMHMGRACg8zZFnLHBWt1SoUQkOUGbw=,tag:hUhwuPWlyMzKQfQqfaO82Q==,type:str]
-    SECRET_HASS_DB_URL: ENC[AES256_GCM,data:eZpnVrwtb2Y4BcjqS1IrR5jxnnONo2Oh4CKX1QEPrruTSbLn8lo5LOsKcCyc4pCcLdI=,iv:/PbwIoCCp74YEk3ePHuv1OA4ZjRfbTNWKRx62y12dz0=,tag:iFbJRqwbAWBI3nZpK9ZKeA==,type:str]
+    SECRET_HASS_DB_URL: ENC[AES256_GCM,data:pzVQrJ0D6yES1kKyUxA0uJ0TTUQqhmGWxNam66juGIcbb3kCppxbouETpqHcp5QEgLKK7mm5uFxxSIOKfnm4/Am9oY0e9ipoSMhdo55CMA==,iv:lpCwQB9YydPO8KihQ6IdMsT0r1aB3AotjDYZQUk9Bo4=,tag:5WB2EvQOmvKJIxGl5URtng==,type:str]
     SECRET_HASS_LATITUDE: ENC[AES256_GCM,data:izfpG1NAYfwa1s4VPPiQRno=,iv:VYve/iaGWu9GjxcIvvYKEUoKGWFB5gGgyB7wUo36Brk=,tag:ApRKvjThSI6D1zPD6kAHZw==,type:str]
     SECRET_HASS_LONGITUDE: ENC[AES256_GCM,data:Mg5knjt8Pr0BzDHMy7puX34=,iv:243rKl1O8v+ZC8l+KZKCMeHe9d4cXDRjoN/U3xFbf58=,tag:NOZn8ol/+TCC5V7qPZLn9g==,type:str]
     SECRET_HASS_ELEVATION: ENC[AES256_GCM,data:3mM=,iv:DXnrd+piHbZuZxjUBkfYZRj80qpcK1+sxthmobSsptY=,tag:sSFj0MjdhEsZf8PNwlV1zw==,type:str]
@@ -59,10 +59,10 @@ stringData:
     SECRET_PGADMIN_PASSWORD: ENC[AES256_GCM,data:Vde194icfO2EEKMYLBI=,iv:j2Oc7KQkbF04flcy/Ocnxi03AzksBDRiOg8AwNSw0WU=,tag:klpDtxsR7bL4saA3W387Hg==,type:str]
     SECRET_POSTGRESQL_KUBE_POSTGRES_PASSWORD: ENC[AES256_GCM,data:4nCHYL9GOmQVL8a8ChrSbw==,iv:VAz+tQemtU6uxD+kVwqoF3AEgBb0VZ143BrTEGBboN8=,tag:oXJLCfK1keOSL3lE7IS+dQ==,type:str]
     SECRET_POSTGRESQL_POSTGRES_PASSWORD: ENC[AES256_GCM,data:4+g7n9vz8EPEqImmN6U=,iv:5EktBYhdxTX1JH/wcK3psjphrRoySvq3g/kKqDeGAAs=,tag:R4bfs3/BzViz7i2Q5Eo6Lg==,type:str]
-    SECRET_POSTGRESQL_RECIPES_DB_PASSWORD: ENC[AES256_GCM,data:N2lA1M8u+TA3uHkrUM7sbA==,iv:7GnaqsAlIvwcfqBxoUDgh7Aa4ktNZVi8HA9ozokIKoE=,tag:cYGFt/SaLYZ3PgYaBmJ0Pw==,type:str]
-    SECRET_POSTGRESQL_RECIPES_SECRET_KEY: ENC[AES256_GCM,data:0RHhXZSEdFQt8HxLD8XiUA==,iv:84T8WoEOZZUlyK5GEd0VkcsnVqt5j1neZXE7WuXkuXA=,tag:l8vtlOkupkHwqt5/f5Evwg==,type:str]
+    SECRET_RECIPES_DB_PASSWORD: ENC[AES256_GCM,data:xrGotJzNqXy1lV8x5E1gTw==,iv:Hq4upOt2IDgZj9k83KiFa0xOQDxwVZj+J2DeMbtvJ8Q=,tag:37cUjvjXr4PWmsgYRJbe8A==,type:str]
+    SECRET_RECIPES_SECRET_KEY: ENC[AES256_GCM,data:PIvlJPnXVSS6nZQWWIVbWg==,iv:g1Q8NLAANO0EfnDV0Uo5VFh/LHKzBRCaYkCe7VfJaDo=,tag:xib4FFYHHa3mQM/2WT3O3g==,type:str]
     SECRET_SHARRY_DB_PASSWORD: ENC[AES256_GCM,data:0Go2Il1BESQeIqO4bkQ=,iv:oTjVEdJ2V/s+52hpwCQ4frb4Lhj1O3piQYJW31FtHuc=,tag:XjVfj105rDldWsjbNe6hKg==,type:str]
-    SECRET_SHARRY_JDBC_URL: ENC[AES256_GCM,data:RfhZOaZzR8UNNzHcYD8md0tSbEE5LyK1yYar6nWuu/PdzU2PbC61Wg==,iv:LlUu8eTOxt/OIgVVUsu9Xag+WVAuRboO6lJdjgDa55U=,tag:W7SERn+CPD0YDcg8JQkRYQ==,type:str]
+    SECRET_SHARRY_JDBC_URL: ENC[AES256_GCM,data:Ae/6McZQi+C2tobgkCMzCX0KRWPMH/g8bN5AHBRx0UppS7P0i0OsnvrsnJKqkkIRwlPPZVkPaK9Hb11cXa0zM5742n0f,iv:mqDu5fzP2Zi4YqlQwbvomdPUryPk/xiaN70YJIh/iKU=,tag:8GY7qpdObFqYbOE5VXnMRQ==,type:str]
     SECRET_SEARX_MORTY_KEY: ENC[AES256_GCM,data:/zX3pPAImKRtf5ydmSY/xDUXX52wIQCK/zGm2tpiguKrC3E9OVkkAvM4lSQ=,iv:1qWPlEXePDKlEEl+wQ+/qJspNEkAJNYjx7ouKEbWfkY=,tag:4Eyf4qQGiSliixJnZs2pSQ==,type:str]
     SECRET_QBITTORRENT_PASSWORD: ENC[AES256_GCM,data:5uMYdy9Ag+xdfb3jspuqoHDysGs=,iv:S9AQda1Hh6iSTMVe5yGgZk45ojco4G9tOOmPKruJMjY=,tag:H6PYjAi0/xKvsiGsn4+jeg==,type:str]
     SECRET_VIKUNJA_JWT_SECRET: ENC[AES256_GCM,data:YmiqNSfdiKmyaptMp6wJSeMT/sVcN1hXlo6x2Aoave8=,iv:NDMumWI9Q274tZoYjGDbseuzoxtOSeFnAZv4RhOAL+s=,tag:6DTbimVgeWCDFAVY0ymv0g==,type:str]
@@ -72,8 +72,8 @@ sops:
     gcp_kms: []
     azure_kv: []
     hc_vault: []
-    lastmodified: '2021-04-21T00:12:54Z'
-    mac: ENC[AES256_GCM,data:N7soPYHcEszPQ3wzE4OfNuf/SJP8EELn7BHy57/qRueB+5qhqcD+qGkE/GW9ZkpPU7y4OJWatL4PKQI+lL3DmMUKaUbA3sM5EQXCJNLFkOdSwu9Ucuq4fx9qfScoaFGyqTk3cxuMrX+6D2ZONFbtKSEbPOOnLC+WyaK7Q6tbi2o=,iv:n8El7z0WkwNVWbcq1HWBaVCMQc012L1ZMTXRZC5owS8=,tag:VSnvpYmW3dvXAGhQ2n+tEQ==,type:str]
+    lastmodified: '2021-04-21T07:17:18Z'
+    mac: ENC[AES256_GCM,data:XIsxtVqEGIifUUEg4DnFl4sGcv7k/HTStjGLtypPByvWnL7wL2+wciOAp97vV6MR/6QBEl5Q36WCDl0NU/x/QZL/KQywJv1h3yrviMEgSTuJQY7dFjeUfC4zfSgWiXxqcIVlJb2bqYZ5JiE5IxfUK1AvFB7Ihc4fPhX8iXCjSiM=,iv:+Ta7b6hkHvHPTWLmMbm31sAWaoOtRMyIznuBCBI6ddQ=,tag:lrm8GhpmPmgs9MNlq90e7A==,type:str]
     pgp:
     -   created_at: '2021-04-19T23:03:06Z'
         enc: |