diff --git a/argocd/applications/postgres-clusters.yaml b/argocd/applications/pgweb.yaml
similarity index 80%
rename from argocd/applications/postgres-clusters.yaml
rename to argocd/applications/pgweb.yaml
index 06b1f7a..b2666a2 100644
--- a/argocd/applications/postgres-clusters.yaml
+++ b/argocd/applications/pgweb.yaml
@@ -2,17 +2,17 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: postgres-clusters
+  name: pgweb
   namespace: argocd
 spec:
   project: k-space.ee
   source:
     repoURL: 'git@git.k-space.ee:k-space/kube.git'
-    path: postgres-clusters
+    path: pgweb
     targetRevision: HEAD
   destination:
     server: 'https://kubernetes.default.svc'
-    namespace: postgres-clusters
+    namespace: pgweb
   syncPolicy:
     automated:
       prune: true
diff --git a/postgres-clusters/pgweb.yaml b/pgweb/pgweb.yaml
similarity index 87%
rename from postgres-clusters/pgweb.yaml
rename to pgweb/pgweb.yaml
index 472eb45..fc72bef 100644
--- a/postgres-clusters/pgweb.yaml
+++ b/pgweb/pgweb.yaml
@@ -3,7 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: pgweb
-  namespace: postgres-clusters
+  namespace: pgweb
 spec:
   replicas: 1
   selector:
@@ -26,7 +26,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: pgweb
-  namespace: postgres-clusters
+  namespace: pgweb
 spec:
   selector:
     app: pgweb
@@ -49,12 +49,12 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: pgweb
-  namespace: postgres-clusters
+  namespace: pgweb
   annotations:
     kubernetes.io/ingress.class: traefik
     traefik.ingress.kubernetes.io/router.entrypoints: websecure
     external-dns.alpha.kubernetes.io/target: traefik.k-space.ee
-    traefik.ingress.kubernetes.io/router.middlewares: postgres-clusters-pgweb@kubernetescrd
+    traefik.ingress.kubernetes.io/router.middlewares: pgweb-pgweb@kubernetescrd
 spec:
   rules:
     - host: pgweb.k-space.ee
diff --git a/postgres-clusters/README.md b/postgres-clusters/README.md
deleted file mode 100644
index f7e2c1b..0000000
--- a/postgres-clusters/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Postgres clusters
-
-This is for shared Postgres clusters managed by the Codemowers' sample: [postgres-database-operator](https://github.com/codemowers/operatorlib/tree/main/samples/postgres-database-operator), which is deployed via [ArgoCD](https://argocd.k-space.ee/applications/argocd/postgres-database-operator)
-
-All instances run in a dedicated namespace. Clusters managed by operator-bundle. For more details check https://cloudnative-pg.io/.
-
-Admin access available via [pgweb.k-space.ee](https://pgweb.k-space.ee/).
-
-Deploying manually without ArgoCD:
-```
-kubectl create namespace postgres-clusters
-kubectl apply -n postgres-clusters -f application.yaml
-```
diff --git a/postgres-clusters/dedicated.yaml b/postgres-clusters/dedicated.yaml
deleted file mode 100644
index b85e91b..0000000
--- a/postgres-clusters/dedicated.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-apiVersion: codemowers.cloud/v1beta1
-kind: PostgresDatabaseClass
-metadata:
-  name: dedicated
-  annotations:
-    kubernetes.io/description: "Dedicated Postgres cluster"
-spec:
-  reclaimPolicy: Retain
-  replicas: 3
-  storageClass: postgres
-  podSpec:
-    containers:
-      - name: postgres
-        image: mirror.gcr.io/library/postgres:13.11@sha256:0f18de936266e03891e186db616e530e0e4365ef5fb300d4bb27318538b80604
-        imagePullPolicy: IfNotPresent
-    nodeSelector:
-      dedicated: storage
-    tolerations:
-      - effect: NoSchedule
-        key: dedicated
-        operator: Equal
-        value: storage
diff --git a/postgres-clusters/shared.yaml b/postgres-clusters/shared.yaml
deleted file mode 100644
index b5787fd..0000000
--- a/postgres-clusters/shared.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-apiVersion: codemowers.cloud/v1beta1
-kind: PostgresDatabaseClass
-metadata:
-  name: shared
-  annotations:
-    kubernetes.io/description: "Shared Postgres cluster"
-spec:
-  reclaimPolicy: Retain
-  shared: true
-  replicas: 3
-  storageClass: postgres
-  podSpec:
-    containers:
-      - name: postgres
-        image: mirror.gcr.io/library/postgres:13.11@sha256:0f18de936266e03891e186db616e530e0e4365ef5fb300d4bb27318538b80604
-        imagePullPolicy: IfNotPresent
-    nodeSelector:
-      dedicated: storage
-    tolerations:
-      - effect: NoSchedule
-        key: dedicated
-        operator: Equal
-        value: storage
diff --git a/postgres-clusters/storageclass.yaml b/postgres-clusters/storageclass.yaml
deleted file mode 100644
index 7bc12ce..0000000
--- a/postgres-clusters/storageclass.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-apiVersion: storage.k8s.io/v1
-kind: StorageClass
-metadata:
-  name: postgres
-  annotations:
-    kubernetes.io/description: |
-      Storage class for Postgres, Postgis and similar applications that
-      implement high availability in application layer.
-      This storage class uses XFS, has no block level redundancy and
-      has block device level caching disabled.
-provisioner: csi.proxmox.sinextra.dev
-reclaimPolicy: Retain
-volumeBindingMode: WaitForFirstConsumer
-allowVolumeExpansion: true
-parameters:
-  csi.storage.k8s.io/fstype: xfs
-  storage: ks-pvs
-  cache: none
-  ssd: "true"