diff --git a/argocd/management-dev/cert-manager/apps.yaml b/argocd/dev/shared/cert-manager/apps.yaml
similarity index 100%
rename from argocd/management-dev/cert-manager/apps.yaml
rename to argocd/dev/shared/cert-manager/apps.yaml
diff --git a/argocd/management-dev/rabbitmq-operators/cluster-operator/apps.yaml b/argocd/dev/shared/rabbitmq-operators/cluster-operator/apps.yaml
similarity index 100%
rename from argocd/management-dev/rabbitmq-operators/cluster-operator/apps.yaml
rename to argocd/dev/shared/rabbitmq-operators/cluster-operator/apps.yaml
diff --git a/argocd/management-dev/rabbitmq-operators/topology-operator/apps.yaml b/argocd/dev/shared/rabbitmq-operators/topology-operator/apps.yaml
similarity index 100%
rename from argocd/management-dev/rabbitmq-operators/topology-operator/apps.yaml
rename to argocd/dev/shared/rabbitmq-operators/topology-operator/apps.yaml
diff --git a/argocd/prod/shared/cert-manager/apps.yaml b/argocd/prod/shared/cert-manager/apps.yaml
new file mode 100644
index 00000000..8e9d7f03
--- /dev/null
+++ b/argocd/prod/shared/cert-manager/apps.yaml
@@ -0,0 +1,33 @@
+apiVersion: argoproj.io/v1alpha1
+kind: ApplicationSet
+metadata:
+  name: cert-manager
+  namespace: argocd
+spec:
+  goTemplate: true
+  goTemplateOptions: ["missingkey=error"]
+  generators:
+  - list:
+      elements:
+        # Names of clusters to deploy the app to
+        - name: prod-v4
+        # Uncomment if you want to deploy to prod-fallback
+        #- name: prod-fallback
+  template:
+    metadata:
+      name: cert-manager      
+    spec:
+      project: infrastructure-project
+      source:
+        path: components/infra/cert-manager
+        repoURL: 'https://github.com/isisbusapps/gitops'
+        targetRevision: main
+      destination:
+        namespace: cert-manager
+        name: '{{.name}}'
+      syncPolicy:
+        automated: 
+          selfHeal: true
+        syncOptions:
+          - CreateNamespace=true
+          - ServerSideApply=true          
\ No newline at end of file
diff --git a/argocd/prod/shared/rabbitmq-operators/cluster-operator/apps.yaml b/argocd/prod/shared/rabbitmq-operators/cluster-operator/apps.yaml
new file mode 100644
index 00000000..84f9d776
--- /dev/null
+++ b/argocd/prod/shared/rabbitmq-operators/cluster-operator/apps.yaml
@@ -0,0 +1,32 @@
+apiVersion: argoproj.io/v1alpha1
+kind: ApplicationSet
+metadata:
+  name: rabbitmq-cluster-operator
+  namespace: argocd
+spec:
+  goTemplate: true
+  goTemplateOptions: ["missingkey=error"]
+  generators:
+  - list:
+      elements:
+        # Names of clusters to deploy the app to
+        - name: prod-v4
+        # Uncomment if you want to deploy to prod-fallback
+        #- name: prod-fallback
+  template:
+    metadata:
+      name: rabbitmq-cluster-operator      
+    spec:
+      project: infrastructure-project
+      source:
+        path: components/infra/rabbitmq-operators/operators/cluster-operator
+        repoURL: 'https://github.com/isisbusapps/gitops'
+        targetRevision: main
+      destination:
+        namespace: rabbitmq-system
+        name: '{{.name}}'
+      syncPolicy:
+        automated: 
+          selfHeal: true
+        syncOptions:
+          - ServerSideApply=true  
\ No newline at end of file
diff --git a/argocd/prod/shared/rabbitmq-operators/topology-operator/apps.yaml b/argocd/prod/shared/rabbitmq-operators/topology-operator/apps.yaml
new file mode 100644
index 00000000..608353fc
--- /dev/null
+++ b/argocd/prod/shared/rabbitmq-operators/topology-operator/apps.yaml
@@ -0,0 +1,32 @@
+apiVersion: argoproj.io/v1alpha1
+kind: ApplicationSet
+metadata:
+  name: rabbitmq-topology-operator
+  namespace: argocd
+spec:
+  goTemplate: true
+  goTemplateOptions: ["missingkey=error"]
+  generators:
+  - list:
+      elements:
+        # Names of clusters to deploy the app to
+        - name: prod-v4
+        # Uncomment if you want to deploy to prod-fallback
+        #- name: prod-fallback
+  template:
+    metadata:
+      name: rabbitmq-topology-operator     
+    spec:
+      project: infrastructure-project
+      source:
+        path: components/infra/rabbitmq-operators/operators/topology-operator
+        repoURL: 'https://github.com/isisbusapps/gitops'
+        targetRevision: main
+      destination:
+        namespace: rabbitmq-system
+        name: '{{.name}}'
+      syncPolicy:
+        automated: 
+          selfHeal: true
+        syncOptions:
+          - ServerSideApply=true   
\ No newline at end of file