diff --git a/component/vshn_postgres.jsonnet b/component/vshn_postgres.jsonnet
index 5b35061c4..6339e88ba 100644
--- a/component/vshn_postgres.jsonnet
+++ b/component/vshn_postgres.jsonnet
@@ -89,6 +89,7 @@ local namespace = comp.KubeObject('v1', 'Namespace') +
                               [serviceNameLabelKey]: 'postgresql-standalone',
                               [serviceNamespaceLabelKey]: '',
                               'appuio.io/no-rbac-creation': 'true',
+                              'appuio.io/organization': 'vshn',
                             },
                           },
                         },
diff --git a/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml b/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml
index 77553d5e4..4a37c58e3 100644
--- a/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml
+++ b/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgres.yaml
@@ -34,6 +34,7 @@ spec:
                   appcat.vshn.io/claim-namespace: ''
                   appcat.vshn.io/servicename: postgresql-standalone
                   appuio.io/no-rbac-creation: 'true'
+                  appuio.io/organization: vshn
                 name: ''
           managementPolicy: Observe
           providerConfigRef:
@@ -68,6 +69,7 @@ spec:
                   appcat.vshn.io/claim-namespace: ''
                   appcat.vshn.io/servicename: postgresql-standalone
                   appuio.io/no-rbac-creation: 'true'
+                  appuio.io/organization: vshn
                 name: ''
           providerConfigRef:
             name: kubernetes
diff --git a/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgresrestore.yaml b/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgresrestore.yaml
index 80f9ca60a..5b4144e75 100644
--- a/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgresrestore.yaml
+++ b/tests/golden/vshn/appcat/appcat/21_composition_vshn_postgresrestore.yaml
@@ -34,6 +34,7 @@ spec:
                   appcat.vshn.io/claim-namespace: ''
                   appcat.vshn.io/servicename: postgresql-standalone
                   appuio.io/no-rbac-creation: 'true'
+                  appuio.io/organization: vshn
                 name: ''
           managementPolicy: Observe
           providerConfigRef:
@@ -68,6 +69,7 @@ spec:
                   appcat.vshn.io/claim-namespace: ''
                   appcat.vshn.io/servicename: postgresql-standalone
                   appuio.io/no-rbac-creation: 'true'
+                  appuio.io/organization: vshn
                 name: ''
           providerConfigRef:
             name: kubernetes