diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml
index 12a5422882..69ecabb067 100644
--- a/licenses.d2iq.yaml
+++ b/licenses.d2iq.yaml
@@ -592,6 +592,11 @@ resources:
       - url: https://github.com/cloudnative-pg/cloudnative-pg
         ref: v${image_tag}
         license_path: LICENSE
+  - container_image: ghcr.io/cloudnative-pg/postgresql:17
+    sources:
+      - url: https://github.com/cloudnative-pg/postgres-containers
+        ref: main
+        license_path: LICENSE
   - container_image: goharbor/harbor-core:v2.12.2
     sources:
       - url: https://github.com/goharbor/harbor
diff --git a/services/harbor/1.16.2/database/cluster.yaml b/services/harbor/1.16.2/database/cluster.yaml
index bd7f1060a9..6edb2fac59 100644
--- a/services/harbor/1.16.2/database/cluster.yaml
+++ b/services/harbor/1.16.2/database/cluster.yaml
@@ -1,33 +1,33 @@
 ---
-  apiVersion: helm.toolkit.fluxcd.io/v2
-  kind: HelmRelease
-  metadata:
-    name: harbor-database
-    namespace: ${releaseNamespace}
-  spec:
-    chart:
-      spec:
-        chart: cluster
-        sourceRef:
-          kind: HelmRepository
-          name: cloudnative-pg.github.io-charts
-          namespace: kommander-flux
-        version: 0.2.0
-    interval: 15s
-    install:
-      crds: CreateReplace
-      remediation:
-        retries: 30
-    upgrade:
-      crds: CreateReplace
-      remediation:
-        retries: 30
-    timeout: 5m0s
-    releaseName: harbor-database
-    targetNamespace: ncr-system
-    valuesFrom:
-      - kind: ConfigMap
-        name: harbor-database-0.2.0-d2iq-defaults
-      - kind: ConfigMap
-        name: harbor-database-overrides
-        optional: true
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: harbor-database
+  namespace: ${releaseNamespace}
+spec:
+  chart:
+    spec:
+      chart: cluster
+      sourceRef:
+        kind: HelmRepository
+        name: cloudnative-pg.github.io-charts
+        namespace: kommander-flux
+      version: 0.2.0
+  interval: 15s
+  install:
+    crds: CreateReplace
+    remediation:
+      retries: 30
+  upgrade:
+    crds: CreateReplace
+    remediation:
+      retries: 30
+  timeout: 5m0s
+  releaseName: harbor-database
+  targetNamespace: ncr-system
+  valuesFrom:
+    - kind: ConfigMap
+      name: harbor-database-0.2.0-d2iq-defaults
+    - kind: ConfigMap
+      name: harbor-database-overrides
+      optional: true
diff --git a/services/harbor/1.16.2/database/extra-images.txt b/services/harbor/1.16.2/database/extra-images.txt
new file mode 100644
index 0000000000..2baa9d0741
--- /dev/null
+++ b/services/harbor/1.16.2/database/extra-images.txt
@@ -0,0 +1 @@
+ghcr.io/cloudnative-pg/postgresql:{{ .Values.version.postgresql }}