diff --git a/module.tf b/module.tf
index c20734f..25afd0a 100644
--- a/module.tf
+++ b/module.tf
@@ -17,7 +17,7 @@ provider "kubernetes" {
 provider "bitwarden-secrets" {
   api_url         = "https://bitwarden.tryton.geeraert.eu/api"
   identity_url    = "https://bitwarden.tryton.geeraert.eu/identity"
-  access_token    = "0.dd9b243a-b5f5-4b26-aaba-b3f70170088c.fjoaQEShPaEEZa7GmkTJXQYEmF5wVp:5B4jhLp5gRymNcwktMDyOg=="
+  access_token    = "0.7720f24b-4328-41ef-b70b-b419018270a3.nhBoRMSkfrlxqJVZ9W0W1g3lNFrmfI:35muVQz2mO3coR46bIZgcQ=="
   organization_id = "a6361589-badd-4bde-9cb4-af8901161c0d"
 }
 
@@ -60,6 +60,8 @@ variable "kubernetes" {
     liveness_http_get      = optional(string)
     liveness_http_get_path = optional(string)
     database               = optional(map(string))
+    database_command       = optional(list(string))
+    database_args          = optional(list(string))
     redis                  = optional(map(string))
     enabled                = optional(bool, true)
     secret_ref             = optional(list(string))
@@ -589,6 +591,7 @@ resource "kubernetes_deployment_v1" "automatic" {
       }
     }
   }
+  depends_on = [kubernetes_persistent_volume_claim_v1.automatic-pvc]
 }
 
 
@@ -650,7 +653,7 @@ resource "kubernetes_deployment_v1" "database-automatic" {
           }
 
           command = try([each.value.database.command], [])
-          #command = [try(each.value.database.command,"")]
+          args    = each.value.database_args != null ? each.value.database_args : []
 
           dynamic "env_from" {
             for_each = each.value.database != null && each.value.enabled == true && !(try(each.value.database.shunt, false)) ? ["${each.key}-db-terraform"] : []
@@ -973,6 +976,7 @@ resource "kubernetes_secret_v1" "automatic-database-secret" {
     PGDATABASE          = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_name[each.key].value}"
     DB_HOST             = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_host[each.key].value}"
     PGHOST              = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_host[each.key].value}"
+    POSTGRES_HOST       = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_host[each.key].value}"
     DB_PASSWORD         = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_password[each.key].value}"
     MYSQL_PASSWORD      = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_password[each.key].value}"
     MYSQL_ROOT_PASSWORD = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_password[each.key].value}"
@@ -982,7 +986,7 @@ resource "kubernetes_secret_v1" "automatic-database-secret" {
     POSTGRES_USER       = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_username[each.key].value}"
     MYSQL_USER          = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_username[each.key].value}"
     PGUSER              = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_username[each.key].value}"
-
+    DATABASE_URL        = "postgresql://${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_username[each.key].value}:${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_password[each.key].value}@${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_host[each.key].value}:${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_port[each.key].value}/${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_name[each.key].value}"
   }
 
 }
