diff --git a/cluster-entrypoint.sh b/cluster-entrypoint.sh
index 8812021..e10c0d9 100755
--- a/cluster-entrypoint.sh
+++ b/cluster-entrypoint.sh
@@ -8,14 +8,11 @@ chmod 400 /var/lib/rabbitmq/.erlang.cookie
 # Get hostname from enviromant variable
 HOSTNAME=`env hostname`
 echo "Starting RabbitMQ Server For host: " $HOSTNAME
+/usr/local/bin/docker-entrypoint.sh rabbitmq-server &
+sleep 5
+rabbitmqctl wait /var/lib/rabbitmq/mnesia/rabbit\@$HOSTNAME.pid
 
-if [ -z "$JOIN_CLUSTER_HOST" ]; then
-    /usr/local/bin/docker-entrypoint.sh rabbitmq-server &
-    sleep 5
-    rabbitmqctl wait /var/lib/rabbitmq/mnesia/rabbit\@$HOSTNAME.pid
-else
-    /usr/local/bin/docker-entrypoint.sh rabbitmq-server -detached
-    sleep 5
+if [ -n "$JOIN_CLUSTER_HOST" ]; then
     rabbitmqctl wait /var/lib/rabbitmq/mnesia/rabbit\@$HOSTNAME.pid
     rabbitmqctl stop_app
     rabbitmqctl join_cluster rabbit@$JOIN_CLUSTER_HOST
diff --git a/docker-compose.yml b/docker-compose.yml
index a002a82..2f1c83e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -37,7 +37,7 @@ services:
     entrypoint: /usr/local/bin/cluster-entrypoint.sh
 
   haproxy:
-    image: haproxy:1.7
+    image: haproxy:latest
     volumes:
       - ./haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg:ro
     depends_on:
diff --git a/haproxy.cfg b/haproxy.cfg
index 91b466f..3968c56 100644
--- a/haproxy.cfg
+++ b/haproxy.cfg
@@ -1,5 +1,5 @@
 global
-        log 127.0.0.1   local1
+        log stdout format raw local0
         maxconn 4096
  
 defaults
@@ -41,4 +41,4 @@ listen mgmt
         option          clitcpka
         server          rabbitmq1 rabbitmq1:15672  check inter 5s rise 2 fall 3
         server          rabbitmq2 rabbitmq2:15672  check inter 5s rise 2 fall 3
-        server          rabbitmq3 rabbitmq3:15672  check inter 5s rise 2 fall 3
\ No newline at end of file
+        server          rabbitmq3 rabbitmq3:15672  check inter 5s rise 2 fall 3