diff --git a/components/ua/user-exchange-client/user-exchange-client-chart/templates/client-configmaps/user-exchange-client-configmap-allocations.yaml b/components/ua/user-exchange-client/user-exchange-client-chart/templates/client-configmaps/user-exchange-client-configmap-allocations.yaml
new file mode 100644
index 00000000..d2523738
--- /dev/null
+++ b/components/ua/user-exchange-client/user-exchange-client-chart/templates/client-configmaps/user-exchange-client-configmap-allocations.yaml
@@ -0,0 +1,20 @@
+apiVersion: v1
+data:
+  user-exchange-client-config-allocations.yaml: |
+    exchangeConfig:
+      clientName: allocations-client
+      republishExchange: allocations_direct
+      pendingQueue: allocations_pending
+      holdingQueue: allocations_holding
+      failedQueue: allocations_failed
+      successQueue: allocations_successful
+      failReasonsHeader: fail-reasons
+      retryCountHeader: retry-count
+      maxRetries: 5
+    databaseActions:
+      merge:
+      - sqlStatement: CALL ReplaceUser(:oldUser, :newUser)
+kind: ConfigMap
+metadata:
+  creationTimestamp: null
+  name: user-exchange-client-config-allocations
diff --git a/components/ua/user-exchange-client/user-exchange-client-chart/templates/client-configmaps/user-exchange-client-configmap-duo.yaml b/components/ua/user-exchange-client/user-exchange-client-chart/templates/client-configmaps/user-exchange-client-configmap-duo.yaml
new file mode 100644
index 00000000..5dfa40f4
--- /dev/null
+++ b/components/ua/user-exchange-client/user-exchange-client-chart/templates/client-configmaps/user-exchange-client-configmap-duo.yaml
@@ -0,0 +1,20 @@
+apiVersion: v1
+data:
+  user-exchange-client-config-duo.yaml: |
+    exchangeConfig:
+      clientName: duo-client
+      republishExchange: duo_direct
+      pendingQueue: duo_pending
+      holdingQueue: duo_holding
+      failedQueue: duo_failed
+      successQueue: duo_successful
+      failReasonsHeader: fail-reasons
+      retryCountHeader: retry-count
+      maxRetries: 5
+    databaseActions:
+      merge:
+      - sqlStatement: CALL REPLACE_OLD_USER_ID_WITH_NEW(:oldUser, :newUser)
+kind: ConfigMap
+metadata:
+  creationTimestamp: null
+  name: user-exchange-client-config-duo
diff --git a/components/ua/user-exchange-client/user-exchange-client-chart/templates/client-configmaps/user-exchange-client-configmap-era.yaml b/components/ua/user-exchange-client/user-exchange-client-chart/templates/client-configmaps/user-exchange-client-configmap-era.yaml
index 2fbb38d6..be847a07 100644
--- a/components/ua/user-exchange-client/user-exchange-client-chart/templates/client-configmaps/user-exchange-client-configmap-era.yaml
+++ b/components/ua/user-exchange-client/user-exchange-client-chart/templates/client-configmaps/user-exchange-client-configmap-era.yaml
@@ -3,6 +3,7 @@ data:
   user-exchange-client-config-era.yaml: |
     exchangeConfig:
       clientName: era-client
+      republishExchange: era_direct
       pendingQueue: era_pending
       holdingQueue: era_holding
       failedQueue: era_failed
