diff --git a/app/inventory/prod.jsonnet b/app/inventory/prod.jsonnet
index 080b931..1b81c97 100644
--- a/app/inventory/prod.jsonnet
+++ b/app/inventory/prod.jsonnet
@@ -1,5 +1,5 @@
 local kube = import "../../kube/hscloud.libsonnet";
-local postgres = import '../../kube/postgres_v.libsonnet';
+local postgres = import '../../kube/postgres.libsonnet';
 
 {
   local top = self,
@@ -75,6 +75,7 @@
       database: 'inventory',
       username: 'inventory',
       password: top.secretRefs.postgres,
+      versionedNames: true,
     },
     bouncer: {},
   },
diff --git a/app/mastodon/kube/mastodon.libsonnet b/app/mastodon/kube/mastodon.libsonnet
index 6e2d0ee..0687408 100644
--- a/app/mastodon/kube/mastodon.libsonnet
+++ b/app/mastodon/kube/mastodon.libsonnet
@@ -1,5 +1,5 @@
 local kube = import "../../../kube/kube.libsonnet";
-local postgres = import "../../../kube/postgres_v.libsonnet";
+local postgres = import "../../../kube/postgres.libsonnet";
 local redis = import "../../../kube/redis.libsonnet";
 
 {
@@ -129,6 +129,7 @@
             storageClassName: "waw-hdd-redundant-3",
             storageSize: "100Gi",
             opts: { wal_level: "logical" },
+            versionedNames: true,
         },
     },
 
diff --git a/kube/postgres.libsonnet b/kube/postgres.libsonnet
index 40f43dc..9ae1ccf 100644
--- a/kube/postgres.libsonnet
+++ b/kube/postgres.libsonnet
@@ -11,7 +11,9 @@
         storageClassName: "waw-hdd-paranoid-2",
         prefix: "", # if set, should be 'foo-'
 
-        image: "postgres:10.4",
+        version: "10.4", # valid version tag for https://hub.docker.com/_/postgres/
+        image: "postgres:" + self.version,
+
         database: error "database must be set",
         username: error "username must be set",
         # not literal, instead ref for env (like { secretKeyRef: ... })
@@ -53,16 +55,23 @@
             #   postgres:1.2-suffix, postgres:1-suffix, postgres:1.2, postgres:1
             to: std.native('regexSubst')("^[^:]+:([^.]+).*$", cfg.image, "${1}"),
         },
+
+        # If set to true, resources will be suffixed with postgres version (and will have versioned labels)
+        # This exists solely for backwards compatibility with old postgres_v libsonnet
+        # and should not be used in new deployments
+        versionedNames: false,
     },
 
-    makeName(suffix):: cfg.prefix + suffix,
+    safeVersion:: std.strReplace(cfg.version, ".", "-"),
+    makeName(suffix):: cfg.prefix + suffix + (if cfg.versionedNames then postgres.safeVersion else ""),
 
     metadata:: {
         namespace: cfg.namespace,
         labels: {
             "app.kubernetes.io/name": cfg.appName,
             "app.kubernetes.io/managed-by": "kubecfg",
-            "app.kubernetes.io/component": "postgres",
+            "app.kubernetes.io/component": if cfg.versionedNames then "postgres_v" else "postgres",
+            [if cfg.versionedNames then "hswaw.net/postgres-version" else null]: postgres.safeVersion,
         },
     },
 
