diff --git a/000-default.conf b/000-default.conf
index 6a1ea49..5922163 100644
--- a/000-default.conf
+++ b/000-default.conf
@@ -9,7 +9,7 @@
 	#ServerName www.example.com
 
 	ServerAdmin webmaster@localhost
-	DocumentRoot /var/www/html
+	DocumentRoot /var/www
 
 	# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
 	# error, crit, alert, emerg.
@@ -28,7 +28,9 @@
 	#Include conf-available/serve-cgi-bin.conf
 
 	# MediaWiki Short URL
-    Alias /wiki /var/www/html/index.php	
+	RedirectMatch ^/$ /wiki/
+	RedirectMatch ^/wiki$ /wiki/
+    Alias /wiki/ /var/www/w/index.php	
 </VirtualHost>
 
 # vim: syntax=apache ts=4 sw=4 sts=4 sr noet
diff --git a/Dockerfile b/Dockerfile
index 144f027..5828d67 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ WORKDIR /
 
 # Remove the old hello world app and grab Mediawiki source
 RUN apt-get update && apt-get install -yq git && rm -rf /var/lib/apt/lists/*
-RUN rm -fr /app && git clone https://gerrit.wikimedia.org/r/p/mediawiki/core.git /app
+RUN rm -fr /app && mv /var/www/html /var/www/w && git clone https://gerrit.wikimedia.org/r/p/mediawiki/core.git /app
 RUN cd /app && git checkout -b REL1_23 origin/REL1_23
 
 # Install extensions