diff --git a/beanstalkd-console/Dockerfile b/beanstalkd-console/Dockerfile
index 24e13ba..76de8d2 100644
--- a/beanstalkd-console/Dockerfile
+++ b/beanstalkd-console/Dockerfile
@@ -5,4 +5,4 @@ ADD install.sh install.sh
 RUN chmod +x install.sh && ./install.sh && rm install.sh
 
 EXPOSE 2080
-CMD ["BEANSTALK_SERVERS=$BEANSTALKD_PORT_11300_TCP_ADDR", "php", "-S", "0.0.0.0:2080", "-t", "/source"]
+CMD BEANSTALK_SERVERS=$BEANSTALKD_PORT_11300_TCP_ADDR:11300 php -S 0.0.0.0:2080 -t /source/public
diff --git a/beanstalkd-console/install.sh b/beanstalkd-console/install.sh
index 5b1a5f7..f726841 100644
--- a/beanstalkd-console/install.sh
+++ b/beanstalkd-console/install.sh
@@ -7,8 +7,8 @@ set -e
 apt-get update && apt-get install -y curl
 
 # download
-mkdir /source
-curl -sL https://github.com/ptrofimov/beanstalk_console/archive/master.tar.gz | tar xvz -C /source
+curl -sL https://github.com/ptrofimov/beanstalk_console/archive/master.tar.gz | tar xvz -C /tmp
+mv beanstalk_console-master /source
 
 # cleanup package manager
 apt-get remove --purge -y curl && apt-get autoclean && apt-get clean