diff --git a/Dockerfile b/Dockerfile
index 547af7b..b4bac17 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,5 @@
-FROM php:7.0-fpm
+FROM debian:jessie
 
-COPY config/php.ini /usr/local/etc/php/conf.d/custom.ini
-ADD ./src/ /var/www/html/
+COPY src/ /var/www/html/
+
+VOLUME /var/www/html/
diff --git a/README.md b/README.md
index 9ec5fca..4122aaa 100644
--- a/README.md
+++ b/README.md
@@ -17,4 +17,5 @@ See the PHP info on http://docker-app.dev
 Resources & inspiration
 -----------------------
 https://ejosh.co/de/2015/09/how-to-link-docker-containers-together
+
 https://github.com/johanan/Ansible-and-Docker
diff --git a/docker-compose.yml b/docker-compose.yml
index 378d0f2..e38cf2b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,19 +1,15 @@
 appdata:
-    image: debian:jessie
-    volumes:
-        - ./src:/var/www/html
+    build: .
 
 fpm:
-    build: .
+    build: ./fpm
     volumes_from:
         - appdata
 
 nginx:
-    image: nginx:1.9
+    build: ./nginx
     links:
         - fpm
-    volumes:
-        - ./config/nginx.conf:/etc/nginx/conf.d/app.conf:ro
     volumes_from:
         - appdata
     ports:
diff --git a/fpm/Dockerfile b/fpm/Dockerfile
new file mode 100644
index 0000000..caf5d7a
--- /dev/null
+++ b/fpm/Dockerfile
@@ -0,0 +1,3 @@
+FROM php:7.0-fpm
+
+COPY php.ini /usr/local/etc/php/conf.d/custom.ini
diff --git a/config/php.ini b/fpm/php.ini
similarity index 100%
rename from config/php.ini
rename to fpm/php.ini
diff --git a/nginx/Dockerfile b/nginx/Dockerfile
new file mode 100644
index 0000000..8749058
--- /dev/null
+++ b/nginx/Dockerfile
@@ -0,0 +1,3 @@
+FROM nginx:1.9
+
+COPY nginx.conf /etc/nginx/conf.d/app.conf
diff --git a/config/nginx.conf b/nginx/nginx.conf
similarity index 100%
rename from config/nginx.conf
rename to nginx/nginx.conf