diff --git a/docker/rabbitmq/Dockerfile b/docker/rabbitmq/Dockerfile
index 41806587c5..32b1c71ae3 100644
--- a/docker/rabbitmq/Dockerfile
+++ b/docker/rabbitmq/Dockerfile
@@ -1,8 +1,8 @@
-FROM fedora
+FROM kollaglue/fedora-rdo-base
 MAINTAINER Lars Kellogg-Stedman <lars@redhat.com>
 
 RUN yum -y install rabbitmq-server; yum clean all
 ADD rabbitmq.config /etc/rabbitmq/
 ADD rabbitmq-env.conf /etc/rabbitmq/
-ADD start.sh /start.sh
+ADD init-rabbitmq.sh /start.sh
 CMD ["/start.sh"]
diff --git a/docker/rabbitmq/init-rabbitmq.sh b/docker/rabbitmq/init-rabbitmq.sh
index 36e6e266a7..be69af7d5c 100755
--- a/docker/rabbitmq/init-rabbitmq.sh
+++ b/docker/rabbitmq/init-rabbitmq.sh
@@ -2,7 +2,7 @@
 
 : ${RABBITMQ_USER:=guest}
 : ${RABBITMQ_PASS:=guest}
-: ${RABBITMQ_PORT:=5672}
+: ${RABBITMQ_NODE_PORT:=5672}
 : ${RABBITMQ_LOG_BASE:=/var/log/rabbitmq}
 
 sed -i '
@@ -11,7 +11,7 @@ sed -i '
 ' /etc/rabbitmq/rabbitmq.config
 
 sed -i '
-	s|@RABBITMQ_PORT@|'"$RABBITMQ_PORT"'|g
+	s|@RABBITMQ_PORT@|'"$RABBITMQ_NODE_PORT"'|g
 	s|@RABBITMQ_LOG_BASE@|'"$RABBITMQ_LOG_BASE"'|g
 ' /etc/rabbitmq/rabbitmq-env.conf