diff --git a/Util/RabbitMQ/README b/Util/RabbitMQ/README
new file mode 100644
index 0000000..5a3f59b
--- /dev/null
+++ b/Util/RabbitMQ/README
@@ -0,0 +1,11 @@
+# This builds a RabbitMQ instance
+# based on the tier/rabbitmq image
+# with supporting configuration
+# for both the midPoint complex demo
+# and for the TIER demo Source of 
+# Record applications for HR and
+# SIS.
+
+# A docker-compose file is included
+# here for bringing up the rabbitmq
+# instance as a standalone container.
diff --git a/Util/RabbitMQ/docker-compose.yml b/Util/RabbitMQ/docker-compose.yml
new file mode 100644
index 0000000..5596a49
--- /dev/null
+++ b/Util/RabbitMQ/docker-compose.yml
@@ -0,0 +1,22 @@
+version: "3.3"
+
+services:
+  mq:
+    build: ./mq/
+    environment:
+     - RABBITMQ_NODENAME=docker-rabbit
+    hostname: rabbitmq
+    networks:
+     - net
+    ports:
+     - 15672:15672
+    volumes:
+     - mq:/var/lib/rabbitmq
+
+networks:
+  net:    
+    driver: bridge
+
+volumes:
+  mq:
+
diff --git a/Util/RabbitMQ/Dockerfile b/Util/RabbitMQ/mq/Dockerfile
similarity index 100%
rename from Util/RabbitMQ/Dockerfile
rename to Util/RabbitMQ/mq/Dockerfile
diff --git a/Util/RabbitMQ/container_files/etc-rabbitmq/rabbitmq.conf b/Util/RabbitMQ/mq/container_files/etc-rabbitmq/rabbitmq.conf
similarity index 100%
rename from Util/RabbitMQ/container_files/etc-rabbitmq/rabbitmq.conf
rename to Util/RabbitMQ/mq/container_files/etc-rabbitmq/rabbitmq.conf
diff --git a/Util/RabbitMQ/container_files/etc-rabbitmq/rabbitmq.json b/Util/RabbitMQ/mq/container_files/etc-rabbitmq/rabbitmq.json
similarity index 100%
rename from Util/RabbitMQ/container_files/etc-rabbitmq/rabbitmq.json
rename to Util/RabbitMQ/mq/container_files/etc-rabbitmq/rabbitmq.json
diff --git a/Util/RabbitMQ/container_files/usr-local-bin/demo-entrypoint.sh b/Util/RabbitMQ/mq/container_files/usr-local-bin/demo-entrypoint.sh
similarity index 100%
rename from Util/RabbitMQ/container_files/usr-local-bin/demo-entrypoint.sh
rename to Util/RabbitMQ/mq/container_files/usr-local-bin/demo-entrypoint.sh
diff --git a/Util/RabbitMQ/container_files/usr-local-bin/initialize-rabbitmq.sh b/Util/RabbitMQ/mq/container_files/usr-local-bin/initialize-rabbitmq.sh
similarity index 100%
rename from Util/RabbitMQ/container_files/usr-local-bin/initialize-rabbitmq.sh
rename to Util/RabbitMQ/mq/container_files/usr-local-bin/initialize-rabbitmq.sh