diff --git a/components/ua/user-exchange-client/user-exchange-client-chart/templates/client-configmaps/user-exchange-client-configmap-iops-v4.yaml b/components/ua/user-exchange-client/user-exchange-client-chart/templates/client-configmaps/user-exchange-client-configmap-iops-v4.yaml
new file mode 100644
index 00000000..9e176861
--- /dev/null
+++ b/components/ua/user-exchange-client/user-exchange-client-chart/templates/client-configmaps/user-exchange-client-configmap-iops-v4.yaml
@@ -0,0 +1,23 @@
+apiVersion: v1
+data:
+  user-exchange-client-config-iops-v4.yaml: |
+    exchangeConfig:
+      clientName: iops-v4-client
+      republishExchange: iops-v4_direct
+      pendingQueue: iops-v4_pending
+      holdingQueue: iops-v4_holding
+      failedQueue: iops-v4_failed
+      successQueue: iops-v4_successful
+      failReasonsHeader: fail-reasons
+      retryCountHeader: retry-count
+      maxRetries: 5
+    databaseActions:
+      merge:
+      - sqlStatement: UPDATE CCEXPERIMENTERS SET USERID = TO_NUMBER(:newUser) WHERE USERID = TO_NUMBER(:oldUser)
+      - sqlStatement: UPDATE EXPERIMENTER SET USER_ID = TO_NUMBER(:newUser) WHERE USER_ID = TO_NUMBER(:oldUser)
+      - sqlStatement: UPDATE NEW_CONSUMABLES_USER SET USER_NUMBER = TO_CHAR(:newUser) WHERE USER_NUMBER = TO_CHAR(:oldUser)
+      - sqlStatement: UPDATE PHD_FUNDING SET USER_ID = TO_NUMBER(:newUser) WHERE USER_ID = TO_NUMBER(:oldUser)
+kind: ConfigMap
+metadata:
+  creationTimestamp: null
+  name: user-exchange-client-config-iops-v4
diff --git a/components/ua/user-exchange-client/user-exchange-client-chart/templates/client-configmaps/user-exchange-client-configmap-prop-clf-all.yaml b/components/ua/user-exchange-client/user-exchange-client-chart/templates/client-configmaps/user-exchange-client-configmap-prop-clf-all.yaml
new file mode 100644
index 00000000..f7fa2c2f
--- /dev/null
+++ b/components/ua/user-exchange-client/user-exchange-client-chart/templates/client-configmaps/user-exchange-client-configmap-prop-clf-all.yaml
@@ -0,0 +1,20 @@
+apiVersion: v1
+data:
+  user-exchange-client-config-prop-clf-all.yaml: |
+    exchangeConfig:
+      clientName: prop-clf-all-client
+      republishExchange: prop-clf-all_direct
+      pendingQueue: prop-clf-all_pending
+      holdingQueue: prop-clf-all_holding
+      failedQueue: prop-clf-all_failed
+      successQueue: prop-clf-all_successful
+      failReasonsHeader: fail-reasons
+      retryCountHeader: retry-count
+      maxRetries: 5
+    databaseActions:
+      merge:
+      - sqlStatement: UPDATE EXPERIMENTER SET USER_ID = TO_NUMBER(:newUser) WHERE USER_ID = TO_NUMBER(:oldUser)
+kind: ConfigMap
+metadata:
+  creationTimestamp: null
+  name: user-exchange-client-config-prop-clf-all
diff --git a/components/ua/user-exchange-client/user-exchange-client-chart/templates/client-configmaps/user-exchange-client-configmap-safety-test.yaml b/components/ua/user-exchange-client/user-exchange-client-chart/templates/client-configmaps/user-exchange-client-configmap-safety-test.yaml
new file mode 100644
index 00000000..a3d03a4e
--- /dev/null
+++ b/components/ua/user-exchange-client/user-exchange-client-chart/templates/client-configmaps/user-exchange-client-configmap-safety-test.yaml
@@ -0,0 +1,20 @@
+apiVersion: v1
+data:
+  user-exchange-client-config-safety-test.yaml: |
+    exchangeConfig:
+      clientName: safety-test-client
+      republishExchange: safety-test_direct
+      pendingQueue: safety-test_pending
+      holdingQueue: safety-test_holding
+      failedQueue: safety-test_failed
+      successQueue: safety-test_successful
+      failReasonsHeader: fail-reasons
+      retryCountHeader: retry-count
+      maxRetries: 5
+    databaseActions:
+      merge:
+      - sqlStatement: UPDATE RESULT SET USER_NUMBER = TO_CHAR(:newUser) WHERE USER_NUMBER = TO_CHAR(:oldUser)
+kind: ConfigMap
+metadata:
+  creationTimestamp: null
+  name: user-exchange-client-config-safety-test
diff --git a/components/ua/user-exchange-client/user-exchange-client-chart/templates/client-configmaps/user-exchange-client-configmap-schedule.yaml b/components/ua/user-exchange-client/user-exchange-client-chart/templates/client-configmaps/user-exchange-client-configmap-schedule.yaml
index 1857b17b..5edecfbd 100644
--- a/components/ua/user-exchange-client/user-exchange-client-chart/templates/client-configmaps/user-exchange-client-configmap-schedule.yaml
+++ b/components/ua/user-exchange-client/user-exchange-client-chart/templates/client-configmaps/user-exchange-client-configmap-schedule.yaml
@@ -3,6 +3,7 @@ data:
   user-exchange-client-config-schedule.yaml: |
     exchangeConfig:
       clientName: schedule-client
+      republishExchange: schedule_direct
       pendingQueue: schedule_pending
       holdingQueue: schedule_holding
       failedQueue: schedule_failed
@@ -32,4 +33,5 @@ data:
       - sqlStatement: CALL update_user_number(:oldUser, :newUser)
 kind: ConfigMap
 metadata:
+  creationTimestamp: null
   name: user-exchange-client-config-schedule
diff --git a/components/ua/user-exchange-client/user-exchange-client-chart/templates/client-configmaps/user-exchange-client-configmap-users.yaml b/components/ua/user-exchange-client/user-exchange-client-chart/templates/client-configmaps/user-exchange-client-configmap-users.yaml
index d15f3f14..07cbe192 100644
--- a/components/ua/user-exchange-client/user-exchange-client-chart/templates/client-configmaps/user-exchange-client-configmap-users.yaml
+++ b/components/ua/user-exchange-client/user-exchange-client-chart/templates/client-configmaps/user-exchange-client-configmap-users.yaml
@@ -2,19 +2,20 @@ apiVersion: v1
 data:
   user-exchange-client-config-users.yaml: |
     exchangeConfig:
