diff --git a/motech/srv/motech/conf/config/bootstrap.properties b/motech/srv/motech/conf/config/bootstrap.properties
index 42918dd..b8e01c1 100644
--- a/motech/srv/motech/conf/config/bootstrap.properties
+++ b/motech/srv/motech/conf/config/bootstrap.properties
@@ -1,19 +1,23 @@
-jms.cache.producers=false
-jms.queue.for.scheduler=QueueForScheduler
-sql.url=jdbc\:postgresql\://postgres\:5432/
-jms.maxConcurrentConsumers=10
-sql.user=motech
-jms.queue.for.events=QueueForEvents
-jms.password=
-jms.session.cache.size=10
-org.osgi.framework.storage=/srv/tomcat/.motech/felix-cache
-motech.message.redelivery.delay=1
-jms.username=
 config.source=FILE
-motech.dir=/srv/tomcat/.motech
-sql.password=${MOTECH_PWD}
-sql.driver=org.postgresql.Driver
-jms.concurrentConsumers=1
+
 jms.broker.url=tcp\://activemq\:61616
-motech.message.max.redelivery.count=3
+jms.cache.producers=false
+jms.concurrentConsumers=1
+jms.maxConcurrentConsumers=10
+jms.password=
+jms.queue.for.events=QueueForEvents
+jms.queue.for.scheduler=QueueForScheduler
+jms.session.cache.size=10
 jms.topic.for.events=TopicForEvents
+jms.username=
+
+motech.dir=/srv/tomcat/.motech
+motech.message.max.redelivery.count=3
+motech.message.redelivery.delay=1
+
+org.osgi.framework.storage=/srv/tomcat/.motech/felix-cache
+
+sql.driver=org.postgresql.Driver
+sql.password=
+sql.url=jdbc\:postgresql\://postgres\:5432/
+sql.user=motech