diff --git a/services/harbor/1.16.0/cosi-storage.yaml b/services/harbor/1.16.0/cosi-storage.yaml
new file mode 100644
index 0000000000..170722ac1d
--- /dev/null
+++ b/services/harbor/1.16.0/cosi-storage.yaml
@@ -0,0 +1,28 @@
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: harbor-cosi-storage
+  namespace: ${releaseNamespace}
+spec:
+  force: false
+  prune: true
+  wait: true
+  interval: 6h
+  retryInterval: 1m
+  path: ./services/harbor/1.16.0/cosi-storage
+  dependsOn:
+    - name: ncr-system-namespace
+  sourceRef:
+    kind: GitRepository
+    name: management
+    namespace: kommander-flux
+  timeout: 1m
+  postBuild:
+    substituteFrom:
+      - kind: ConfigMap
+        name: substitution-vars
+  healthChecks:
+    - apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: harbor-cosi-storage
+      namespace: ${releaseNamespace}
diff --git a/services/harbor/1.16.0/cosi-storage/cosi-bucket.yaml b/services/harbor/1.16.0/cosi-storage/cosi-bucket.yaml
new file mode 100644
index 0000000000..58ad636c88
--- /dev/null
+++ b/services/harbor/1.16.0/cosi-storage/cosi-bucket.yaml
@@ -0,0 +1,35 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: harbor-cosi-storage
+  namespace: ${releaseNamespace}
+spec:
+  chart:
+    spec:
+      chart: cosi-bucket-kit
+      sourceRef:
+        kind: HelmRepository
+        name: mesosphere.github.io-charts-stable
+        namespace: kommander-flux
+      version: 0.0.1-alpha.1
+  interval: 15s
+  install:
+    crds: CreateReplace
+    remediation:
+      retries: 30
+    createNamespace: true
+  upgrade:
+    crds: CreateReplace
+    remediation:
+      retries: 30
+  releaseName: harbor-cosi-storage
+  targetNamespace: ncr-system
+  valuesFrom:
+    - kind: ConfigMap
+      name: harbor-1.16.0-d2iq-defaults
+      valuesKey: harbor-cosi-values.yaml
+      optional: true
+    - kind: ConfigMap
+      name: harbor-overrides
+      optional: true
diff --git a/services/harbor/1.16.0/cosi-storage/kustomization.yaml b/services/harbor/1.16.0/cosi-storage/kustomization.yaml
new file mode 100644
index 0000000000..daffd06b06
--- /dev/null
+++ b/services/harbor/1.16.0/cosi-storage/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - cosi-bucket.yaml
diff --git a/services/harbor/1.16.0/defaults/harbor.yaml b/services/harbor/1.16.0/defaults/harbor.yaml
index 7bc5aa3cf0..9e79a71e0a 100644
--- a/services/harbor/1.16.0/defaults/harbor.yaml
+++ b/services/harbor/1.16.0/defaults/harbor.yaml
@@ -76,5 +76,17 @@ data:
 
       imageChartStorage:
         type: filesystem
+        disableredirect: true
 
     externalURL: https://${ingressAddress:=harbor}:5000
+  harbor-cosi-values.yaml: |
+    ---
+    cosiBucketKit:
+      enabled: false
+      transformations:
+        priorityClassName: dkp-high-priority
+        kubectlImage: ${kubetoolsImageRepository:=bitnami/kubectl}:${kubetoolsImageTag:=1.31.4}
+        harbor:
+          enabled: true
+          cmName: harbor-cosi-overrides
+          cmNamespace: ${releaseNamespace}
diff --git a/services/harbor/1.16.0/kustomization.yaml b/services/harbor/1.16.0/kustomization.yaml
index 92b0682cf1..6057f91fea 100644
--- a/services/harbor/1.16.0/kustomization.yaml
+++ b/services/harbor/1.16.0/kustomization.yaml
@@ -2,6 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - release.yaml
+  - cosi-storage.yaml
   - ncr-system-namespace.yaml
   - pre-install.yaml
   - database.yaml
diff --git a/services/harbor/1.16.0/pre-install/secrets.yaml b/services/harbor/1.16.0/pre-install/secrets.yaml
index ab30f9532d..5620f8c650 100644
--- a/services/harbor/1.16.0/pre-install/secrets.yaml
+++ b/services/harbor/1.16.0/pre-install/secrets.yaml
@@ -4,6 +4,8 @@ kind: Secret
 metadata:
   name: harbor-admin-password
   namespace: ncr-system
+  annotations:
+    kustomize.toolkit.fluxcd.io/ssa: Merge
 type: Opaque
 ---
 apiVersion: v1
@@ -11,4 +13,6 @@ kind: Secret
 metadata:
   name: harbor-valkey-password
   namespace: ncr-system
+  annotations:
+    kustomize.toolkit.fluxcd.io/ssa: Merge
 type: Opaque
diff --git a/services/harbor/1.16.0/release.yaml b/services/harbor/1.16.0/release.yaml
index 4927433106..06d1824be1 100644
--- a/services/harbor/1.16.0/release.yaml
+++ b/services/harbor/1.16.0/release.yaml
@@ -15,6 +15,7 @@ spec:
     - name: harbor-pre-install
     - name: harbor-database
     - name: harbor-valkey
+    - name: harbor-cosi-storage
   sourceRef:
     kind: GitRepository
     name: management
diff --git a/services/harbor/1.16.0/release/harbor.yaml b/services/harbor/1.16.0/release/harbor.yaml
index 1620c25dc2..5457637be8 100644
--- a/services/harbor/1.16.0/release/harbor.yaml
+++ b/services/harbor/1.16.0/release/harbor.yaml
@@ -28,6 +28,9 @@ spec:
   valuesFrom:
     - kind: ConfigMap
       name: harbor-1.16.0-d2iq-defaults
+    - kind: ConfigMap
+      name: harbor-cosi-overrides
+      optional: true
     - kind: ConfigMap
       name: harbor-overrides
       optional: true