diff --git a/argo-cd-apps/base/member/infra-deployments/crossplane-control-plane/crossplane-control-plane.yaml b/argo-cd-apps/base/member/infra-deployments/crossplane-control-plane/crossplane-control-plane.yaml
new file mode 100644
index 00000000000..dc1c51740f9
--- /dev/null
+++ b/argo-cd-apps/base/member/infra-deployments/crossplane-control-plane/crossplane-control-plane.yaml
@@ -0,0 +1,41 @@
+apiVersion: argoproj.io/v1alpha1
+kind: ApplicationSet
+metadata:
+  name: crossplane-control-plane
+spec:
+  generators:
+    - merge:
+        mergeKeys:
+          - nameNormalized
+        generators:
+          - clusters:
+              values:
+                sourceRoot: components/crossplane-control-plane
+                environment: development
+                clusterDir: ""
+          - list:
+              elements: []
+  template:
+    metadata:
+      name: crossplane-control-plane-{{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: crossplane-system
+        server: '{{server}}'
+      syncPolicy:
+        automated:
+          prune: true
+          selfHeal: true
+        syncOptions:
+          - CreateNamespace=true
+        retry:
+          limit: -1
+          backoff:
+            duration: 10s
+            factor: 2
+            maxDuration: 3m
diff --git a/argo-cd-apps/base/member/infra-deployments/crossplane-control-plane/kustomization.yaml b/argo-cd-apps/base/member/infra-deployments/crossplane-control-plane/kustomization.yaml
new file mode 100644
index 00000000000..abf9a71bb85
--- /dev/null
+++ b/argo-cd-apps/base/member/infra-deployments/crossplane-control-plane/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- crossplane-control-plane.yaml
diff --git a/argo-cd-apps/base/member/infra-deployments/kustomization.yaml b/argo-cd-apps/base/member/infra-deployments/kustomization.yaml
index e7b5e19cecf..172eab6f6a8 100644
--- a/argo-cd-apps/base/member/infra-deployments/kustomization.yaml
+++ b/argo-cd-apps/base/member/infra-deployments/kustomization.yaml
@@ -26,5 +26,6 @@ resources:
   - workspaces
   - proactive-scaler
   - knative-eventing
+  - crossplane-control-plane
 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 fb9292f6c99..6c4cc9ebaca 100644
--- a/argo-cd-apps/overlays/development/kustomization.yaml
+++ b/argo-cd-apps/overlays/development/kustomization.yaml
@@ -184,3 +184,8 @@ patches:
       kind: ApplicationSet
       version: v1alpha1
       name: knative-eventing
+  - path: development-overlay-patch.yaml
+    target:
+      kind: ApplicationSet
+      version: v1alpha1
+      name: crossplane-control-plane
diff --git a/components/crossplane-control-plane/OWNERS b/components/crossplane-control-plane/OWNERS
new file mode 100644
index 00000000000..c48b430530f
--- /dev/null
+++ b/components/crossplane-control-plane/OWNERS
@@ -0,0 +1,9 @@
+# See the OWNERS docs: https://go.k8s.io/owners
+
+approvers:
+- gbenhaim
+- avi-biton
+- amisstea
+- yftacherzog
+- ifireball
+- hmariset
diff --git a/components/crossplane-control-plane/base/kustomization.yaml b/components/crossplane-control-plane/base/kustomization.yaml
new file mode 100644
index 00000000000..6eef121ac4b
--- /dev/null
+++ b/components/crossplane-control-plane/base/kustomization.yaml
@@ -0,0 +1,5 @@
+resources:
+- https://github.com/konflux-ci/crossplane-control-plane/config/ocp?ref=24ad6a647835817289754b01bebaba3d8ac0bb37
+
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
diff --git a/components/crossplane-control-plane/development/kustomization.yaml b/components/crossplane-control-plane/development/kustomization.yaml
new file mode 100644
index 00000000000..5da221fe313
--- /dev/null
+++ b/components/crossplane-control-plane/development/kustomization.yaml
@@ -0,0 +1,5 @@
+resources:
+- ../base
+
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
diff --git a/components/crossplane-control-plane/production/kustomization.yaml b/components/crossplane-control-plane/production/kustomization.yaml
new file mode 100644
index 00000000000..5da221fe313
--- /dev/null
+++ b/components/crossplane-control-plane/production/kustomization.yaml
@@ -0,0 +1,5 @@
+resources:
+- ../base
+
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
diff --git a/components/crossplane-control-plane/staging/kustomization.yaml b/components/crossplane-control-plane/staging/kustomization.yaml
new file mode 100644
index 00000000000..5da221fe313
--- /dev/null
+++ b/components/crossplane-control-plane/staging/kustomization.yaml
@@ -0,0 +1,5 @@
+resources:
+- ../base
+
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
diff --git a/hack/deploy-argocd.sh b/hack/deploy-argocd.sh
index 138efe567cf..429259d6932 100755
--- a/hack/deploy-argocd.sh
+++ b/hack/deploy-argocd.sh
@@ -10,6 +10,7 @@ main() {
     switch_route_to_reencrypt
     grant_admin_role_to_all_authenticated_users
     mark_pending_pvc_as_healty
+    set_kustomize_build_options
     print_url
 }
 
@@ -99,6 +100,11 @@ spec:
 ' --type=merge
 }
 
+set_kustomize_build_options() {
+    echo "Setting kustomize build options"
+    kubectl patch argocd/openshift-gitops -n openshift-gitops -p '{"spec":{"kustomizeBuildOptions":"--enable-helm"}}' --type=merge
+}
+
 print_url() {
     local argo_cd_route argo_cd_url