diff --git a/argo-cd-apps/base/member/infra-deployments/konflux-support-ops/konflux-support-ops.yaml b/argo-cd-apps/base/member/infra-deployments/konflux-support-ops/konflux-support-ops.yaml
new file mode 100644
index 00000000000..fcaa2fb33b8
--- /dev/null
+++ b/argo-cd-apps/base/member/infra-deployments/konflux-support-ops/konflux-support-ops.yaml
@@ -0,0 +1,44 @@
+apiVersion: argoproj.io/v1alpha1
+kind: ApplicationSet
+metadata:
+  name: konflux-support-ops
+spec:
+  generators:
+    - merge:
+        mergeKeys:
+          - nameNormalized
+        generators:
+          - clusters:
+              selector:
+                matchLabels:
+                  appstudio.redhat.com/member-cluster: "true"
+              values:
+                sourceRoot: components/konflux-support-ops
+                environment: staging
+                clusterDir: ""
+          - list:
+              elements: []
+  template:
+    metadata:
+      name: konflux-support-ops-{{nameNormalized}}
+    spec:
+      project: default
+      source:
+        path: '{{values.sourceRoot}}/{{values.environment}}/{{values.clusterDir}}'
+        repoURL: https://github.com/redhat-appstudio/infra-deployments.git
+        targetRevision: main
+      destination:
+        namespace: cert-manager
+        server: '{{server}}'
+      syncPolicy:
+        automated:
+          prune: true
+          selfHeal: false
+        syncOptions:
+          - CreateNamespace=true
+        retry:
+          limit: -1
+          backoff:
+            duration: 10s
+            factor: 2
+            maxDuration: 3m
diff --git a/argo-cd-apps/base/member/infra-deployments/konflux-support-ops/kustomization.yaml b/argo-cd-apps/base/member/infra-deployments/konflux-support-ops/kustomization.yaml
new file mode 100644
index 00000000000..a745380194a
--- /dev/null
+++ b/argo-cd-apps/base/member/infra-deployments/konflux-support-ops/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- konflux-support-ops.yaml
diff --git a/argo-cd-apps/base/member/infra-deployments/kustomization.yaml b/argo-cd-apps/base/member/infra-deployments/kustomization.yaml
index 7f5703bab4b..6c7becbfa77 100644
--- a/argo-cd-apps/base/member/infra-deployments/kustomization.yaml
+++ b/argo-cd-apps/base/member/infra-deployments/kustomization.yaml
@@ -39,5 +39,6 @@ resources:
   - kueue
   - policies
   - konflux-kite
+  - konflux-support-ops
 components:
   - ../../../k-components/inject-infra-deployments-repo-details
diff --git a/argo-cd-apps/overlays/development/kustomization.yaml b/argo-cd-apps/overlays/development/kustomization.yaml
index 1734b16926b..17bd45de0d3 100644
--- a/argo-cd-apps/overlays/development/kustomization.yaml
+++ b/argo-cd-apps/overlays/development/kustomization.yaml
@@ -234,3 +234,8 @@ patches:
       kind: ApplicationSet
       version: v1alpha1
       name: trust-manager
+  - path: development-overlay-patch.yaml
+    target:
+      kind: ApplicationSet
+      version: v1alpha1
+      name: konflux-support-ops
diff --git a/argo-cd-apps/overlays/konflux-public-production/delete-applications.yaml b/argo-cd-apps/overlays/konflux-public-production/delete-applications.yaml
index 7f89bcc5737..33d2eb827cb 100644
--- a/argo-cd-apps/overlays/konflux-public-production/delete-applications.yaml
+++ b/argo-cd-apps/overlays/konflux-public-production/delete-applications.yaml
@@ -36,3 +36,9 @@ kind: ApplicationSet
 metadata:
   name: disable-self-provisioning
 $patch: delete
+---
+apiVersion: argoproj.io/v1alpha1
+kind: ApplicationSet
+metadata:
+  name: konflux-support-ops
+$patch: delete
diff --git a/argo-cd-apps/overlays/production-downstream/delete-applications.yaml b/argo-cd-apps/overlays/production-downstream/delete-applications.yaml
index d740332aa75..a572878d920 100644
--- a/argo-cd-apps/overlays/production-downstream/delete-applications.yaml
+++ b/argo-cd-apps/overlays/production-downstream/delete-applications.yaml
@@ -47,3 +47,9 @@ kind: ApplicationSet
 metadata:
   name: disable-self-provisioning
 $patch: delete
+---
+apiVersion: argoproj.io/v1alpha1
+kind: ApplicationSet
+metadata:
+  name: konflux-support-ops
+$patch: delete
diff --git a/components/konflux-support-ops/development/konflux-support-ops-generator.yaml b/components/konflux-support-ops/development/konflux-support-ops-generator.yaml
new file mode 100644
index 00000000000..b489f83bb70
--- /dev/null
+++ b/components/konflux-support-ops/development/konflux-support-ops-generator.yaml
@@ -0,0 +1,25 @@
+apiVersion: builtin
+kind: HelmChartInflationGenerator
+metadata:
+  name: konflux-support-ops
+name: konflux-support-ops
+repo: <?>
+version: 0.19.0
+namespace: <?>
+releaseName: konflux-support-ops
+valuesInline:
+  resources:
+    requests:
+      cpu: 25m
+      memory: 64Mi
+    limits:
+      cpu: 25m
+      memory: 64Mi
+  defaultPackage:
+    resources:
+      requests:
+        cpu: 25m
+        memory: 64Mi
+      limits:
+        cpu: 25m
+        memory: 64Mi
diff --git a/components/konflux-support-ops/development/kustomization.yaml b/components/konflux-support-ops/development/kustomization.yaml
new file mode 100644
index 00000000000..1e73807a65f
--- /dev/null
+++ b/components/konflux-support-ops/development/kustomization.yaml
@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+generators:
+- konflux-support-ops-generator.yaml
diff --git a/components/konflux-support-ops/staging/konflux-support-ops-generator.yaml b/components/konflux-support-ops/staging/konflux-support-ops-generator.yaml
new file mode 100644
index 00000000000..b3fe5b83d8a
--- /dev/null
+++ b/components/konflux-support-ops/staging/konflux-support-ops-generator.yaml
@@ -0,0 +1,25 @@
+apiVersion: builtin
+kind: HelmChartInflationGenerator
+metadata:
+  name: konflux-support-ops
+name: konflux-support-ops
+repo: <?>
+version: 0.19.0
+namespace: <?>
+releaseName: konflux-support-ops
+valuesInline:
+  resources:
+    requests:
+      cpu: 100m
+      memory: 128Mi
+    limits:
+      cpu: 100m
+      memory: 128Mi
+  defaultPackage:
+    resources:
+      requests:
+        cpu: 100m
+        memory: 128Mi
+      limits:
+        cpu: 100m
+        memory: 128Mi
diff --git a/components/konflux-support-ops/staging/kustomization.yaml b/components/konflux-support-ops/staging/kustomization.yaml
new file mode 100644
index 00000000000..cdb78b32267
--- /dev/null
+++ b/components/konflux-support-ops/staging/kustomization.yaml
@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+generators:
+- konflux-support-ops-generator.yaml
\ No newline at end of file