diff --git a/kube/postgres_v.libsonnet b/kube/postgres_v.libsonnet
deleted file mode 100644
index 695422c..0000000
--- a/kube/postgres_v.libsonnet
+++ /dev/null
@@ -1,148 +0,0 @@
-# PostgreSQL on Kubernetes, with versioned names
-
-local kube = import "kube.libsonnet";
-
-{
-    local postgres = self,
-    local cfg = postgres.cfg,
-    cfg:: {
-        namespace: error "namespace must be set",
-        appName: error "app name must be set",
-        storageClassName: "waw-hdd-paranoid-2",
-        prefix: "", # if set, should be 'foo-'
-        version: "10.4", # valid version tag for https://hub.docker.com/_/postgres/
-
-        image: "postgres:" + cfg.version,
-        database: error "database must be set",
-        username: error "username must be set",
-        # not literal, instead ref for env (like { secretKeyRef: ... })
-        password: error "password must be set",
-
-        storageSize: "30Gi",
-
-        # This option can be used to customize initial database creation. For
-        # available options see: https://www.postgresql.org/docs/9.5/app-initdb.html
-        # Changing this option in already existing deployments will not affect
-        # existing database.
-        initdbArgs: null,
-
-        # Extra postgres configuration options passed on startup. Accepts only
-        # string values.
-        # Example: { max_connections: "300" }
-        opts: {},
-    },
-    safeVersion:: std.strReplace(cfg.version, ".", "-"),
-
-    makeName(suffix):: cfg.prefix + suffix + postgres.safeVersion,
-
-    metadata:: {
-        namespace: cfg.namespace,
-        labels: {
-            "app.kubernetes.io/name": cfg.appName,
-            "app.kubernetes.io/managed-by": "kubecfg",
-            "app.kubernetes.io/component": "postgres_v",
-            "hswaw.net/postgres-version": postgres.safeVersion,
-        },
-    },
-
-    volumeClaim: kube.PersistentVolumeClaim(postgres.makeName("postgres")) {
-        metadata+: postgres.metadata,
-        storage:: cfg.storageSize,
-        storageClass:: cfg.storageClassName,
-    },
-    deployment: kube.Deployment(postgres.makeName("postgres")) {
-        metadata+: postgres.metadata,
-        spec+: {
-            replicas: 1,
-            template+: {
-                spec+: {
-                    volumes_: {
-                        data: postgres.volumeClaim.volume,
-                    },
-                    containers_: {
-                        postgres: kube.Container(postgres.makeName("postgres")) {
-                            image: cfg.image,
-                            ports_: {
-                                client: { containerPort: 5432 },
-                            },
-                            env_: {
-                                POSTGRES_DB: cfg.database,
-                                POSTGRES_USER: cfg.username,
-                                POSTGRES_PASSWORD: cfg.password,
-                                PGDATA: "/var/lib/postgresql/data/pgdata",
-                            } + if cfg.initdbArgs != null then {
-                                POSTGRES_INITDB_ARGS: cfg.initdbArgs,
-                            } else {},
-
-                            args: std.flatMap(
-                                function(k) ["-c", "%s=%s" % [k, cfg.opts[k]]],
-                                std.objectFields(cfg.opts),
-                            ),
-
-                            volumeMounts_: {
-                                data: { mountPath: "/var/lib/postgresql/data" },
-                            },
-                        },
-                    },
-                    securityContext: {
-                        runAsUser: 999,
-                    },
-                },
-            },
-        },
-    },
-
-    svc: kube.Service(postgres.makeName("postgres")) {
-        metadata+: postgres.metadata,
-        target:: postgres.deployment,
-        spec+: {
-            ports: [
-                { name: "client", port: 5432, targetPort: 5432, protocol: "TCP" },
-            ],
-            type: "ClusterIP",
-        },
-    },
-
-    bouncer: {
-        deployment: kube.Deployment(postgres.makeName("bouncer")) {
-            metadata+: postgres.metadata {
-                labels+: {
-                    "app.kubernetes.io/component": "bouncer_v",
-                }
-            },
-            spec+: {
-                replicas: 1,
-                template+: {
-                    spec+: {
-                        containers_: {
-                            bouncer: kube.Container(postgres.makeName("bouncer")) {
-                                image: "edoburu/pgbouncer:1.11.0",
-                                ports_: {
-                                    client: { containerPort: 5432 },
-                                },
-                                env: [
-                                    { name: "POSTGRES_PASSWORD", valueFrom: cfg.password },
-                                    { name: "DATABASE_URL", value: "postgres://%s:$(POSTGRES_PASSWORD)@%s/%s" % [cfg.username, postgres.svc.host, cfg.database] },
-                                ],
-                            },
-                        },
-                    },
-                },
-            },
-        },
-        svc: kube.Service(postgres.makeName("bouncer")) {
-            metadata+: postgres.metadata {
-                labels+: {
-                    "app.kubernetes.io/component": "bouncer",
-                }
-            },
-            target:: postgres.bouncer.deployment,
-            spec+: {
-                ports: [
-                    { name: "client", port: 5432, targetPort: 5432, protocol: "TCP" },
-                ],
-                type: "ClusterIP",
-            },
-        },
-    },
-}