diff --git a/SAS/QPIDInfrastructure/amqp-infra-setup.sh b/SAS/QPIDInfrastructure/amqp-infra-setup.sh
old mode 100644
new mode 100755
index 1016e5ffe13e9a1b3efd0641df8379c288f6a07f..499c7c1928b6395f662295f49a3d1940c168ed74
--- a/SAS/QPIDInfrastructure/amqp-infra-setup.sh
+++ b/SAS/QPIDInfrastructure/amqp-infra-setup.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 
 # -----------------------------------------
 #   Configuration
@@ -44,42 +44,42 @@ else
 fi
 
 # MessageBus
-qpid-config -b $CCU add queue mac.task.feedback.state --durable
-qpid-config -b $MCU add queue otdb.task.feedback.dataproducts --durable
-qpid-config -b $MCU add queue otdb.task.feedback.processing --durable
-qpid-config -b $MCU add queue lofar.task.specification.system --durable
-qpid-config -b $CCU add queue lofar.task.specification.system --durable
-qpid-config -b $CCU add queue mom.task.specification.system --durable
-qpid-config -b $MOM_SYSTEM add queue mom.task.specification.system --durable
+qpid-config -b $CCU add queue ${PREFIX}mac.task.feedback.state --durable
+qpid-config -b $MCU add queue ${PREFIX}otdb.task.feedback.dataproducts --durable
+qpid-config -b $MCU add queue ${PREFIX}otdb.task.feedback.processing --durable
+qpid-config -b $MCU add queue ${PREFIX}lofar.task.specification.system --durable
+qpid-config -b $CCU add queue ${PREFIX}lofar.task.specification.system --durable
+qpid-config -b $CCU add queue ${PREFIX}mom.task.specification.system --durable
+qpid-config -b $MOM_SYSTEM add queue ${PREFIX}mom.task.specification.system --durable
 qpid-config -b $CCU add queue mom.command --durable
 qpid-config -b $MOM_SYSTEM add queue mom.command --durable
 qpid-config -b $CCU add queue mom.importxml --durable
 qpid-config -b $MOM_SYSTEM add queue mom.importxml --durable
 qpid-config -b $MOM_SYSTEM add queue mom-otdb-adapter.importxml --durable
 qpid-config -b $CCU add queue mom-otdb-adapter.importxml --durable
-qpid-config -b $MOM_SYSTEM add exchange topic lofar.mom.bus --durable
-qpid-config -b $MOM_INGEST add exchange topic lofar.mom.bus --durable
-qpid-config -b $MOM_SYSTEM add exchange topic lofar.mom.command --durable
-qpid-config -b $MOM_SYSTEM add exchange topic lofar.mom.notification --durable
-qpid-config -b $SCU add exchange topic lofar.mom.bus --durable
-qpid-config -b $SCU add exchange topic lofar.mom.command --durable
-qpid-config -b $SCU add exchange topic lofar.mom.notification --durable
-qpid-route -d route del $MOM_SYSTEM $SCU lofar.mom.bus '#'
-qpid-route -d dynamic del $MOM_SYSTEM $SCU lofar.mom.bus
-qpid-route -d route add $MOM_SYSTEM $SCU lofar.mom.bus '#'
-qpid-route -d route del $MOM_SYSTEM $SCU lofar.mom.command '#'
-qpid-route -d dynamic del $MOM_SYSTEM $SCU lofar.mom.command
-qpid-route -d route add $MOM_SYSTEM $SCU lofar.mom.command '#'
-qpid-route -d route del $SCU $MOM_SYSTEM lofar.mom.notification '#'
-qpid-route -d dynamic del $SCU $MOM_SYSTEM lofar.mom.notification
-qpid-route -d route add $SCU $MOM_SYSTEM lofar.mom.notification '#'
-qpid-route -d route del $SCU $LEXAR lofar.lta.ingest.notification '#'
-qpid-route -d dynamic del $SCU $LEXAR lofar.lta.ingest.notification
-qpid-route -d route add $SCU $LEXAR lofar.lta.ingest.notification '#'
-qpid-route -d queue del $CCU $MCU '' 'lofar.task.specification.system'
-qpid-route -d queue add $CCU $MCU '' 'lofar.task.specification.system'
-qpid-route -d queue del $MOM_SYSTEM $CCU '' 'mom.task.specification.system'
-qpid-route -d queue add $MOM_SYSTEM $CCU '' 'mom.task.specification.system'
+qpid-config -b $MOM_SYSTEM add exchange topic ${PREFIX}lofar.mom.bus --durable
+qpid-config -b $MOM_INGEST add exchange topic ${PREFIX}lofar.mom.bus --durable
+qpid-config -b $MOM_SYSTEM add exchange topic ${PREFIX}lofar.mom.command --durable
+qpid-config -b $MOM_SYSTEM add exchange topic ${PREFIX}lofar.mom.notification --durable
+qpid-config -b $SCU add exchange topic ${PREFIX}lofar.mom.bus --durable
+qpid-config -b $SCU add exchange topic ${PREFIX}lofar.mom.command --durable
+qpid-config -b $SCU add exchange topic ${PREFIX}lofar.mom.notification --durable
+qpid-route -d route del $MOM_SYSTEM $SCU ${PREFIX}lofar.mom.bus '#'
+qpid-route -d dynamic del $MOM_SYSTEM $SCU ${PREFIX}lofar.mom.bus
+qpid-route -d route add $MOM_SYSTEM $SCU ${PREFIX}lofar.mom.bus '#'
+qpid-route -d route del $MOM_SYSTEM $SCU ${PREFIX}lofar.mom.command '#'
+qpid-route -d dynamic del $MOM_SYSTEM $SCU ${PREFIX}lofar.mom.command
+qpid-route -d route add $MOM_SYSTEM $SCU ${PREFIX}lofar.mom.command '#'
+qpid-route -d route del $SCU $MOM_SYSTEM ${PREFIX}lofar.mom.notification '#'
+qpid-route -d dynamic del $SCU $MOM_SYSTEM ${PREFIX}lofar.mom.notification
+qpid-route -d route add $SCU $MOM_SYSTEM ${PREFIX}lofar.mom.notification '#'
+qpid-route -d route del $SCU $LEXAR ${PREFIX}lofar.lta.ingest.notification '#'
+qpid-route -d dynamic del $SCU $LEXAR ${PREFIX}lofar.lta.ingest.notification
+qpid-route -d route add $SCU $LEXAR ${PREFIX}lofar.lta.ingest.notification '#'
+qpid-route -d queue del $CCU $MCU '' '${PREFIX}lofar.task.specification.system'
+qpid-route -d queue add $CCU $MCU '' '${PREFIX}lofar.task.specification.system'
+qpid-route -d queue del $MOM_SYSTEM $CCU '' '${PREFIX}mom.task.specification.system'
+qpid-route -d queue add $MOM_SYSTEM $CCU '' '${PREFIX}mom.task.specification.system'
 qpid-route -d queue del $MOM_SYSTEM $CCU '' 'mom.command'
 qpid-route -d queue add $MOM_SYSTEM $CCU '' 'mom.command'
 qpid-route -d queue del $MOM_SYSTEM $CCU '' 'mom.importxml'