diff --git a/Dockerfile b/Dockerfile
index 905a6d0..811099b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,8 +3,8 @@ FROM debian:jessie
 MAINTAINER Joeri Verdeyen <joeriv@yappa.be>
 
 ENV PHP_FPM_SOCKET "php:9000"
-ENV DOCUMENT_ROOT /var/www/app/web
-ENV INDEX_FILE app_dev.php
+ENV DOCUMENT_ROOT /var/www
+ENV INDEX_FILE index.php
 
 RUN apt-get update && \
     apt-get install -y nginx && \
diff --git a/default.conf b/default.conf
index 6ccbec2..22fe3c4 100644
--- a/default.conf
+++ b/default.conf
@@ -7,17 +7,15 @@ server {
   access_log  /var/log/nginx/access.log;
   error_log  /var/log/nginx/error.log;
 
-  location / {
-    index INDEX_FILE;
-
-    try_files $uri @rewriteapp;
-  }
+  index INDEX_FILE;
 
-  location @rewriteapp {
-    rewrite ^(.*)$ /INDEX_FILE/$1 last;
+  location / {
+    try_files $uri $uri/ /INDEX_FILE$is_args$args;
   }
 
-  location ~ ^/INDEX_FILE(/|$) {
+  location ~ \.php$ {
+    try_files $uri =404;
+    fastcgi_index INDEX_FILE;
     fastcgi_pass              php-upstream;
     fastcgi_param SERVER_NAME       $host;
     fastcgi_split_path_info   ^(.+\.php)(/.*)$;
@@ -54,4 +52,4 @@ server {
     fastcgi_param             HTTPS              off;
     fastcgi_read_timeout      120;
   }
-}
+}
\ No newline at end of file