diff --git a/elements/rabbitmq-server/install.d/20-rabbitmq-server b/elements/rabbitmq-server/install.d/20-rabbitmq-server
index cccd1344a..93687e202 100755
--- a/elements/rabbitmq-server/install.d/20-rabbitmq-server
+++ b/elements/rabbitmq-server/install.d/20-rabbitmq-server
@@ -27,12 +27,16 @@ respawn limit 2 5
 env OS_SVC_ENABLE_CONTROL=1
 export OS_SVC_ENABLE_CONTROL
 
+pre-start script
+    [ -d "/var/run/rabbitmq" ] || install -d -D -m 0755 -o rabbitmq -g rabbitmq /var/run/rabbitmq
+end script
 exec /usr/sbin/rabbitmq-server > /var/log/rabbitmq/startup_log 2> /var/log/rabbitmq/startup_err
 post-start exec /usr/sbin/rabbitmqctl wait /var/run/rabbitmq/pid >/dev/null 2>&1
 pre-stop exec /usr/sbin/rabbitmqctl stop /var/run/rabbitmq/pid >/dev/null 2>&1
 
 # Get the Erlang nameserver too.
 post-stop exec /usr/bin/pkill -u rabbitmq >/dev/null 2>&1
+
 eof
 fi
 
diff --git a/elements/rabbitmq-server/os-refresh-config/post-configure.d/40-rabbitmq b/elements/rabbitmq-server/os-refresh-config/post-configure.d/40-rabbitmq
index d533d5136..7ecfe85b0 100755
--- a/elements/rabbitmq-server/os-refresh-config/post-configure.d/40-rabbitmq
+++ b/elements/rabbitmq-server/os-refresh-config/post-configure.d/40-rabbitmq
@@ -2,7 +2,6 @@
 
 set -eux
 
-[ -d /var/run/rabbitmq ] || install -d -D -m 0755 -o rabbitmq -g rabbitmq /var/run/rabbitmq
 [ -d /mnt/state/var/log/rabbitmq ] || install -d -D -m 0770 -o rabbitmq -g rabbitmq /mnt/state/var/log/rabbitmq
 
 os-svc-enable -n rabbitmq-server