diff --git a/Dockerfile b/Dockerfile
index 3560a7b..1a26481 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,6 +31,8 @@ ENV CALICO_VERSION="${CALICO_VERSION:-v3.25.0}"
 ENV FLUXCD_VERSION="${FLUXCD_VERSION:-v0.40.1}"
 # renovate: datasource=github-releases depName=cert-manager/cert-manager
 ENV CERTMANAGER_VERSION="${CERTMANAGER_VERSION:-v1.11.0}"
+# renovate: datasource=github-releases depName=cloudnative-pg/cloudnative-pg
+ENV CNPG_VERSION="${CNPG_VERSION:-v1.19.0}"
 
 RUN apk --update add curl tar bash python3 py3-yaml && \
     curl -SsfL -o /usr/local/bin/kubectl "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl" && \
@@ -53,6 +55,7 @@ RUN apk --update add curl tar bash python3 py3-yaml && \
     mkdir -p /etc/kube-tools/schemas/flux/master-standalone-strict && \
     mkdir -p /etc/kube-tools/schemas/calico/master-standalone-strict && \
     mkdir -p /etc/kube-tools/schemas/cert-manager/master-standalone-strict && \
+    mkdir -p /etc/kube-tools/schemas/cloudnative-pg/master-standalone-strict && \
     curl -SsfL "https://github.com/fluxcd/flux2/releases/download/${FLUXCD_VERSION}/crd-schemas.tar.gz" \
         | tar xz -C /etc/kube-tools/schemas/flux/master-standalone-strict && \
     curl -SsfL -o /tmp/calico.crds.yaml "https://raw.githubusercontent.com/projectcalico/calico/${CALICO_VERSION}/manifests/calico.yaml" && \
@@ -62,6 +65,9 @@ RUN apk --update add curl tar bash python3 py3-yaml && \
     curl -SsfL -o /tmp/cert-manager.crds.yaml "https://github.com/cert-manager/cert-manager/releases/download/${CERTMANAGER_VERSION}/cert-manager.crds.yaml" && \
     cd /etc/kube-tools/schemas/cert-manager/master-standalone-strict && \
     openapi2jsonschema /tmp/cert-manager.crds.yaml && \
+    curl -SsfL -o /tmp/cloudnative-pg.crds.yaml "https://github.com/cloudnative-pg/cloudnative-pg/releases/download/${CNPG_VERSION}/cnpg-${CNPG_VERSION##v}.yaml" && \
+    cd /etc/kube-tools/schemas/cloudnative-pg/master-standalone-strict && \
+    openapi2jsonschema /tmp/cloudnative-pg.crds.yaml && \
     rm -rf /var/cache/apk/* && \
     rm -rf /tmp/*
 
diff --git a/overlay/usr/local/bin/flux-validate b/overlay/usr/local/bin/flux-validate
index 324b18f..be042e2 100755
--- a/overlay/usr/local/bin/flux-validate
+++ b/overlay/usr/local/bin/flux-validate
@@ -41,6 +41,7 @@ kubeconform_config=(
     "-schema-location" "/etc/kube-tools/schemas/flux"
     "-schema-location" "/etc/kube-tools/schemas/calico/master-standalone-strict/{{ .ResourceKind }}_{{ .ResourceAPIVersion }}.json"
     "-schema-location" "/etc/kube-tools/schemas/cert-manager/master-standalone-strict/{{ .ResourceKind }}_{{ .ResourceAPIVersion }}.json"
+    "-schema-location" "/etc/kube-tools/schemas/cloudnative-pg/master-standalone-strict/{{ .ResourceKind }}_{{ .ResourceAPIVersion }}.json"
     "-exit-on-error"
     "-summary"
     "-skip" "Secret,CustomResourceDefinition"