diff --git a/bundle/manifests/ibm-common-service-operator.clusterserviceversion.yaml b/bundle/manifests/ibm-common-service-operator.clusterserviceversion.yaml
index 3bf515261..a7d96d835 100644
--- a/bundle/manifests/ibm-common-service-operator.clusterserviceversion.yaml
+++ b/bundle/manifests/ibm-common-service-operator.clusterserviceversion.yaml
@@ -560,7 +560,7 @@ spec:
                 - watch
             - apiGroups:
                 - postgresql.k8s.enterprisedb.io
-                - postgresql.cnpg.ibm.com
+                - pg.ibm.com
               resources:
                 - clusters
               verbs:
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
index 329d27e25..035f07c51 100644
--- a/config/rbac/role.yaml
+++ b/config/rbac/role.yaml
@@ -215,7 +215,7 @@ rules:
   - watch
 - apiGroups:
   - postgresql.k8s.enterprisedb.io
-  - postgresql.cnpg.ibm.com
+  - pg.ibm.com
   resources:
   - clusters
   verbs:
diff --git a/helm/templates/rbac.yaml b/helm/templates/rbac.yaml
index b095654e1..5545d43c9 100644
--- a/helm/templates/rbac.yaml
+++ b/helm/templates/rbac.yaml
@@ -260,7 +260,7 @@ rules:
       - watch
   - apiGroups:
       - postgresql.k8s.enterprisedb.io
-      - postgresql.cnpg.ibm.com
+      - pg.ibm.com
     resources:
       - clusters
     verbs:
diff --git a/internal/controller/constant/odlm.go b/internal/controller/constant/odlm.go
index f70a379b7..83349d820 100644
--- a/internal/controller/constant/odlm.go
+++ b/internal/controller/constant/odlm.go
@@ -583,27 +583,13 @@ metadata:
     status-monitored-services: {{ .StatusMonitoredServices }}
 spec:
   operators:
-  - channel: stable-v1.25
-    fallbackChannels:
-      - stable-v1.22
-      - stable
-    installPlanApproval: {{ .ApprovalMode }}
-    name: ibm-cnpg-postgres-operator
-    namespace: "{{ .CPFSNs }}"
-    packageName: cnpg-ibm
-    scope: public
-    sourceName: ibm-cnpg-postgresql-operator-catalog
-    sourceNamespace: "{{ .CatalogSourceNs }}"
-  - channel: stable-v1.25
-    fallbackChannels:
-      - stable-v1.22
-      - stable
+  - channel: stable-v1.28
     installPlanApproval: {{ .ApprovalMode }}
     name: common-service-cnpg
     namespace: "{{ .CPFSNs }}"
-    packageName: cnpg-ibm
+    packageName: ibm-pg-operator
     scope: public
-    sourceName: ibm-cnpg-postgresql-operator-catalog
+    sourceName: {{ .CatalogSourceName }}
     sourceNamespace: "{{ .CatalogSourceNs }}"
 `
 )
@@ -2134,17 +2120,6 @@ spec:
   services:
   - name: common-service-cnpg
     resources:
-      - apiVersion: operator.ibm.com/v1alpha1
-        data:
-          spec:
-            requests:
-              - operands:
-                  - name: ibm-cnpg-postgres-operator
-                registry: common-service
-                registryNamespace: {{ .ServicesNs }}
-        force: true
-        kind: OperandRequest
-        name: cnpg-postgresql-operator-request  
       - apiVersion: cert-manager.io/v1
         kind: Certificate
         name: common-service-db-replica-tls-cert
@@ -2249,7 +2224,7 @@ spec:
         force: true
         kind: OperandBindInfo
         name: common-service-cnpg-bindinfo
-      - apiVersion: postgresql.cnpg.ibm.com/v1
+      - apiVersion: pg.ibm.com/v1
         kind: Cluster
         name: common-service-db          
         force: true
@@ -2302,7 +2277,7 @@ spec:
             imageName:
               templatingValueFrom:
                 configMapKeyRef:
-                  name: cnpg-ibm-operand-images-config
+                  name: ibm-pg-operator-operand-images-config
                   key: ibm-postgresql-16-operand-image
                   namespace: {{ .OperatorNs }}
             imagePullSecrets:
@@ -2709,17 +2684,14 @@ spec:
     configName: cloud-native-postgresql
     sourceName: {{ .CatalogSourceName }}
     sourceNamespace: "{{ .CatalogSourceNs }}"
-  - channel: stable-v1.25
-    fallbackChannels:
-      - stable-v1.22
-      - stable
-    name: ibm-cnpg-postgres-operator
+  - channel: stable-v1.28
+    name: ibm-pg-operator
     namespace: "{{ .CPFSNs }}"
-    packageName: cnpg-ibm
+    packageName: ibm-pg-operator
     scope: public
     installPlanApproval: {{ .ApprovalMode }}
-    configName: ibm-cnpg-postgres-operator
-    sourceName: ibm-cnpg-postgresql-operator-catalog
+    configName: ibm-pg-operator
+    sourceName: {{ .CatalogSourceName }}
     sourceNamespace: "{{ .CatalogSourceNs }}"
   - channel: alpha
     name: ibm-user-data-services-operator
diff --git a/internal/controller/constant/storageclass.go b/internal/controller/constant/storageclass.go
index 19ee854f5..d40435ce0 100644
--- a/internal/controller/constant/storageclass.go
+++ b/internal/controller/constant/storageclass.go
@@ -62,7 +62,7 @@ const StorageClassTemplate = `
       name: common-service-db
 - name: common-service-cnpg
   resources:
