diff --git a/docker-compose.yml b/docker-compose.yml
index ce1b1707..0e3f54df 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,85 +1,69 @@
-installer:
-  image: andreaskoch/dockerized-magento-installer
-  environment:
-    DOMAIN: dockerized-magento.local
-    MAGENTO_ROOT: /var/www/html/web
-    MYSQL_HOST: mysql
-    MYSQL_DATABASE: magento
-    MYSQL_USER: root
-    MYSQL_PASSWORD: pw
-    ADMIN_USERNAME: admin
-    ADMIN_FIRSTNAME: Admin
-    ADMIN_LASTNAME: Inistrator
-    ADMIN_PASSWORD: password123
-    ADMIN_FRONTNAME: admin
-    ADMIN_EMAIL: admin@example.com
-    ENCRYPTIONKEY: 731aea833710535779fe8c7c49bc6c4d
-  volumes_from:
-    - nginx
-  volumes:
-    - ./config/installer/php/php.ini:/usr/local/etc/php/php.ini
-    - ./config/installer/magerun/n98-magerun.yaml.tmpl:/etc/n98-magerun.yaml.tmpl
-    - ./config/installer/magento/local.xml.tmpl:/etc/local.xml.tmpl
-    - ./config/installer/magento/fpc.xml.tmpl:/etc/fpc.xml.tmpl
-    - ./config/installer/bin/substitute-env-vars.sh:/bin/substitute-env-vars.sh
-    - ./config/installer/bin/install.sh:/bin/install.sh
-  links:
-    - "cache:rediscache"
-    - "sessions:redissession"
-    - "fullpagecache:redisfullpagecache"
-    - "solr:solr"
-    - "mysql:mysql"
-  entrypoint: /bin/install.sh
-
-nginx:
-  image: nginx:latest
-  ports:
-    - "80:80"
-    - "443:443"
-  links:
-    - "php"
-  volumes:
-    - ./logs/nginx:/var/log/nginx
-    - ./config/ssl/cert.pem:/etc/nginx/ssl/cert.pem
-    - ./config/ssl/cert.key:/etc/nginx/ssl/cert.key
-    - ./config/nginx/nginx.conf:/etc/nginx/nginx.conf
-    - ./config/nginx/sites-enabled/default.conf:/etc/nginx/conf.d/default.conf
-    - ./config/nginx/includes:/etc/nginx/includes
-    - ./config/nginx/custom-locations:/etc/nginx/custom-locations
-  volumes_from:
-    - php
-php:
-  image: andreaskoch/dockerized-magento-php
-  links:
-    - "cache:rediscache"
-    - "sessions:redissession"
-    - "fullpagecache:redisfullpagecache"
-    - "solr:solr"
-    - "mysql:mysql"
-  volumes:
-    - .:/var/www/html
-mysql:
-  image: mysql:5.5
-  ports:
-    - "3306:3306"
-  environment:
-    MYSQL_ROOT_PASSWORD: pw
-  volumes:
-    - ./data/mysql:/var/lib/mysql
-solr:
-  image: andreaskoch/dockerized-magento-solr
-cache:
-  image: redis:latest
-fullpagecache:
-  image: redis:latest
-sessions:
-  image: redis:latest
-phpmyadmin:
-  image: phpmyadmin/phpmyadmin
-  ports:
-    - "8080:80"
-  links:
-    - "mysql:mysql"
-  environment:
-    PMA_HOST: "mysql"
-    PMA_PORT: 3306
+version: '2'
+services:
+  installer:
+    build: docker-images/installer
+    environment:
+      DOMAIN: dockerized-magento.local
+      MAGENTO_ROOT: /var/www/html/web
+      MYSQL_HOST: mysql
+      MYSQL_DATABASE: magento
+      MYSQL_USER: root
+      MYSQL_PASSWORD: pw
+      ADMIN_USERNAME: admin
+      ADMIN_FIRSTNAME: Admin
+      ADMIN_LASTNAME: Inistrator
+      ADMIN_PASSWORD: password123
+      ADMIN_FRONTNAME: admin
+      ADMIN_EMAIL: admin@example.com
+      ENCRYPTIONKEY: 731aea833710535779fe8c7c49bc6c4d
+    volumes_from:
+      - nginx
+    links:
+      - "cache:rediscache"
+      - "sessions:redissession"
+      - "fullpagecache:redisfullpagecache"
+      - "solr:solr"
+      - "mysql:mysql"
+  nginx:
+    image: nginx:latest
+    ports:
+      - "80:80"
+      - "443:443"
+    links:
+      - "php"
+    volumes:
+      - ./logs/nginx:/var/log/nginx
+      - ./config/ssl/cert.pem:/etc/nginx/ssl/cert.pem
+      - ./config/ssl/cert.key:/etc/nginx/ssl/cert.key
+      - ./config/nginx/nginx.conf:/etc/nginx/nginx.conf
+      - ./config/nginx/sites-enabled/default.conf:/etc/nginx/conf.d/default.conf
+      - ./config/nginx/includes:/etc/nginx/includes
+      - ./config/nginx/custom-locations:/etc/nginx/custom-locations
+    volumes_from:
+      - php
+  php:
+    build: docker-images/php
+    links:
+      - "cache:rediscache"
+      - "sessions:redissession"
+      - "fullpagecache:redisfullpagecache"
+      - "solr:solr"
+      - "mysql:mysql"
+    volumes:
+      - .:/var/www/html
+  mysql:
+    image: mysql:5.5
+    ports:
+      - "3306:3306"
+    environment:
+      MYSQL_ROOT_PASSWORD: pw
+    volumes:
+      - ./data/mysql:/var/lib/mysql
+  solr:
+    build: docker-images/solr
+  cache:
+    image: redis:latest
+  fullpagecache:
+    image: redis:latest
+  sessions:
+    image: redis:latest
\ No newline at end of file