diff --git a/app/inventory/prod.jsonnet b/app/inventory/prod.jsonnet
index 7519d9a..d8ecdf8 100644
--- a/app/inventory/prod.jsonnet
+++ b/app/inventory/prod.jsonnet
@@ -65,15 +65,8 @@
   },
 
   media: top.ns.Contain(kube.PersistentVolumeClaim(cfg.name)) {
-    spec+: {
-      storageClassName: cfg.storageClassName,
-      accessModes: ['ReadWriteOnce'],
-      resources: {
-        requests: {
-          storage: '20Gi',
-        },
-      },
-    },
+    storage: '20Gi',
+    storageClass: cfg.storageClassName,
   },
 
   psql: postgres {
diff --git a/app/matrix/lib/appservice-irc.libsonnet b/app/matrix/lib/appservice-irc.libsonnet
index 7906463..92a1b21 100644
--- a/app/matrix/lib/appservice-irc.libsonnet
+++ b/app/matrix/lib/appservice-irc.libsonnet
@@ -49,15 +49,8 @@
 
         dataVolume: kube.PersistentVolumeClaim("appservice-irc-%s" % [name]) {
             metadata+: cfg.metadata,
-            spec+: {
-                storageClassName: cfg.storageClassName,
-                accessModes: [ "ReadWriteOnce" ],
-                resources: {
-                    requests: {
-                        storage: "10Gi",
-                    },
-                },
-            },
+            storage: "10Gi",
+            storageClass: cfg.storageClassName,
         },
 
         bootstrapJob: if cfg.bootstrapJob then (kube.Job("appservice-irc-%s-bootstrap" % [name]) {
diff --git a/app/matrix/lib/appservice-telegram.libsonnet b/app/matrix/lib/appservice-telegram.libsonnet
index 7c1221c..5cfaf3a 100644
--- a/app/matrix/lib/appservice-telegram.libsonnet
+++ b/app/matrix/lib/appservice-telegram.libsonnet
@@ -58,15 +58,8 @@
 
         dataVolume: kube.PersistentVolumeClaim("appservice-telegram-%s" % [name]) {
             metadata+: cfg.metadata,
-            spec+: {
-                storageClassName: cfg.storageClassName,
-                accessModes: [ "ReadWriteOnce" ],
-                resources: {
-                    requests: {
-                        storage: "10Gi",
-                    },
-                },
-            },
+            storage: "10Gi",
+            storageClass: cfg.storageClassName,
         },
 
         bootstrapJob: if cfg.bootstrapJob then (kube.Job("appservice-telegram-%s-bootstrap" % [name]) {
diff --git a/app/matrix/lib/coturn.libsonnet b/app/matrix/lib/coturn.libsonnet
index f4fef24..c27b196 100644
--- a/app/matrix/lib/coturn.libsonnet
+++ b/app/matrix/lib/coturn.libsonnet
@@ -60,14 +60,8 @@
     },
 
     dataVolume: app.ns.Contain(kube.PersistentVolumeClaim("coturn-data")) {
-        spec+: {
-            storageClassName: cfg.storageClassName,
-            resources: {
-                requests: {
-                    storage: "10Gi",
-                },
-            },
-        },
+        storage: "10Gi",
+        storageClass: cfg.storageClassName,
     },
 
     deployment: app.ns.Contain(kube.Deployment("coturn")) {
diff --git a/app/matrix/lib/matrix.libsonnet b/app/matrix/lib/matrix.libsonnet
index 2b95345..b8a21f9 100644
--- a/app/matrix/lib/matrix.libsonnet
+++ b/app/matrix/lib/matrix.libsonnet
@@ -97,15 +97,8 @@
 
     dataVolume: kube.PersistentVolumeClaim("synapse-data-waw3") {
         metadata+: app.metadata("synapse-data"),
-        spec+: {
-            storageClassName: cfg.storageClassName,
-            accessModes: [ "ReadWriteOnce" ],
-            resources: {
-                requests: {
-                    storage: "50Gi",
-                },
-            },
-        },
+        storage: "50Gi",
+        storageClass: cfg.storageClassName,
     },
 
     // homeserver.yaml that will be used to run synapse (in synapseConfigMap).
@@ -266,15 +259,15 @@
             // Standard nginx.conf, made to work when running as unprivileged user.
             "nginx.conf": |||
                 worker_processes  auto;
-                
+
                 error_log  /tmp/nginx_error.log warn;
                 pid        /tmp/nginx.pid;
-                
+
                 events {
                     worker_connections  1024;
                 }
-                
-                
+
+
                 http {
                     client_body_temp_path /tmp/nginx_client_temp;
                     proxy_temp_path /tmp/nginx_proxy_temp;
@@ -290,16 +283,16 @@
                     access_log  /tmp/nginx_access.log  main;
                     sendfile        on;
                     keepalive_timeout  65;
-                    
+
                     server {
                         listen       8080;
                         server_name  localhost;
-                    
+
                         location / {
                             root   /usr/share/nginx/html;
                             index  index.html index.htm;
                         }
-                    
+
                         error_page   500 502 503 504  /50x.html;
                         location = /50x.html {
                             root   /usr/share/nginx/html;
diff --git a/app/matrix/lib/synapse.libsonnet b/app/matrix/lib/synapse.libsonnet
index 7b45308..324b2f2 100644
--- a/app/matrix/lib/synapse.libsonnet
+++ b/app/matrix/lib/synapse.libsonnet
@@ -31,15 +31,8 @@
     appservices:: error "appservices need to be provided",
 
     dataVolume: app.ns.Contain(kube.PersistentVolumeClaim("synapse-data-waw3")) {
-        spec+: {
-            storageClassName: cfg.storageClassName,
-            accessModes: [ "ReadWriteOnce" ],
-            resources: {
-                requests: {
-                    storage: "50Gi",
-                },
-            },
-        },
+        storage: "50Gi",
+        storageClass: cfg.storageClassName,
     },
 
     // homeserver.yaml that will be used to run synapse (in configMap).
diff --git a/app/onlyoffice/prod.jsonnet b/app/onlyoffice/prod.jsonnet
index 28fcb23..ecf61c7 100644
--- a/app/onlyoffice/prod.jsonnet
+++ b/app/onlyoffice/prod.jsonnet
@@ -19,15 +19,8 @@
         ns: kube.Namespace(cfg.namespace),
 
         pvc: oo.ns.Contain(kube.PersistentVolumeClaim("documentserver")) {
-            spec+: {
-                storageClassName: cfg.storageClassName,
-                accessModes: [ "ReadWriteOnce" ],
-                resources: {
-                    requests: {
-                        storage: "10Gi",
-                    },
-                },
-            },
+            storage: "10Gi",
+            storageClass: cfg.storageClassName,
         },
 
         deploy: oo.ns.Contain(kube.Deployment("documentserver")) {