diff --git a/infrastructure/hydra/postgres/image-cataglog.yaml b/infrastructure/hydra/postgres/image-cataglog.yaml
index abec814..1ed3cf9 100644
--- a/infrastructure/hydra/postgres/image-cataglog.yaml
+++ b/infrastructure/hydra/postgres/image-cataglog.yaml
@@ -1,7 +1,8 @@
 apiVersion: postgresql.cnpg.io/v1
-kind: ClusterImageCatalog
+kind: ImageCatalog
 metadata:
   name: pg-minimal-trixie
+  namespace: cnpg-cluster
 spec:
   images:
   - image: ghcr.io/cloudnative-pg/postgresql:18.3-minimal-trixie
diff --git a/infrastructure/hydra/postgres/pg-cluster.yaml b/infrastructure/hydra/postgres/pg-cluster.yaml
index a000426..a82f609 100644
--- a/infrastructure/hydra/postgres/pg-cluster.yaml
+++ b/infrastructure/hydra/postgres/pg-cluster.yaml
@@ -7,7 +7,7 @@ spec:
   affinity: {}
   imageCatalogRef:
     apiGroup: postgresql.cnpg.io/v1
-    kind: ClusterImageCatalog
+    kind: ImageCatalog
     major: 18
     name: pg-minimal-trixie
   instances: 3
diff --git a/pkg/postgres/postgres.go b/pkg/postgres/postgres.go
index f2743f4..7928048 100644
--- a/pkg/postgres/postgres.go
+++ b/pkg/postgres/postgres.go
@@ -75,10 +75,10 @@ func Cluster() pg.Cluster {
 func ImageCatalog() pg.ImageCatalog {
 	return pg.ImageCatalog{
 		TypeMeta: meta.TypeMeta{
-			Kind:       "ClusterImageCatalog",
+			Kind:       "ImageCatalog",
 			APIVersion: "postgresql.cnpg.io/v1",
 		},
-		ObjectMeta: kube.ObjectMeta(root.PG_VERSION_NAME, ""),
+		ObjectMeta: kube.ObjectMeta(root.PG_VERSION_NAME, root.PGClusterNamespace.Name),
 		Spec: pg.ImageCatalogSpec{
 			Images: []pg.CatalogImage{
 				{