-      clientName: "Users-Client"
-      pendingQueue: "users_pending"
-      holdingQueue: "users_holding"
-      failedQueue: "users_failed"
-      successQueue: "users_successful"
-      failReasonsHeader: "fail-reasons"
-      retryCountHeader: "retry-count"
+      clientName: Users-Client
+      republishExchange: users_direct
+      pendingQueue: users_pending
+      holdingQueue: users_holding
+      failedQueue: users_failed
+      successQueue: users_successful
+      failReasonsHeader: fail-reasons
+      retryCountHeader: retry-count
       maxRetries: 5
     databaseActions:
       merge:
-        - sqlStatement: "select count(1) from person where user_number = to_char(:newUser) and thru_date is null"
+        - sqlStatement: select count(1) from person where user_number = to_char(:newUser) and thru_date is null
           expectedResult: "=1"
-        - sqlStatement: "select count(1) from person where user_number = to_char(:oldUser) and new_user_number = to_char(:newUser)"
+        - sqlStatement: select count(1) from person where user_number = to_char(:oldUser) and new_user_number = to_char(:newUser)
           expectedResult: ">0"
 kind: ConfigMap
 metadata:
diff --git a/components/ua/user-exchange-client/user-exchange-client-chart/templates/client-configmaps/user-exchange-client-configmap-visits.yaml b/components/ua/user-exchange-client/user-exchange-client-chart/templates/client-configmaps/user-exchange-client-configmap-visits.yaml
new file mode 100644
index 00000000..7a0c87fd
--- /dev/null
+++ b/components/ua/user-exchange-client/user-exchange-client-chart/templates/client-configmaps/user-exchange-client-configmap-visits.yaml
@@ -0,0 +1,24 @@
+apiVersion: v1
+data:
+  user-exchange-client-config-visits.yaml: |
+    exchangeConfig:
+      clientName: visits-client
+      republishExchange: visits_direct
+      pendingQueue: visits_pending
+      holdingQueue: visits_holding
+      failedQueue: visits_failed
+      successQueue: visits_successful
+      failReasonsHeader: fail-reasons
+      retryCountHeader: retry-count
+      maxRetries: 5
+    databaseActions:
+      merge:
+      - sqlStatement: UPDATE REQ_VISIT SET REQUESTER = TO_NUMBER(:newUser) WHERE REQUESTER = TO_NUMBER(:oldUser)
+      - sqlStatement: UPDATE REQ_VISITOR SET USER_NUMBER = TO_NUMBER(:newUser) WHERE USER_NUMBER = TO_NUMBER(:oldUser)
+      - sqlStatement: UPDATE TAXI_ADDITIONAL_PASSENGER SET USER_NUMBER = TO_CHAR(:newUser) WHERE USER_NUMBER = TO_CHAR(:oldUser)
+      - sqlStatement: UPDATE USER_OFFICE_TEAM SET USER_NUMBER = TO_CHAR(:newUser) WHERE USER_NUMBER = TO_CHAR(:oldUser)
+      - sqlStatement: UPDATE VISITOR SET USER_NUMBER = TO_NUMBER(:newUser) WHERE USER_NUMBER = TO_NUMBER(:oldUser)
+kind: ConfigMap
+metadata:
+  creationTimestamp: null
+  name: user-exchange-client-config-visits
diff --git a/components/ua/user-exchange-client/user-exchange-client-chart/templates/client-configmaps/user-exchange-client-configmap-xpress.yaml b/components/ua/user-exchange-client/user-exchange-client-chart/templates/client-configmaps/user-exchange-client-configmap-xpress.yaml
new file mode 100644
index 00000000..3c12260e
--- /dev/null
+++ b/components/ua/user-exchange-client/user-exchange-client-chart/templates/client-configmaps/user-exchange-client-configmap-xpress.yaml
@@ -0,0 +1,21 @@
+apiVersion: v1
+data:
+  user-exchange-client-config-xpress.yaml: |
+    exchangeConfig:
+      clientName: xpress-client
+      republishExchange: xpress_direct
+      pendingQueue: xpress_pending
+      holdingQueue: xpress_holding
+      failedQueue: xpress_failed
+      successQueue: xpress_successful
+      failReasonsHeader: fail-reasons
+      retryCountHeader: retry-count
+      maxRetries: 5
+    databaseActions:
+      merge:
+      - sqlStatement: UPDATE PARTY_PROPOSAL SET PARTY_ID = TO_NUMBER(:newUser) WHERE PARTY_ID = TO_NUMBER(:oldUser)
+      - sqlStatement: UPDATE SAMPLE_CAN_PARTY SET PARTY_ID = TO_NUMBER(:newUser) WHERE PARTY_ID = TO_NUMBER(:oldUser)
+kind: ConfigMap
+metadata:
+  creationTimestamp: null
+  name: user-exchange-client-config-xpress
diff --git a/components/ua/user-exchange-topology/user-exchange-topology-chart/values-dev.yaml b/components/ua/user-exchange-topology/user-exchange-topology-chart/values-dev.yaml
index 5cd4f1ed..2afdb39b 100644
--- a/components/ua/user-exchange-topology/user-exchange-topology-chart/values-dev.yaml
+++ b/components/ua/user-exchange-topology/user-exchange-topology-chart/values-dev.yaml
@@ -1,5 +1,6 @@
 # This file is autogenerated and contains the merged configuration for the user exchange. Any changes to this file will be overwritten the next time the
 # merge script is run.
