diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..2cbd634
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,22 @@
+version: '2'
+
+services:
+  webserver:
+    container_name: erdiko_nginx
+    image: nginx:latest
+    env_file: environment.env
+    volumes:
+      - .:/code
+      - ./docker/nginx/site.conf:/etc/nginx/conf.d/site.conf
+      - ./docker/nginx/fastcgi.conf:/etc/nginx/fastcgi.conf
+    ports:
+      - "8088:80"
+  php:
+    container_name: erdiko_php7
+    env_file: environment.env
+    image: erdiko_php7fpm
+    build:
+      context: ./docker/php7
+    volumes:
+      - .:/code
+      - ./docker/php7/conf.d:/usr/local/etc/php/conf.d
\ No newline at end of file
diff --git a/docker/nginx/site.conf b/docker/nginx/site.conf
index 6d2e48a..d79883b 100644
--- a/docker/nginx/site.conf
+++ b/docker/nginx/site.conf
@@ -23,22 +23,4 @@ server {
         include fastcgi_params;
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
     }
-
-    location /admin {
-        try_files $uri /index.php =404;
-        fastcgi_split_path_info ^(.+\.php)(/.+)$;
-        fastcgi_pass php-container;
-        fastcgi_index index.php;
-        include fastcgi_params;
-        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-    }
-
-    location /examples/examples {
-        try_files $uri /index.php =404;
-        fastcgi_split_path_info ^(.+\.php)(/.+)$;
-        fastcgi_pass php-container;
-        fastcgi_index index.php;
-        include fastcgi_params;
-        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-    }
 }
\ No newline at end of file