-    - apiVersion: postgresql.cnpg.ibm.com/v1
+    - apiVersion: pg.ibm.com/v1
       data:
         spec:
           storage:
diff --git a/internal/controller/rules/rules.go b/internal/controller/rules/rules.go
index 005dd0c68..527dddb7d 100644
--- a/internal/controller/rules/rules.go
+++ b/internal/controller/rules/rules.go
@@ -97,7 +97,7 @@ const ConfigurationRules = `
             shared_buffers: LARGEST_VALUE
 - name: common-service-cnpg
   resources:
-  - apiVersion: postgresql.cnpg.ibm.com/v1
+  - apiVersion: pg.ibm.com/v1
     kind: Cluster
     name: common-service-db
     data:
diff --git a/internal/controller/size/large_amd64.go b/internal/controller/size/large_amd64.go
index 28e5c0eed..7c8e50f57 100644
--- a/internal/controller/size/large_amd64.go
+++ b/internal/controller/size/large_amd64.go
@@ -91,7 +91,7 @@ const Large = `
             shared_buffers: 150MB
 - name: common-service-cnpg
   resources:
-  - apiVersion: postgresql.cnpg.ibm.com/v1
+  - apiVersion: pg.ibm.com/v1
     kind: Cluster
     name: common-service-db
     data:
diff --git a/internal/controller/size/large_ppc64le.go b/internal/controller/size/large_ppc64le.go
index d719127a7..a224eae4e 100644
--- a/internal/controller/size/large_ppc64le.go
+++ b/internal/controller/size/large_ppc64le.go
@@ -91,7 +91,7 @@ const Large = `
             shared_buffers: 150MB
 - name: common-service-cnpg
   resources:
-  - apiVersion: postgresql.cnpg.ibm.com/v1
+  - apiVersion: pg.ibm.com/v1
     kind: Cluster
     name: common-service-db
     data:
diff --git a/internal/controller/size/large_s390x.go b/internal/controller/size/large_s390x.go
index 2ff42f016..ffb7c3d68 100644
--- a/internal/controller/size/large_s390x.go
+++ b/internal/controller/size/large_s390x.go
@@ -91,7 +91,7 @@ const Large = `
             shared_buffers: 150MB
 - name: common-service-cnpg
   resources:
-  - apiVersion: postgresql.cnpg.ibm.com/v1
+  - apiVersion: pg.ibm.com/v1
     kind: Cluster
     name: common-service-db
     data:
diff --git a/internal/controller/size/medium_amd64.go b/internal/controller/size/medium_amd64.go
index 2449d2e82..6fc5ae47e 100644
--- a/internal/controller/size/medium_amd64.go
+++ b/internal/controller/size/medium_amd64.go
@@ -91,7 +91,7 @@ const Medium = `
             shared_buffers: 96MB
 - name: common-service-cnpg
   resources:
-  - apiVersion: postgresql.cnpg.ibm.com/v1
+  - apiVersion: pg.ibm.com/v1
     kind: Cluster
     name: common-service-db
     data:
diff --git a/internal/controller/size/medium_ppc64le.go b/internal/controller/size/medium_ppc64le.go
index 7ad51c60d..eabf47a77 100644
--- a/internal/controller/size/medium_ppc64le.go
+++ b/internal/controller/size/medium_ppc64le.go
@@ -91,7 +91,7 @@ const Medium = `
             shared_buffers: 96MB
 - name: common-service-cnpg
   resources:
