diff --git a/README.md b/README.md
index fff952f..e4e1c55 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,6 @@ A collection of delicious docker recipes.
 - [x] hubot
 - [x] influxdb
 - [x] influxdb-arm
-- [x] mantisbt
 - [x] mariadb
 - [x] mariadb-arm
 - [x] minidlna
@@ -113,6 +112,8 @@ A collection of delicious docker recipes.
 - [x] jenkins-arm :beetle:
 - [x] joomla
 - [x] json-server
+- [x] magento
+- [x] mantisbt
 - [x] netdata
 - [x] nginad
 - [x] nodebb :+1:
diff --git a/magento/Dockerfile b/magento/Dockerfile
index 6e0c34b..9a8be2a 100644
--- a/magento/Dockerfile
+++ b/magento/Dockerfile
@@ -3,50 +3,70 @@
 #
 
 FROM php:5.6-apache
-MAINTAINER kev<noreply@easypi.info>
+MAINTAINER kev <noreply@easypi.info>
 
 RUN a2enmod rewrite
+
 RUN set -xe \
     && apt-get update \
-    && apt-get install -y libcurl3-dev \
-                          libfreetype6 \
-                          libfreetype6-dev \
-                          libjpeg62-turbo \
+    && apt-get install -y build-essential     \
+                          libcurl3            \
+                          libcurl3-dev        \
+                          libfreetype6        \
+                          libfreetype6-dev    \
+                          libicu52            \
+                          libicu-dev          \
+                          libjpeg62-turbo     \
                           libjpeg62-turbo-dev \
-                          libmcrypt-dev \
-                          libmcrypt4 \
-                          libpng12-dev \
-                          libpng12-dev \
-                          libxslt-dev \
-                          zziplib-bin \
-                          zlib1g-dev \
-                          libicu-dev \
-                          g++ \
+                          libmcrypt4          \
+                          libmcrypt-dev       \
+                          libpng12-0          \
+                          libpng12-dev        \
+                          libxslt1.1          \
+                          libxslt1-dev        \
+                          zlib1g              \
+                          zlib1g-dev          \
+                          zziplib-bin         \
     && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
-    && docker-php-ext-configure intl \
-    && docker-php-ext-install gd mcrypt mbstring pdo_mysql \
-    && docker-php-ext-install intl \
-    && docker-php-ext-install xsl \
-    && docker-php-ext-install zip \
-    && apt-get purge -y --auto-remove libcurl3-dev \
-                                      libfreetype6-dev \
+    && docker-php-ext-install gd        \
+                              intl      \
+                              mbstring  \
+                              mcrypt    \
+                              pdo_mysql \
+                              xsl       \
+                              zip       \
+    && curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
+    && apt-get purge -y --auto-remove build-essential     \
+                                      libcurl3-dev        \
+                                      libfreetype6-dev    \
+                                      libicu-dev          \
                                       libjpeg62-turbo-dev \
-                                      libmcrypt-dev \
-                                      libpng12-dev \
-                                      libpng12-dev \
+                                      libmcrypt-dev       \
+                                      libpng12-dev        \
+                                      libxslt1-dev        \
+                                      zlib1g-dev          \
     && rm -rf /var/lib/apt/lists/*
-RUN echo 'always_populate_raw_post_data = -1\nmax_execution_time = 240\nmax_input_vars = 1500\nupload_max_filesize = 32M\npost_max_size = 32M' > /usr/local/etc/php/conf.d/typo3.ini
-WORKDIR /usr/src
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+
+RUN {                                             \
+        echo 'always_populate_raw_post_data = -1';\
+        echo 'max_execution_time = 240';          \
+        echo 'max_input_vars = 1500';             \
+        echo 'upload_max_filesize = 32M';         \
+        echo 'post_max_size = 32M';               \
+    } > /usr/local/etc/php/conf.d/typo3.ini
+    
+
 WORKDIR /var/www/html
+
 ENV MAGENTO_VER 2.1.0
 ENV MAGENTO_MD5 aab11e6b443be7179410b195b2099819
 ENV MAGENTO_URL https://github.com/magento/magento2/archive/$MAGENTO_VER.tar.gz
 ENV MAGENTO_FILE magento.tar.gz
-RUN curl -sSL ${MAGENTO_URL} -o ${MAGENTO_FILE} \
+
+RUN set -xe \
+    && curl -sSL ${MAGENTO_URL} -o ${MAGENTO_FILE}        \
     && echo "${MAGENTO_MD5}  ${MAGENTO_FILE}" | md5sum -c \
-    && tar xzf ${MAGENTO_FILE} --strip 1 \
-    && rm ${MAGENTO_FILE} \
-    && chown -R www-data:www-data . \
-    && /etc/init.d/apache2 restart \
+    && tar xzf ${MAGENTO_FILE} --strip 1                  \
+    && rm ${MAGENTO_FILE}                                 \
+    && chown -R www-data:www-data .                       \
     && composer install
diff --git a/magento/README.md b/magento/README.md
index d58d7e7..8891783 100644
--- a/magento/README.md
+++ b/magento/README.md
@@ -1,12 +1,14 @@
 magento
 =======
 
-`Magento` Community Edition is open source eCommerce software used to power your
+[Magento][1] Community Edition is open source eCommerce software used to power your
 online store and can be downloaded for free. Developers can modify the core
 code and add features and functionality by installing extensions from the
 Magento Connect marketplace.
 
-```
+## docker-compose.yml
+
+```yaml
 magento:
   image: vimagick/magento
   ports:
@@ -22,3 +24,5 @@ mysql:
     - MYSQL_DATABASE=magento
   restart: always
 ```
+
+[1]: https://magento.com/
diff --git a/magento/docker-compose.yml b/magento/docker-compose.yml
index 3e30269..d61577f 100644
--- a/magento/docker-compose.yml
+++ b/magento/docker-compose.yml
@@ -1,10 +1,13 @@
 magento:
-  build: .
-  net: host
+  image: vimagick/magento
+  ports:
+    - "8000:80"
+  links:
+    - mysql
   restart: always
+
 mysql:
   image: mysql
-  net: host
   environment:
     - MYSQL_ROOT_PASSWORD=root
     - MYSQL_DATABASE=magento