diff --git a/docker-compose.yml b/docker-compose.yml
index 50cb5e2..5339783 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -126,4 +126,11 @@ services:
         links:
             - beanstalkd
 
+### Workspace Container #####################################
+
+    workspace:
+        build: ./workspace
+        volumes_from:
+            - data
+
 ### Add more Containers below ###############################
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
new file mode 100644
index 0000000..c764aa0
--- /dev/null
+++ b/workspace/Dockerfile
@@ -0,0 +1,51 @@
+FROM ubuntu:16.04
+
+MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
+
+RUN DEBIAN_FRONTEND=noninteractive
+RUN locale-gen en_US.UTF-8
+ENV LANGUAGE=en_US.UTF-8
+ENV LANG=en_US.UTF-8
+ENV LC_ALL=en_US.UTF-8
+
+# Install some essential libraries
+RUN apt-get update && apt-get install -y \
+    software-properties-common \
+    python-software-properties \
+    autoconf \
+    file \
+    g++ \
+    gcc \
+    libc-dev \
+    make \
+    pkg-config
+
+# Install PHP-CLI 7
+RUN add-apt-repository -y ppa:ondrej/php
+RUN apt-get update && apt-get install -y \
+    php7.0-cli \
+    php7.0-common \
+    php7.0-curl \
+    php7.0-json \
+    php7.0-mbstring \
+    php7.0-mcrypt \
+    php7.0-mysql
+
+# Install some Tools
+RUN apt-get install -y \
+    git \
+    curl \
+    vim
+
+# Setup the Composer installer
+RUN curl -s http://getcomposer.org/installer | php \
+    && mv composer.phar /usr/local/bin/ \
+    && alias composer='/usr/local/bin/composer.phar'
+
+# Clean up
+RUN rm -r /var/lib/apt/lists/*
+
+ENTRYPOINT ["top", "-b"]
+
+WORKDIR /var/www/laravel
+