diff --git a/argocd/uex/prod/ra/allocations-exchange-secret/app.yaml b/argocd/uex/prod/ra/allocations-exchange-secret/app.yaml
new file mode 100644
index 00000000..eea61fe9
--- /dev/null
+++ b/argocd/uex/prod/ra/allocations-exchange-secret/app.yaml
@@ -0,0 +1,34 @@
+apiVersion: argoproj.io/v1alpha1
+kind: ApplicationSet
+metadata:
+  name: allocations-exchange-secret
+  namespace: argocd
+spec:
+  goTemplate: true
+  goTemplateOptions: ["missingkey=error"]
+  generators:
+  - list:
+      elements:
+        # Names of clusters to deploy the app to
+        - name: prod-v4
+        - name: prod-fallback
+  template:
+    metadata:
+      name: '{{.name}}-allocations-exchange-secret'
+      annotations:
+        argocd.argoproj.io/sync-wave: "0"
+    spec:
+      project: r-a-project
+      source:
+        path:  components/ra/allocations-exchange-secret
+        repoURL: 'https://github.com/isisbusapps/gitops'
+        targetRevision: main
+        helm:
+          valueFiles:
+            - values-prod.yaml
+      destination:
+        namespace: apps
+        name: '{{.name}}'
+      syncPolicy:
+        automated: 
+          selfHeal: true
\ No newline at end of file
diff --git a/argocd/uex/prod/ra/fap-results-letters-exchange-secret/app.yaml b/argocd/uex/prod/ra/fap-results-letters-exchange-secret/app.yaml
new file mode 100644
index 00000000..5ffe30d7
--- /dev/null
+++ b/argocd/uex/prod/ra/fap-results-letters-exchange-secret/app.yaml
@@ -0,0 +1,34 @@
+apiVersion: argoproj.io/v1alpha1
+kind: ApplicationSet
+metadata:
+  name: frl-exchange-secret
+  namespace: argocd
+spec:
+  goTemplate: true
+  goTemplateOptions: ["missingkey=error"]
+  generators:
+  - list:
+      elements:
+        # Names of clusters to deploy the app to
+        - name: prod-v4
+        - name: prod-fallback
+  template:
+    metadata:
+      name: '{{.name}}-frl-exchange-secret'
+      annotations:
+        argocd.argoproj.io/sync-wave: "0"
+    spec:
+      project: r-a-project
+      source:
+        path:  components/ra/fap-results-letters-exchange-secret
+        repoURL: 'https://github.com/isisbusapps/gitops'
+        targetRevision: main
+        helm:
+          valueFiles:
+            - values-prod.yaml
+      destination:
+        namespace: apps
+        name: '{{.name}}'
+      syncPolicy:
+        automated: 
+          selfHeal: true
\ No newline at end of file
diff --git a/argocd/uex/prod/ra/fap-results-letters-exchange-topology/app.yaml b/argocd/uex/prod/ra/fap-results-letters-exchange-topology/app.yaml
new file mode 100644
index 00000000..37c10c12
--- /dev/null
+++ b/argocd/uex/prod/ra/fap-results-letters-exchange-topology/app.yaml
@@ -0,0 +1,37 @@
+apiVersion: argoproj.io/v1alpha1
+kind: ApplicationSet
+metadata:
+  name: frl-exchange-topology
+  namespace: argocd
+spec:
+  goTemplate: true
+  goTemplateOptions: ["missingkey=error"]
+  generators:
+  - list:
+      elements:
+        # Names of clusters to deploy the app to
+        - name: prod-v4
+        - name: prod-fallback
+  template:
+    metadata:
+      name: '{{.name}}-frl-exchange-topology'
+      annotations:
+        argocd.argoproj.io/sync-wave: "0"        
+    spec:
+      project: r-a-project
+      source:
+        path: components/ra/fap-results-letters-exchange-topology
+        repoURL: 'https://github.com/isisbusapps/gitops'
+        targetRevision: main
+        helm:
+          valueFiles:          
+            - ../../shared/message-broker/rmq-message-broker-chart/values.yaml
+            - ../../shared/message-broker-admin/message-broker-admin-chart/values-prod.yaml
+            - values-prod.yaml
+      destination:
+        namespace: apps
+        name: '{{.name}}'
+      syncPolicy:
+        automated: 
+          selfHeal: true
+          enabled: true
\ No newline at end of file
diff --git a/argocd/uex/prod/shared/cert-manager/apps.yaml b/argocd/uex/prod/shared/cert-manager/apps.yaml
index 2406f9d4..915a26f2 100644
--- a/argocd/uex/prod/shared/cert-manager/apps.yaml
+++ b/argocd/uex/prod/shared/cert-manager/apps.yaml
@@ -11,11 +11,10 @@ spec:
       elements:
         # Names of clusters to deploy the app to
         - name: prod-v4
-        # Uncomment if you want to deploy to prod-fallback
-        #- name: prod-fallback
+        - name: prod-fallback
   template:
     metadata:
-      name: cert-manager
+      name: '{{.name}}-cert-manager'
       annotations:
         argocd.argoproj.io/sync-wave: "0"      
     spec:
diff --git a/argocd/uex/prod/shared/message-broker-admin/app.yaml b/argocd/uex/prod/shared/message-broker-admin/app.yaml
index 04e49a84..e237df62 100644
--- a/argocd/uex/prod/shared/message-broker-admin/app.yaml
+++ b/argocd/uex/prod/shared/message-broker-admin/app.yaml
@@ -11,8 +11,7 @@ spec:
       elements:
         # Names of clusters to deploy the app to
         - name: prod-v4
-        # Uncomment if you want to deploy to prod-fallback
-        #- name: prod-fallback
+        - name: prod-fallback
   template:
     metadata:
       name: '{{.name}}-message-broker-admin'
