diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 077e7a92..d7de228f 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -4,41 +4,33 @@ 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
+ENV TERM xterm
 
-# 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 "software-properties-common" (for add-apt-repository) and add the "PHP 7" ppa
+RUN apt-get update \
+    && apt-get install -y software-properties-common \
+    && add-apt-repository -y ppa:ondrej/php
 
-# 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 PHP-CLI 7 and some useful Tools
+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 \
+        git \
+        curl \
+        vim \
+        nano
 
-# Install some Tools
-RUN apt-get install -y \
-    git \
-    curl \
-    vim \
-    nano
-
-# Setup the Composer installer
+# Install Composer
 RUN curl -s http://getcomposer.org/installer | php \
     && mv composer.phar /usr/local/bin/ \
     && alias composer='/usr/local/bin/composer.phar'