diff --git a/core/variables.auto.tfvars b/core/variables.auto.tfvars
index 78ee78c..e129ea1 100644
--- a/core/variables.auto.tfvars
+++ b/core/variables.auto.tfvars
@@ -144,20 +144,14 @@ kubernetes = {
 
     pvc = {
       bitwarden-ca-certificates-pvc = {
-        #pvc_size   = "2Mi"
         mount_path = "/etc/bitwarden/ca-certificates"
-        #name       = "bitwarden-ca-certificates"
       }
 
       bitwarden-core-pvc = {
-        #pvc_size   = "2Mi"
         mount_path = "/etc/bitwarden/core"
-        #name       = "bitwarden-core"
       }
       bitwarden-logs-pvc = {
-        #pvc_size   = "2Mi"
         mount_path = "/etc/bitwarden/logs"
-        #name       = "bitwarden-logs"
         sub_path   = "admin"
       }
 
@@ -177,24 +171,15 @@ kubernetes = {
     environment         = {}
 
     pvc = {
-      bitwarden-ca-certificates = {
-
-        pvc_size   = "2Mi"
+      bitwarden-ca-certificates-pvc = {
         mount_path = "/etc/bitwarden/ca-certificates"
-        name       = "bitwarden-ca-certificates"
       }
 
-      bitwarden-core = {
-
-        pvc_size   = "2Mi"
+      bitwarden-core-pvc = {
         mount_path = "/etc/bitwarden/core"
-        name       = "bitwarden-core"
       }
-      bitwarden-logs = {
-
-        pvc_size   = "2Mi"
+      bitwarden-logs-pvc = {
         mount_path = "/etc/bitwarden/logs"
-        name       = "bitwarden-logs"
         sub_path   = "api"
       }
 
@@ -213,11 +198,8 @@ kubernetes = {
     environment         = {}
 
     pvc = {
-      bitwarden-core = {
-
-        pvc_size   = "2Mi"
+      bitwarden-core-pvc = {
         mount_path = "/etc/bitwarden/core/attachments"
-        name       = "bitwarden-core"
         sub_path   = "attachments"
       }
 
@@ -234,17 +216,11 @@ kubernetes = {
     environment         = {}
 
     pvc = {
-      bitwarden-ca-certificates = {
-
-        pvc_size   = "2Mi"
+      bitwarden-ca-certificates-pvc = {
         mount_path = "/etc/bitwarden/ca-certificates"
-        name       = "bitwarden-ca-certificates"
       }
-      bitwarden-logs = {
-
-        pvc_size   = "2Mi"
+      bitwarden-logs-pvc = {
         mount_path = "/etc/bitwarden/logs"
-        name       = "bitwarden-logs"
         sub_path   = "events"
       }
 
@@ -262,17 +238,11 @@ kubernetes = {
     environment         = {}
 
     pvc = {
-      bitwarden-ca-certificates = {
-
-        pvc_size   = "2Mi"
+      bitwarden-ca-certificates-pvc = {
         mount_path = "/etc/bitwarden/ca-certificates"
-        name       = "bitwarden-ca-certificates"
       }
-      bitwarden-logs = {
-
-        pvc_size   = "2Mi"
+      bitwarden-logs-pvc = {
         mount_path = "/etc/bitwarden/logs"
-        name       = "bitwarden-logs"
         sub_path   = "icons"
       }
     }
@@ -289,30 +259,18 @@ kubernetes = {
     environment         = {}
 
     pvc = {
-      bitwarden-identity = {
-
-        pvc_size   = "2Mi"
+      bitwarden-identity-pvc = {
         mount_path = "/etc/bitwarden/identity"
-        name       = "bitwarden-identity"
       }
-      bitwarden-ca-certificates = {
-
-        pvc_size   = "2Mi"
+      bitwarden-ca-certificates-pvc = {
         mount_path = "/etc/bitwarden/ca-certificates"
-        name       = "bitwarden-ca-certificates"
       }
 
-      bitwarden-core = {
-
-        pvc_size   = "2Mi"
+      bitwarden-core-pvc = {
         mount_path = "/etc/bitwarden/core"
-        name       = "bitwarden-core"
       }
-      bitwarden-logs = {
-
-        pvc_size   = "2Mi"
+      bitwarden-logs-pvc = {
         mount_path = "/etc/bitwarden/logs"
-        name       = "bitwarden-logs"
         sub_path   = "identity"
       }
     }
@@ -335,18 +293,12 @@ kubernetes = {
     }
 
     pvc = {
-      bitwarden-mssql = {
-
-        pvc_size   = "2Mi"
+      bitwarden-mssql-pvc = {
         mount_path = "/var/opt/mssql/data"
-        name       = "bitwarden-mssql"
         sub_path   = "data"
       }
-      bitwarden-logs = {
-
-        pvc_size   = "2Mi"
+      bitwarden-logs-pvc = {
         mount_path = "/etc/bitwarden/logs"
-        name       = "bitwarden-logs"
         sub_path   = "mssql"
       }
     }
@@ -362,30 +314,18 @@ kubernetes = {
     environment         = {}
 
     pvc = {
-      bitwarden-nginx = {
-
-        pvc_size   = "2Mi"
+      bitwarden-nginx-pvc = {
         mount_path = "/etc/bitwarden/nginx"
-        name       = "bitwarden-nginx"
       }
-      bitwarden-letsencrypt = {
-
-        pvc_size   = "2Mi"
+      bitwarden-letsencrypt-pvc = {
         mount_path = "/etc/letsencrypt"
-        name       = "bitwarden-letsencrypt"
       }
 
-      bitwarden-ssl = {
-
-        pvc_size   = "2Mi"
+      bitwarden-ssl-pvc = {
         mount_path = "/etc/ssl"
-        name       = "bitwarden-ssl"
       }
-      bitwarden-logs = {
-
-        pvc_size   = "2Mi"
+      bitwarden-logs-pvc = {
         mount_path = "/var/log/nginx"
-        name       = "bitwarden-logs"
         sub_path   = "nginx"
       }
     }
@@ -401,17 +341,12 @@ kubernetes = {
     environment         = {}
 
     pvc = {
-      bitwarden-ca-certificates = {
-
-        pvc_size   = "2Mi"
+      bitwarden-ca-certificates-pvc = {
         mount_path = "/etc/bitwarden/ca-certificates"
-        name       = "bitwarden-ca-certificates"
+        name       = "bitwarden-ca-certificates-pvc"
       }
-      bitwarden-logs = {
-
-        pvc_size   = "2Mi"
+      bitwarden-logs-pvc = {
         mount_path = "/etc/bitwarden/logs"
-        name       = "bitwarden-logs"
         sub_path   = "notifications"
       }
     }
@@ -427,29 +362,17 @@ kubernetes = {
     environment         = {}
 
     pvc = {
-      bitwarden-identity = {
-
-        pvc_size   = "2Mi"
+      bitwarden-identity-pvc = {
         mount_path = "/etc/bitwarden/identity"
-        name       = "bitwarden-identity"
       }
-      bitwarden-core = {
-
-        pvc_size   = "2Mi"
+      bitwarden-core-pvc = {
         mount_path = "/etc/bitwarden/core"
-        name       = "bitwarden-core"
       }
-      bitwarden-ca-certificates = {
-
-        pvc_size   = "2Mi"
+      bitwarden-ca-certificates-pvc = {
         mount_path = "/etc/bitwarden/ca-certificates"
-        name       = "bitwarden-ca-certificates"
       }
-      bitwarden-logs = {
-
-        pvc_size   = "2Mi"
+      bitwarden-logs-pvc = {
         mount_path = "/etc/bitwarden/logs"
-        name       = "bitwarden-logs"
         sub_path   = "sso"
       }
     }
@@ -465,11 +388,8 @@ kubernetes = {
     environment         = {}
 
     pvc = {
-      bitwarden-web = {
-
-        pvc_size   = "2Mi"
+      bitwarden-web-pvc = {
         mount_path = "/etc/bitwarden/web"
-        name       = "bitwarden-web"
       }
     }
   }