diff --git a/charts/cloudnative-pg/templates/ClusterImageCatalog.yaml b/charts/cloudnative-pg/templates/ClusterImageCatalog.yaml
new file mode 100644
index 0000000000..36848aa395
--- /dev/null
+++ b/charts/cloudnative-pg/templates/ClusterImageCatalog.yaml
@@ -0,0 +1,13 @@
+{{- range $clusterImageCatalog := .Values.clusterImageCatalogs }}
+apiVersion: postgresql.cnpg.io/v1
+kind: ClusterImageCatalog
+metadata:
+  name: {{ required "Items in .Values.clusterImageCatalogs require key 'name'." $clusterImageCatalog.name }}
+spec:
+  images:
+  {{- range $entry := required "Items in .Values.clusterImageCatalogs require key 'images' with a list of keys 'image' and 'major'." $clusterImageCatalog.images }}
+  - image: {{ required "Items in .Values.clusterImageCatalogs.images require key 'image'." $entry.image }}
+    major: {{ required "Items in .Values.clusterImageCatalogs.images require key 'major'." $entry.major }}
+  {{- end }}
+---
+{{- end }}
\ No newline at end of file