+
 user_exchange_vhost: uex
 
 userSettings:
@@ -14,12 +15,42 @@ userSettings:
       configure: .*
       write: .*
       read: .*
+  allocations-client:
+    tags: []
+    permissions:
+      configure: ''
+      write: amq\.default|allocations_direct
+      read: allocations_pending
+  duo-client:
+    tags: []
+    permissions:
+      configure: ''
+      write: amq\.default|duo_direct
+      read: duo_pending
   era-client:
     tags: []
     permissions:
       configure: ''
       write: amq\.default|era_direct
       read: era_pending
+  iops-v4-client:
+    tags: []
+    permissions:
+      configure: ''
+      write: amq\.default|iops-v4_direct
+      read: iops-v4_pending
+  prop-clf-all-client:
+    tags: []
+    permissions:
+      configure: ''
+      write: amq\.default|prop-clf-all_direct
+      read: prop-clf-all_pending
+  safety-test-client:
+    tags: []
+    permissions:
+      configure: ''
+      write: amq\.default|safety-test_direct
+      read: safety-test_pending
   schedule-client:
     tags: []
     permissions:
@@ -32,23 +63,79 @@ userSettings:
       configure: ''
       write: amq\.default|users_direct
       read: users_pending
+  visits-client:
+    tags: []
+    permissions:
+      configure: ''
+      write: amq\.default|visits_direct
+      read: visits_pending
+  xpress-client:
+    tags: []
+    permissions:
+      configure: ''
+      write: amq\.default|xpress_direct
+      read: xpress_pending
 
 exchange:
+- name: allocations_direct
+  type: direct
+- name: duo_direct
+  type: direct
 - name: era_direct
   type: direct
+- name: iops-v4_direct
+  type: direct
+- name: prop-clf-all_direct
+  type: direct
+- name: safety-test_direct
+  type: direct
 - name: schedule_direct
   type: direct
 - name: users_direct
   type: direct
+- name: visits_direct
+  type: direct
+- name: xpress_direct
+  type: direct
 
 queue:
 - name: admin_reporting
+- name: allocations_pending
+- name: allocations_holding
+- name: allocations_failed
+- name: allocations_successful
+- name: allocations_rejected
+- name: allocations_requeued
+- name: duo_pending
+- name: duo_holding
+- name: duo_failed
+- name: duo_successful
+- name: duo_rejected
+- name: duo_requeued
 - name: era_pending
 - name: era_holding
 - name: era_failed
 - name: era_successful
 - name: era_rejected
 - name: era_requeued
+- name: iops-v4_pending
+- name: iops-v4_holding
+- name: iops-v4_failed
+- name: iops-v4_successful
+- name: iops-v4_rejected
+- name: iops-v4_requeued
+- name: prop-clf-all_pending
+- name: prop-clf-all_holding
+- name: prop-clf-all_failed
+- name: prop-clf-all_successful
+- name: prop-clf-all_rejected
+- name: prop-clf-all_requeued
+- name: safety-test_pending
+- name: safety-test_holding
+- name: safety-test_failed
+- name: safety-test_successful
+- name: safety-test_rejected
+- name: safety-test_requeued
 - name: schedule_pending
 - name: schedule_holding
 - name: schedule_failed
@@ -61,12 +148,80 @@ queue:
 - name: users_successful
 - name: users_rejected
 - name: users_requeued
+- name: visits_pending
+- name: visits_holding
+- name: visits_failed
+- name: visits_successful
+- name: visits_rejected
+- name: visits_requeued
+- name: xpress_pending
+- name: xpress_holding
+- name: xpress_failed
+- name: xpress_successful
+- name: xpress_rejected
+- name: xpress_requeued
 
 binding:
 - name: admin_reporting
   routing_key: publish.#
   source: amq.rabbitmq.trace
   destination: admin_reporting