diff --git a/argocd/uex/prod/shared/message-broker/app.yaml b/argocd/uex/prod/shared/message-broker/app.yaml
index 611ce5e1..973927d4 100644
--- a/argocd/uex/prod/shared/message-broker/app.yaml
+++ b/argocd/uex/prod/shared/message-broker/app.yaml
@@ -11,8 +11,10 @@ spec:
       elements:
         # Names of clusters to deploy the app to
         - name: prod-v4
-        # Uncomment if you want to deploy to prod-fallback
-        #- name: prod-fallback
+          storageClassName: csi-cinder
+        
+        - name: prod-fallback
+          storageClassName: microk8s-hostpath
   template:
     metadata:
       name: '{{.name}}-rmq-message-broker'
@@ -28,6 +30,9 @@ spec:
           valueFiles:
             - values.yaml
             - values-httpRoute.yaml
+          parameters:
+            - name: storageClassName
+              value: '{{.storageClassName}}' 
       destination:
         namespace: apps
         name: '{{.name}}'
diff --git a/argocd/uex/prod/shared/rabbitmq-operators/cluster-operator/apps.yaml b/argocd/uex/prod/shared/rabbitmq-operators/cluster-operator/apps.yaml
index 68241de3..48943eeb 100644
--- a/argocd/uex/prod/shared/rabbitmq-operators/cluster-operator/apps.yaml
+++ b/argocd/uex/prod/shared/rabbitmq-operators/cluster-operator/apps.yaml
@@ -11,11 +11,10 @@ spec:
       elements:
         # Names of clusters to deploy the app to
         - name: prod-v4
-        # Uncomment if you want to deploy to prod-fallback
-        #- name: prod-fallback
+        - name: prod-fallback
   template:
     metadata:
-      name: rabbitmq-cluster-operator
+      name: '{{.name}}-rabbitmq-cluster-operator'
       annotations:
         argocd.argoproj.io/sync-wave: "0"      
     spec:
diff --git a/argocd/uex/prod/shared/rabbitmq-operators/topology-operator/apps.yaml b/argocd/uex/prod/shared/rabbitmq-operators/topology-operator/apps.yaml
index 84162646..0d50b662 100644
--- a/argocd/uex/prod/shared/rabbitmq-operators/topology-operator/apps.yaml
+++ b/argocd/uex/prod/shared/rabbitmq-operators/topology-operator/apps.yaml
@@ -11,11 +11,10 @@ spec:
       elements:
         # Names of clusters to deploy the app to
         - name: prod-v4
-        # Uncomment if you want to deploy to prod-fallback
-        #- name: prod-fallback
+        - name: prod-fallback
   template:
     metadata:
-      name: rabbitmq-topology-operator
+      name: '{{.name}}-rabbitmq-topology-operator'
       annotations:
         argocd.argoproj.io/sync-wave: "1"     
     spec:
diff --git a/argocd/uex/prod/submissions/uop-exchange-secret/app.yaml b/argocd/uex/prod/submissions/uop-exchange-secret/app.yaml
new file mode 100644
index 00000000..a720e1f6
--- /dev/null
+++ b/argocd/uex/prod/submissions/uop-exchange-secret/app.yaml
@@ -0,0 +1,34 @@
+apiVersion: argoproj.io/v1alpha1
+kind: ApplicationSet
+metadata:
+  name: uop-exchange-secret
+  namespace: argocd
+spec:
+  goTemplate: true
+  goTemplateOptions: ["missingkey=error"]
+  generators:
+  - list:
+      elements:
+        # Names of clusters to deploy the app to
+        - name: prod-v4
+        - name: prod-fallback
+  template:
+    metadata:
+      name: '{{.name}}-uop-exchange-secret'
+      annotations:
+        argocd.argoproj.io/sync-wave: "0"
+    spec:
+      project: submissions-project
+      source:
+        path:  components/submissions/uop-exchange-secret
+        repoURL: 'https://github.com/isisbusapps/gitops'
+        targetRevision: main
+        helm:
+          valueFiles:
+            - values-prod.yaml
+      destination:
+        namespace: apps
+        name: '{{.name}}'
+      syncPolicy:
+        automated: 
+          selfHeal: true
diff --git a/argocd/uex/prod/submissions/uop-exchange-topology/app.yaml b/argocd/uex/prod/submissions/uop-exchange-topology/app.yaml
new file mode 100644
index 00000000..fd7fc1ab
--- /dev/null
+++ b/argocd/uex/prod/submissions/uop-exchange-topology/app.yaml
@@ -0,0 +1,37 @@
+apiVersion: argoproj.io/v1alpha1
+kind: ApplicationSet
+metadata:
+  name: uop-exchange-topology
+  namespace: argocd
+spec:
+  goTemplate: true
+  goTemplateOptions: ["missingkey=error"]
+  generators:
+  - list:
+      elements:
+        # Names of clusters to deploy the app to
+        - name: prod-v4
+        - name: prod-fallback
+  template:
+    metadata:
+      name: '{{.name}}-uop-exchange-topology'
+      annotations:
+        argocd.argoproj.io/sync-wave: "0"        
+    spec:
+      project: submissions-project
+      source:
+        path: components/submissions/uop-exchange-topology
+        repoURL: 'https://github.com/isisbusapps/gitops'
+        targetRevision: main
+        helm:
+          valueFiles:          
+            - ../../shared/message-broker/rmq-message-broker-chart/values.yaml
+            - ../../shared/message-broker-admin/message-broker-admin-chart/values-prod.yaml
+            - values-prod.yaml
+      destination:
+        namespace: apps
+        name: '{{.name}}'
+      syncPolicy:
+        automated: 
+          selfHeal: true
+          enabled: true
\ No newline at end of file