diff --git a/docker-compose.yml b/docker-compose.yml
index 0ad4ee0f7..d9ee32ddd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -44,10 +44,12 @@ services:
       - redis
     ports:
       - 3000
+      - ${PUSHER_WS_PORT:-45449}
+      - ${PUSHER_PORT:-8888}
     volumes:
       - .:/app
       - ./node_modules:/app/node_modules
-    command: bash -c "rm -f tmp/pids/server.pid && bundle exec rails s -p 3000 -b '0.0.0.0'"
+    command: ./run.sh
 
   worker:
     build: .
diff --git a/run.sh b/run.sh
new file mode 100755
index 000000000..231536c01
--- /dev/null
+++ b/run.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+echo "Starting Pusher-Faker..."
+pusher-fake -i ${PUSHER_APP_ID:-123456} --socket-host 0.0.0.0 --socket-port ${PUSHER_WS_PORT:-45449} --web-host 0.0.0.0 --web-port ${PUSHER_PORT:-8888} -k ${PUSHER_APP_KEY:-centralakey} -s ${PUSHER_APP_SECRET:-centralsecret} &
+
+echo "Starting application..."
+rm -f tmp/pids/server.pid && bundle exec rails s -p 3000 -b '0.0.0.0' &
+
+wait -n
+
+exit $?