+- name: allocations_failed
+  routing_key: allocations_failed
+  source: allocations_direct
+  destination: allocations_failed
+- name: allocations_rejected
+  routing_key: allocations_rejected
+  source: allocations_direct
+  destination: allocations_rejected
+- name: allocations_successful
+  routing_key: allocations_successful
+  source: allocations_direct
+  destination: allocations_successful
+- name: allocations_requeued
+  routing_key: allocations_requeued
+  source: allocations_direct
+  destination: allocations_requeued
+- name: allocations_pending
+  routing_key: allocations_pending
+  source: allocations_direct
+  destination: allocations_pending
+- name: allocations_holding
+  routing_key: allocations_holding
+  source: allocations_direct
+  destination: allocations_holding
+- name: allocations_pending
+  routing_key: notification.user.merge
+  source: amq.topic
+  destination: allocations_pending
+- name: duo_failed
+  routing_key: duo_failed
+  source: duo_direct
+  destination: duo_failed
+- name: duo_rejected
+  routing_key: duo_rejected
+  source: duo_direct
+  destination: duo_rejected
+- name: duo_successful
+  routing_key: duo_successful
+  source: duo_direct
+  destination: duo_successful
+- name: duo_requeued
+  routing_key: duo_requeued
+  source: duo_direct
+  destination: duo_requeued
+- name: duo_pending
+  routing_key: duo_pending
+  source: duo_direct
+  destination: duo_pending
+- name: duo_holding
+  routing_key: duo_holding
+  source: duo_direct
+  destination: duo_holding
+- name: duo_pending
+  routing_key: notification.user.merge
+  source: amq.topic
+  destination: duo_pending
 - name: era_failed
   routing_key: era_failed
   source: era_direct
@@ -95,6 +250,90 @@ binding:
   routing_key: notification.user.merge
   source: amq.topic
   destination: era_pending
+- name: iops-v4_failed
+  routing_key: iops-v4_failed
+  source: iops-v4_direct
+  destination: iops-v4_failed
+- name: iops-v4_rejected
+  routing_key: iops-v4_rejected
+  source: iops-v4_direct
+  destination: iops-v4_rejected
+- name: iops-v4_successful
+  routing_key: iops-v4_successful
+  source: iops-v4_direct
+  destination: iops-v4_successful
+- name: iops-v4_requeued
+  routing_key: iops-v4_requeued
+  source: iops-v4_direct
+  destination: iops-v4_requeued
+- name: iops-v4_pending
+  routing_key: iops-v4_pending
+  source: iops-v4_direct
+  destination: iops-v4_pending
+- name: iops-v4_holding
+  routing_key: iops-v4_holding
+  source: iops-v4_direct
+  destination: iops-v4_holding
+- name: iops-v4_pending
+  routing_key: notification.user.merge
+  source: amq.topic
+  destination: iops-v4_pending
+- name: prop-clf-all_failed
+  routing_key: prop-clf-all_failed
+  source: prop-clf-all_direct
+  destination: prop-clf-all_failed
+- name: prop-clf-all_rejected
+  routing_key: prop-clf-all_rejected
+  source: prop-clf-all_direct
+  destination: prop-clf-all_rejected
+- name: prop-clf-all_successful
+  routing_key: prop-clf-all_successful
+  source: prop-clf-all_direct
+  destination: prop-clf-all_successful
+- name: prop-clf-all_requeued
+  routing_key: prop-clf-all_requeued
+  source: prop-clf-all_direct
+  destination: prop-clf-all_requeued
+- name: prop-clf-all_pending
+  routing_key: prop-clf-all_pending
+  source: prop-clf-all_direct
+  destination: prop-clf-all_pending
+- name: prop-clf-all_holding
+  routing_key: prop-clf-all_holding
+  source: prop-clf-all_direct
+  destination: prop-clf-all_holding
+- name: prop-clf-all_pending
+  routing_key: notification.user.merge
+  source: amq.topic
+  destination: prop-clf-all_pending
+- name: safety-test_failed
+  routing_key: safety-test_failed
+  source: safety-test_direct
+  destination: safety-test_failed
+- name: safety-test_rejected
+  routing_key: safety-test_rejected
+  source: safety-test_direct
+  destination: safety-test_rejected
+- name: safety-test_successful
+  routing_key: safety-test_successful
+  source: safety-test_direct
+  destination: safety-test_successful
+- name: safety-test_requeued
+  routing_key: safety-test_requeued
+  source: safety-test_direct
+  destination: safety-test_requeued
+- name: safety-test_pending
+  routing_key: safety-test_pending
+  source: safety-test_direct
+  destination: safety-test_pending
+- name: safety-test_holding
+  routing_key: safety-test_holding
+  source: safety-test_direct
+  destination: safety-test_holding
+- name: safety-test_pending
+  routing_key: notification.user.merge
+  source: amq.topic
+  destination: safety-test_pending
 - name: schedule_failed
   routing_key: schedule_failed
   source: schedule_direct
@@ -151,26 +390,124 @@ binding:
   routing_key: notification.user.merge
   source: amq.topic
   destination: users_pending
