diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 6b878d4..3d85546 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -149,12 +149,12 @@ RUN echo "Configure apache2" && \
 RUN echo "Configure php" && \
     /etc/init.d/mysql start && \
     /etc/init.d/postgresql start && \
-    apt-get install -y php5 php5-cli php5-fpm php5-pgsql php5-mysql phpmyadmin phppgadmin && \
+    apt-get install -y php5 php5-cli php5-fpm php5-pgsql php5-mysql phpmyadmin phppgadmin libmcrypt-dev && \
     php5enmod c9 && \
     chmod 777 /var/lib/phpmyadmin/tmp && \
-    cd /etc/php5/mods-available && ls *.ini | sed 's/\.ini$//' | xargs php5enmod && \
-    curl -sS https://getcomposer.org/installer | php && \
-    mv composer.phar /usr/bin/composer
+    cd /etc/php5/mods-available && ls *.ini | sed 's/\.ini$//' | xargs php5enmod
+RUN curl -Ss -o /usr/local/bin/phpbrew https://github.com/phpbrew/phpbrew/raw/master/phpbrew && \
+    sudo -u ubuntu bash -l -c "phpbrew init && phpbrew app get composer"
 
 
 # re-enable service startup. This line must come after all apt-get installs
diff --git a/ws-php/Dockerfile b/ws-php/Dockerfile
index 9219640..43ffc99 100644
--- a/ws-php/Dockerfile
+++ b/ws-php/Dockerfile
@@ -19,4 +19,5 @@ RUN apt-get install -y php5 php5-cli php5-fpm \
         && pecl install xdebug \
         && php5enmod xdebug \
     && cd /etc/php5/mods-available && ls *.ini | sed 's/\.ini$//' | xargs php5enmod
+RUN sudo -u ubuntu bash -l -c "phpbrew install 7.0"
 RUN chown -R ubuntu: /home/ubuntu/lib