diff --git a/variables.auto.tfvars b/variables.auto.tfvars
index 67c6d73..49566d7 100644
--- a/variables.auto.tfvars
+++ b/variables.auto.tfvars
@@ -156,12 +156,12 @@ kubernetes = {
 
   gluetun = {
     #    enabled             = false
-    dns_nameservers = "10.2.0.1"
-    replicas        = 01
-    image           = "qmcgaw/gluetun:latest"
-    service_port    = [8888]
+    dns_nameservers = "1.1.1.1"
+    replicas     = 01
+    image        = "qmcgaw/gluetun:latest"
+    service_port = [8888]
     #extra_manifest    = ["/opt/kubernetes/Terraform_kube/external_manifests/gluetun/gluetun-secret-netherlandNL-FREE-280.yaml"]
-    secret_import    = ["5527ba11-07e3-415b-8d1f-b3ee0154eb56", "b0d22160-d81a-4702-a3dd-b40e0168d617","643dbe99-ace0-4ef5-8a2e-b44f014dccb0"]
+    secret_import    = ["5527ba11-07e3-415b-8d1f-b3ee0154eb56", "b0d22160-d81a-4702-a3dd-b40e0168d617", "643dbe99-ace0-4ef5-8a2e-b44f014dccb0"]
     security_context = true
     #    requirements = {
     #      limits-cpu      = "800Mi"
@@ -170,30 +170,6 @@ kubernetes = {
     #      requests-memory = "800Mi"
     #    }
     environment = {
-      DNS_ADDRESS = {
-        value_from = {
-          secret_key_ref = {
-            name = "gluetun-secret-nl-free-280"
-            key  = "VPN_DNS_IP"
-          }
-        }
-      }
-      WIREGUARD_ENDPOINT_IP = {
-        value_from = {
-          secret_key_ref = {
-            name = "gluetun-secret-nl-free-280"
-            key  = "VPN_ENDPOINT_IP"
-          }
-        }
-      }
-      WIREGUARD_ENDPOINT_PORT = {
-        value_from = {
-          secret_key_ref = {
-            name = "gluetun-secret-nl-free-280"
-            key  = "VPN_ENDPOINT_PORT"
-          }
-        }
-      }
       WIREGUARD_PRIVATE_KEY = {
         value_from = {
           secret_key_ref = {
@@ -202,46 +178,38 @@ kubernetes = {
           }
         }
       }
-      WIREGUARD_PUBLIC_KEY = {
-        value_from = {
-          secret_key_ref = {
-            name = "gluetun-secret-nl-free-280"
-            key  = "WIREGUARD_PUBLIC_KEY"
-          }
-        }
-      }
-      #      SHADOWSOCKS = {
       HTTPPROXY = {
         value = "on"
       }
-      #SHADOWSOCKS_LOG = {
       HTTPPROXY_LOG = {
         value = "on"
       }
       HTTPPROXY_LISTENING_ADDRESS = {
-        #SHADOWSOCKS_LISTENING_ADDRESS = {
         value = "0.0.0.0:8888"
       }
-      #      HTTPPROXY_USER = {
-      #        value = "user"
+      #      DNS_KEEP_NAMESERVER = {
+      #        value = "on"
       #      }
-
-      #SHADOWSOCKS_PASSWORD = {
-      #      HTTPPROXY_PASSWORD = {
-      #  value = "user"
-      #}
-      DNS_KEEP_NAMESERVER = {
-        value = "on"
-      }
       VPN_SERVICE_PROVIDER = {
-        value = "custom"
+        value = "protonvpn"
       }
       VPN_TYPE = {
         value = "wireguard"
       }
-      WIREGUARD_ADDRESSES = {
-        value = "10.2.0.2/32"
+      SERVER_COUNTRIES = {
+        value = "Netherlands"
       }
+      HEALTH_TARGET_ADDRESS = {
+        value = "0.0.0.0:8888"
+      }
+
+      FREE_ONLY = {
+        value = "on"
+      }
+
+      #      WIREGUARD_ADDRESSES = {
+      #        value = "10.2.0.2/32"
+      #      }
       FIREWALL_INPUT_PORTS = {
         value = "8081,7878,9696,9091,51413,8080,6881,8989,8191,8888,8000"
       }
@@ -249,11 +217,11 @@ kubernetes = {
         value = "ip2location"
       }
 
-      HEALTH_TARGET_ADDRESS = {
-        value = "protonvpn.com:80"
-      }
-      FIREWALL_OUTBOUND_SUBNETS = {
-      value = "10.0.0.0/24" }
+      #      HEALTH_TARGET_ADDRESS = {
+      #        value = "protonvpn.com:80"
+      #      }
+      #      FIREWALL_OUTBOUND_SUBNETS = {
+      #      value = "10.0.0.0/24" }
 
     }