diff --git a/app/matrix/lib/matrix.libsonnet b/app/matrix/lib/matrix.libsonnet
index 875cd42..dbf27d9 100644
--- a/app/matrix/lib/matrix.libsonnet
+++ b/app/matrix/lib/matrix.libsonnet
@@ -170,8 +170,8 @@
             template+: {
                 spec+: {
                     volumes_: {
-                        data: kube.PersistentVolumeClaimVolume(top.dataVolume),
-                        config: kube.ConfigMapVolume(top.synapseConfigMap),
+                        data: top.dataVolume.volume,
+                        config: top.synapseConfigMap.volume,
                     } + {
                         [k]: { secret: { secretName: "appservice-%s-registration" % [k] } }
                         for k in std.objectFields(top.appservices)
@@ -309,7 +309,7 @@
             template+: {
                 spec+: {
                     volumes_: {
-                        config: kube.ConfigMapVolume(top.riotConfigMap),
+                        config: top.riotConfigMap.volume,
                     },
                     containers_: {
                         web: kube.Container("riot-web") {