-  - apiVersion: postgresql.cnpg.ibm.com/v1
+  - apiVersion: pg.ibm.com/v1
     kind: Cluster
     name: common-service-db
     data:
diff --git a/internal/controller/size/medium_s390x.go b/internal/controller/size/medium_s390x.go
index 917d8d08f..4c98627a2 100644
--- a/internal/controller/size/medium_s390x.go
+++ b/internal/controller/size/medium_s390x.go
@@ -91,7 +91,7 @@ const Medium = `
             shared_buffers: 96MB
 - name: common-service-cnpg
   resources:
-  - apiVersion: postgresql.cnpg.ibm.com/v1
+  - apiVersion: pg.ibm.com/v1
     kind: Cluster
     name: common-service-db
     data:
diff --git a/internal/controller/size/small_amd64.go b/internal/controller/size/small_amd64.go
index 050f62661..ebd6f5fde 100644
--- a/internal/controller/size/small_amd64.go
+++ b/internal/controller/size/small_amd64.go
@@ -91,7 +91,7 @@ const Small = `
             shared_buffers: 64MB
 - name: common-service-cnpg
   resources:
-  - apiVersion: postgresql.cnpg.ibm.com/v1
+  - apiVersion: pg.ibm.com/v1
     kind: Cluster
     name: common-service-db
     data:
diff --git a/internal/controller/size/small_ppc64le.go b/internal/controller/size/small_ppc64le.go
index 469ea749b..44bfcef25 100644
--- a/internal/controller/size/small_ppc64le.go
+++ b/internal/controller/size/small_ppc64le.go
@@ -91,7 +91,7 @@ const Small = `
             shared_buffers: 64MB
 - name: common-service-cnpg
   resources:
-  - apiVersion: postgresql.cnpg.ibm.com/v1
+  - apiVersion: pg.ibm.com/v1
     kind: Cluster
     name: common-service-db
     data:
diff --git a/internal/controller/size/small_s390x.go b/internal/controller/size/small_s390x.go
index 185162b6c..49a857478 100644
--- a/internal/controller/size/small_s390x.go
+++ b/internal/controller/size/small_s390x.go
@@ -91,7 +91,7 @@ const Small = `
             shared_buffers: 64MB
 - name: common-service-cnpg
   resources:
-  - apiVersion: postgresql.cnpg.ibm.com/v1
+  - apiVersion: pg.ibm.com/v1
     kind: Cluster
     name: common-service-db
     data:
diff --git a/internal/controller/size/starterset_amd64.go b/internal/controller/size/starterset_amd64.go
index 58d42f389..210eb1a20 100644
--- a/internal/controller/size/starterset_amd64.go
+++ b/internal/controller/size/starterset_amd64.go
@@ -91,7 +91,7 @@ const StarterSet = `
             shared_buffers: 64MB
 - name: common-service-cnpg
   resources:
-  - apiVersion: postgresql.cnpg.ibm.com/v1
+  - apiVersion: pg.ibm.com/v1
     kind: Cluster
     name: common-service-db
     data:
diff --git a/internal/controller/size/starterset_ppc64le.go b/internal/controller/size/starterset_ppc64le.go
index 8f28c05e2..f4d42f7cc 100644
--- a/internal/controller/size/starterset_ppc64le.go
+++ b/internal/controller/size/starterset_ppc64le.go
@@ -91,7 +91,7 @@ const StarterSet = `
             shared_buffers: 64MB
 - name: common-service-cnpg
   resources:
-  - apiVersion: postgresql.cnpg.ibm.com/v1
+  - apiVersion: pg.ibm.com/v1
     kind: Cluster
     name: common-service-db
     data:
diff --git a/internal/controller/size/starterset_s390x.go b/internal/controller/size/starterset_s390x.go
index 5e5cb9d4f..1be61d6fb 100644
--- a/internal/controller/size/starterset_s390x.go
+++ b/internal/controller/size/starterset_s390x.go
@@ -93,7 +93,7 @@ const StarterSet = `
             shared_buffers: 64MB
 - name: common-service-cnpg
   resources:
-  - apiVersion: postgresql.cnpg.ibm.com/v1
+  - apiVersion: pg.ibm.com/v1
     kind: Cluster
     name: common-service-db
     data: