diff --git a/app/matrix/lib/appservice-irc.libsonnet b/app/matrix/lib/appservice-irc.libsonnet
index 92a1b21..f696970 100644
--- a/app/matrix/lib/appservice-irc.libsonnet
+++ b/app/matrix/lib/appservice-irc.libsonnet
@@ -116,7 +116,7 @@
 
         svc: kube.Service("appservice-irc-%s" % [name]) {
             metadata+: cfg.metadata,
-            target_pod:: bridge.deployment.spec.template,
+            target:: bridge.deployment,
         },
     },
 }
diff --git a/app/matrix/lib/appservice-telegram.libsonnet b/app/matrix/lib/appservice-telegram.libsonnet
index 5cfaf3a..209e855 100644
--- a/app/matrix/lib/appservice-telegram.libsonnet
+++ b/app/matrix/lib/appservice-telegram.libsonnet
@@ -147,7 +147,7 @@
 
         svc: kube.Service("appservice-telegram-%s" % [name]) {
             metadata+: cfg.metadata,
-            target_pod:: bridge.deployment.spec.template,
+            target:: bridge.deployment,
         },
     },
 }
diff --git a/app/matrix/lib/cas.libsonnet b/app/matrix/lib/cas.libsonnet
index 1a33aaa..f1de4fe 100644
--- a/app/matrix/lib/cas.libsonnet
+++ b/app/matrix/lib/cas.libsonnet
@@ -43,6 +43,6 @@
     },
 
     svc: app.ns.Contain(kube.Service("oauth2-cas-proxy")) {
-        target_pod:: app.deployment.spec.template,
+        target:: app.deployment,
     },
 }
diff --git a/app/matrix/lib/coturn.libsonnet b/app/matrix/lib/coturn.libsonnet
index c27b196..e63a0bc 100644
--- a/app/matrix/lib/coturn.libsonnet
+++ b/app/matrix/lib/coturn.libsonnet
@@ -130,7 +130,7 @@
     },
 
     svcTCP: app.ns.Contain(kube.Service("coturn-tcp")) {
-        target_pod:: app.deployment.spec.template,
+        target:: app.deployment,
         metadata+: {
             annotations+: {
                 "metallb.universe.tf/allow-shared-ip": "coturn",
@@ -150,7 +150,7 @@
     },
 
     svcUDP: app.ns.Contain(kube.Service("coturn-udp")) {
-        target_pod:: app.deployment.spec.template,
+        target:: app.deployment,
         metadata+: {
             annotations+: {
                 "metallb.universe.tf/allow-shared-ip": "coturn",
diff --git a/app/matrix/lib/matrix.libsonnet b/app/matrix/lib/matrix.libsonnet
index b8a21f9..c72b060 100644
--- a/app/matrix/lib/matrix.libsonnet
+++ b/app/matrix/lib/matrix.libsonnet
@@ -161,7 +161,7 @@
 
     casSvc: if cfg.cas.enable then kube.Service("oauth2-cas-proxy") {
         metadata+: app.metadata("oauth2-cas-proxy"),
-        target_pod:: app.casDeployment.spec.template,
+        target:: app.casDeployment,
     },
 
     synapseDeployment: kube.Deployment("synapse") {
@@ -219,7 +219,7 @@
 
     synapseSvc: kube.Service("synapse") {
         metadata+: app.metadata("synapse"),
-        target_pod:: app.synapseDeployment.spec.template,
+        target:: app.synapseDeployment,
     },
 
     riotConfig:: {
@@ -344,7 +344,7 @@
 
     riotSvc: kube.Service("riot-web") {
         metadata+: app.metadata("riot-web"),
-        target_pod:: app.riotDeployment.spec.template,
+        target:: app.riotDeployment,
     },
 
     wellKnown: if cfg.wellKnown then {
@@ -374,7 +374,7 @@
         },
         svc: kube.Service("wellknown") {
             metadata+: app.metadata("wellknown"),
-            target_pod:: app.wellKnown.deployment.spec.template,
+            target:: app.wellKnown.deployment,
         },
     } else {},
 
diff --git a/app/matrix/lib/media-repo.libsonnet b/app/matrix/lib/media-repo.libsonnet
index 7b7500f..4b079d8 100644
--- a/app/matrix/lib/media-repo.libsonnet
+++ b/app/matrix/lib/media-repo.libsonnet
@@ -115,7 +115,7 @@
     // Run //app/matrix/media-repo-proxy, if needed. This rewrites Host headers
     // from the homeserver's serving Host to the MXID hostname (which
     // matrix-media-repo expects).
-    // 
+    //
     // Currently we only are able to run one proxy for one homeserver config -
     // but we don't expect to have multiple homeservers per matrix-media-repo
     // any time soon.
@@ -158,10 +158,10 @@
     } else {},
 
     internalSvc: app.ns.Contain(kube.Service("media-repo-internal")) {
-        target_pod:: app.deployment.spec.template,
+        target:: app.deployment,
     },
 
     svc: if std.length(needProxying) > 0 then app.ns.Contain(kube.Service("media-repo")) {
-        target_pod:: app.proxies.deployment.spec.template,
+        target:: app.proxies.deployment,
     } else app.internalSvc,
 }
diff --git a/app/matrix/lib/riot.libsonnet b/app/matrix/lib/riot.libsonnet
index fc2f2e7..23273f9 100644
--- a/app/matrix/lib/riot.libsonnet
+++ b/app/matrix/lib/riot.libsonnet
@@ -90,6 +90,6 @@
     },
 
     svc: app.ns.Contain(kube.Service("riot-web")) {
-        target_pod:: app.deployment.spec.template,
+        target:: app.deployment,
     },
 }
diff --git a/app/matrix/lib/synapse.libsonnet b/app/matrix/lib/synapse.libsonnet
index 324b2f2..925a715 100644
--- a/app/matrix/lib/synapse.libsonnet
+++ b/app/matrix/lib/synapse.libsonnet
@@ -230,10 +230,10 @@
             },
         },
         svc: app.ns.Contain(kube.Service("synapse")) {
-            target_pod:: app.main.deployment.spec.template,
+            target:: app.main.deployment,
         },
         replicationSvc: app.ns.Contain(kube.Service("synapse-replication-master")) {
-            target_pod:: app.main.deployment.spec.template,
+            target:: app.main.deployment,
             spec+: {
                 ports: [
                     { port: 9093, name: 'replication', targetPort: 9093 },
@@ -262,7 +262,7 @@
             },
         },
         svc: app.ns.Contain(kube.Service("synapse-generic")) {
-            target_pod:: app.genericWorker.deployment.spec.template,
+            target:: app.genericWorker.deployment,
         },
 
         # Following paths can be handled by generic workers.
@@ -386,7 +386,7 @@
             },
         },
         svc: app.ns.Contain(kube.Service("synapse-media")) {
-            target_pod:: app.mediaWorker.deployment.spec.template,
+            target:: app.mediaWorker.deployment,
         },
     },
 
diff --git a/app/matrix/lib/wellknown.libsonnet b/app/matrix/lib/wellknown.libsonnet
index cdc5ceb..509b83c 100644
--- a/app/matrix/lib/wellknown.libsonnet
+++ b/app/matrix/lib/wellknown.libsonnet
@@ -36,6 +36,6 @@
         },
     },
     svc: app.ns.Contain(kube.Service("wellknown")) {
-        target_pod:: app.deployment.spec.template,
+        target:: app.deployment,
     },
 }