+- name: visits_failed
+  routing_key: visits_failed
+  source: visits_direct
+  destination: visits_failed
+- name: visits_rejected
+  routing_key: visits_rejected
+  source: visits_direct
+  destination: visits_rejected
+- name: visits_successful
+  routing_key: visits_successful
+  source: visits_direct
+  destination: visits_successful
+- name: visits_requeued
+  routing_key: visits_requeued
+  source: visits_direct
+  destination: visits_requeued
+- name: visits_pending
+  routing_key: visits_pending
+  source: visits_direct
+  destination: visits_pending
+- name: visits_holding
+  routing_key: visits_holding
+  source: visits_direct
+  destination: visits_holding
+- name: visits_pending
+  routing_key: notification.user.merge
+  source: amq.topic
+  destination: visits_pending
+- name: xpress_failed
+  routing_key: xpress_failed
+  source: xpress_direct
+  destination: xpress_failed
+- name: xpress_rejected
+  routing_key: xpress_rejected
+  source: xpress_direct
+  destination: xpress_rejected
+- name: xpress_successful
+  routing_key: xpress_successful
+  source: xpress_direct
+  destination: xpress_successful
+- name: xpress_requeued
+  routing_key: xpress_requeued
+  source: xpress_direct
+  destination: xpress_requeued
+- name: xpress_pending
+  routing_key: xpress_pending
+  source: xpress_direct
+  destination: xpress_pending
+- name: xpress_holding
+  routing_key: xpress_holding
+  source: xpress_direct
+  destination: xpress_holding
+- name: xpress_pending
+  routing_key: notification.user.merge
+  source: amq.topic
+  destination: xpress_pending
 
 shovel:
+- name: allocations_requeue
+  source_queue: allocations_requeued
+  destination_queue: allocations_pending
+- name: allocations_reject
+  source_queue: allocations_rejected
+  destination_queue: allocations_failed
+- name: duo_requeue
+  source_queue: duo_requeued
+  destination_queue: duo_pending
+- name: duo_reject
+  source_queue: duo_rejected
+  destination_queue: duo_failed
 - name: era_requeue
-  source-queue: era_requeued
-  destination-queue: era_pending
+  source_queue: era_requeued
+  destination_queue: era_pending
 - name: era_reject
-  source-queue: era_rejected
-  destination-queue: era_failed
+  source_queue: era_rejected
+  destination_queue: era_failed
+- name: iops-v4_requeue
+  source_queue: iops-v4_requeued
+  destination_queue: iops-v4_pending
+- name: iops-v4_reject
+  source_queue: iops-v4_rejected
+  destination_queue: iops-v4_failed
+- name: prop-clf-all_requeue
+  source_queue: prop-clf-all_requeued
+  destination_queue: prop-clf-all_pending
+- name: prop-clf-all_reject
+  source_queue: prop-clf-all_rejected
+  destination_queue: prop-clf-all_failed
+- name: safety-test_requeue
+  source_queue: safety-test_requeued
+  destination_queue: safety-test_pending
+- name: safety-test_reject
+  source_queue: safety-test_rejected
+  destination_queue: safety-test_failed
 - name: schedule_requeue
-  source-queue: schedule_requeued
-  destination-queue: schedule_pending
+  source_queue: schedule_requeued
+  destination_queue: schedule_pending
 - name: schedule_reject
-  source-queue: schedule_rejected
-  destination-queue: schedule_failed
+  source_queue: schedule_rejected
+  destination_queue: schedule_failed
 - name: users_requeue
-  source-queue: users_requeued
-  destination-queue: users_pending
+  source_queue: users_requeued
+  destination_queue: users_pending
 - name: users_reject
-  source-queue: users_rejected
-  destination-queue: users_failed
+  source_queue: users_rejected
+  destination_queue: users_failed
+- name: visits_requeue
+  source_queue: visits_requeued
+  destination_queue: visits_pending
+- name: visits_reject
+  source_queue: visits_rejected
+  destination_queue: visits_failed
+- name: xpress_requeue
+  source_queue: xpress_requeued
+  destination_queue: xpress_pending
+- name: xpress_reject
+  source_queue: xpress_rejected
+  destination_queue: xpress_failed
 
 policy:
 - name: admin_reporting
@@ -180,6 +517,100 @@ policy:
     max-length-bytes: 10240000
     message-ttl: 864000000
     overflow: drop-head
+- name: allocations_pending
+  pattern: ^allocations_pending$
+  definition:
+    dead-letter-exchange: allocations_direct
+    dead-letter-routing-key: allocations_rejected
+    max-length: 100
+    max-length-bytes: 1024000
+    overflow: drop-head
+- name: allocations_holding
+  pattern: ^allocations_holding$
+  definition:
+    dead-letter-exchange: allocations_direct
+    dead-letter-routing-key: allocations_requeued
+    max-length: 100
+    max-length-bytes: 1024000
+    message-ttl: 86400000
+    overflow: drop-head
+- name: allocations_failed
+  pattern: ^allocations_failed$
+  definition:
+    max-length: 1000
+    max-length-bytes: 10240000
+    message-ttl: 2590000000
+    overflow: drop-head
+- name: allocations_successful
+  pattern: ^allocations_successful$
+  definition:
+    max-length: 1000
+    max-length-bytes: 10240000
+    message-ttl: 2590000000
+    overflow: drop-head
+- name: allocations_rejected
+  pattern: ^allocations_rejected$
+  definition:
+    dead-letter-exchange: allocations_direct
+    dead-letter-routing-key: allocations_failed
+    max-length: 100
+    max-length-bytes: 1024000
+    overflow: drop-head
+- name: allocations_requeued
+  pattern: ^allocations_requeued$
+  definition:
+    dead-letter-exchange: allocations_direct
+    dead-letter-routing-key: allocations_rejected
+    max-length: 100
+    max-length-bytes: 1024000
+    overflow: drop-head
+- name: duo_pending
+  pattern: ^duo_pending$
+  definition:
+    dead-letter-exchange: duo_direct
+    dead-letter-routing-key: duo_rejected
+    max-length: 100
+    max-length-bytes: 1024000
+    overflow: drop-head
+- name: duo_holding
+  pattern: ^duo_holding$
+  definition:
+    dead-letter-exchange: duo_direct
+    dead-letter-routing-key: duo_requeued
+    max-length: 100
+    max-length-bytes: 1024000
+    message-ttl: 86400000
+    overflow: drop-head
+- name: duo_failed
+  pattern: ^duo_failed$
+  definition:
+    max-length: 1000
+    max-length-bytes: 10240000
+    message-ttl: 2590000000
+    overflow: drop-head
+- name: duo_successful
+  pattern: ^duo_successful$
+  definition:
+    max-length: 1000
+    max-length-bytes: 10240000
+    message-ttl: 2590000000
+    overflow: drop-head
+- name: duo_rejected
+  pattern: ^duo_rejected$
+  definition:
+    dead-letter-exchange: duo_direct
+    dead-letter-routing-key: duo_failed
+    max-length: 100
+    max-length-bytes: 1024000
+    overflow: drop-head
+- name: duo_requeued
+  pattern: ^duo_requeued$
+  definition:
+    dead-letter-exchange: duo_direct
+    dead-letter-routing-key: duo_rejected
+    max-length: 100
+    max-length-bytes: 1024000
+    overflow: drop-head
 - name: era_pending
   pattern: ^era_pending$
   definition:
@@ -227,6 +658,147 @@ policy:
     max-length: 100
     max-length-bytes: 1024000
     overflow: drop-head
+- name: iops-v4_pending
+  pattern: ^iops-v4_pending$
+  definition:
+    dead-letter-exchange: iops-v4_direct
+    dead-letter-routing-key: iops-v4_rejected
+    max-length: 100
+    max-length-bytes: 1024000
+    overflow: drop-head
+- name: iops-v4_holding
+  pattern: ^iops-v4_holding$
+  definition:
+    dead-letter-exchange: iops-v4_direct
+    dead-letter-routing-key: iops-v4_requeued
+    max-length: 100
+    max-length-bytes: 1024000
+    message-ttl: 86400000
+    overflow: drop-head
+- name: iops-v4_failed
+  pattern: ^iops-v4_failed$
+  definition:
+    max-length: 1000
+    max-length-bytes: 10240000
+    message-ttl: 2590000000
+    overflow: drop-head
+- name: iops-v4_successful
+  pattern: ^iops-v4_successful$
+  definition:
+    max-length: 1000
+    max-length-bytes: 10240000
+    message-ttl: 2590000000
+    overflow: drop-head
+- name: iops-v4_rejected
+  pattern: ^iops-v4_rejected$
+  definition:
+    dead-letter-exchange: iops-v4_direct
+    dead-letter-routing-key: iops-v4_failed
+    max-length: 100
+    max-length-bytes: 1024000
+    overflow: drop-head
+- name: iops-v4_requeued
+  pattern: ^iops-v4_requeued$
+  definition:
+    dead-letter-exchange: iops-v4_direct
+    dead-letter-routing-key: iops-v4_rejected
+    max-length: 100
+    max-length-bytes: 1024000
+    overflow: drop-head
+- name: prop-clf-all_pending
+  pattern: ^prop-clf-all_pending$
+  definition:
+    dead-letter-exchange: prop-clf-all_direct
+    dead-letter-routing-key: prop-clf-all_rejected
+    max-length: 100
+    max-length-bytes: 1024000
+    overflow: drop-head
+- name: prop-clf-all_holding
+  pattern: ^prop-clf-all_holding$
+  definition:
+    dead-letter-exchange: prop-clf-all_direct
+    dead-letter-routing-key: prop-clf-all_requeued
+    max-length: 100
+    max-length-bytes: 1024000
+    message-ttl: 86400000
+    overflow: drop-head
+- name: prop-clf-all_failed
+  pattern: ^prop-clf-all_failed$
+  definition:
+    max-length: 1000
+    max-length-bytes: 10240000
+    message-ttl: 2590000000
+    overflow: drop-head
+- name: prop-clf-all_successful
+  pattern: ^prop-clf-all_successful$
+  definition:
+    max-length: 1000
+    max-length-bytes: 10240000
+    message-ttl: 2590000000
+    overflow: drop-head
+- name: prop-clf-all_rejected
+  pattern: ^prop-clf-all_rejected$
+  definition:
+    dead-letter-exchange: prop-clf-all_direct
+    dead-letter-routing-key: prop-clf-all_failed
+    max-length: 100
+    max-length-bytes: 1024000
+    overflow: drop-head
+- name: prop-clf-all_requeued
+  pattern: ^prop-clf-all_requeued$
+  definition:
+    dead-letter-exchange: prop-clf-all_direct
+    dead-letter-routing-key: prop-clf-all_rejected
+    max-length: 100
+    max-length-bytes: 1024000
+    overflow: drop-head
+- name: safety-test_pending
+  pattern: ^safety-test_pending$
+  definition:
+    dead-letter-exchange: safety-test_direct
+    dead-letter-routing-key: safety-test_rejected
+    max-length: 100
+    max-length-bytes: 1024000
+    overflow: drop-head
+- name: safety-test_holding
+  pattern: ^safety-test_holding$
+  definition:
+    dead-letter-exchange: safety-test_direct
+    dead-letter-routing-key: safety-test_requeued
+    max-length: 100
+    max-length-bytes: 1024000
+    message-ttl: 86400000
+    overflow: drop-head
+- name: safety-test_failed
+  pattern: ^safety-test_failed$
+  definition:
+    max-length: 1000
+    max-length-bytes: 10240000
+    message-ttl: 2590000000
+    overflow: drop-head
+- name: safety-test_successful
+  pattern: ^safety-test_successful$
+  definition:
+    max-length: 1000
+    max-length-bytes: 10240000
+    message-ttl: 2590000000
+    overflow: drop-head
+- name: safety-test_rejected
+  pattern: ^safety-test_rejected$
+  definition:
+    dead-letter-exchange: safety-test_direct
+    dead-letter-routing-key: safety-test_failed
+    max-length: 100
+    max-length-bytes: 1024000
+    overflow: drop-head
+- name: safety-test_requeued
+  pattern: ^safety-test_requeued$
+  definition:
+    dead-letter-exchange: safety-test_direct
+    dead-letter-routing-key: safety-test_rejected
+    max-length: 100
+    max-length-bytes: 1024000
+    overflow: drop-head
 - name: schedule_pending
   pattern: ^schedule_pending$
   definition:
@@ -321,4 +893,99 @@ policy:
     max-length: 100
     max-length-bytes: 1024000
     overflow: drop-head
+- name: visits_pending
+  pattern: ^visits_pending$
+  definition:
+    dead-letter-exchange: visits_direct
+    dead-letter-routing-key: visits_rejected
+    max-length: 100
+    max-length-bytes: 1024000
+    overflow: drop-head
+- name: visits_holding
+  pattern: ^visits_holding$
+  definition:
+    dead-letter-exchange: visits_direct
+    dead-letter-routing-key: visits_requeued
+    max-length: 100
+    max-length-bytes: 1024000
+    message-ttl: 86400000
+    overflow: drop-head
+- name: visits_failed
+  pattern: ^visits_failed$
+  definition:
+    max-length: 1000
+    max-length-bytes: 10240000
+    message-ttl: 2590000000
+    overflow: drop-head
+- name: visits_successful
+  pattern: ^visits_successful$
+  definition:
+    max-length: 1000
+    max-length-bytes: 10240000
+    message-ttl: 2590000000
+    overflow: drop-head
+- name: visits_rejected
+  pattern: ^visits_rejected$
+  definition:
+    dead-letter-exchange: visits_direct
+    dead-letter-routing-key: visits_failed
+    max-length: 100
+    max-length-bytes: 1024000
+    overflow: drop-head
+- name: visits_requeued
+  pattern: ^visits_requeued$
+  definition:
+    dead-letter-exchange: visits_direct
+    dead-letter-routing-key: visits_rejected
+    max-length: 100
+    max-length-bytes: 1024000
+    overflow: drop-head
+- name: xpress_pending
+  pattern: ^xpress_pending$
+  definition:
+    dead-letter-exchange: xpress_direct
+    dead-letter-routing-key: xpress_rejected
+    max-length: 100
+    max-length-bytes: 1024000
+    overflow: drop-head
+- name: xpress_holding
+  pattern: ^xpress_holding$
+  definition:
+    dead-letter-exchange: xpress_direct
+    dead-letter-routing-key: xpress_requeued
+    max-length: 100
+    max-length-bytes: 1024000
+    message-ttl: 86400000
+    overflow: drop-head
+- name: xpress_failed
+  pattern: ^xpress_failed$
+  definition:
+    max-length: 1000
+    max-length-bytes: 10240000
+    message-ttl: 2590000000
+    overflow: drop-head
+- name: xpress_successful
+  pattern: ^xpress_successful$
+  definition:
+    max-length: 1000
+    max-length-bytes: 10240000
+    message-ttl: 2590000000
+    overflow: drop-head
+- name: xpress_rejected
+  pattern: ^xpress_rejected$
+  definition:
+    dead-letter-exchange: xpress_direct
+    dead-letter-routing-key: xpress_failed
+    max-length: 100
+    max-length-bytes: 1024000
+    overflow: drop-head
+- name: xpress_requeued
+  pattern: ^xpress_requeued$
+  definition:
+    dead-letter-exchange: xpress_direct
+    dead-letter-routing-key: xpress_rejected
+    max-length: 100
+    max-length-bytes: 1024000
+    overflow: drop-head
+
 policy_priority: '500'