diff --git a/Dockerfile b/Dockerfile
index e91e906..1bf0f67 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@
 #Specifically add the Zandronum repo and install the application
 RUN apt-add-repository 'deb http://debian.drdteam.org/ stable multiverse'
 RUN wget -O - http://debian.drdteam.org/drdteam.gpg | sudo apt-key add -
-RUN apt-get update && apt-get upgrade
+RUN apt-get update --yes && apt-get upgrade --yes
 RUN apt-get install --yes --quiet libsdl-image1.2 zandronum 
 
 #Create a non-privileged user
@@ -22,13 +22,13 @@
 
 #Build the application directory and add files
 RUN mkdir /home/zandronum/config && \
-  mkdir /home/zandronum/wads && \
-  mkdir /home/zandronum/iwads && \
+  mkdir /home/zandronum/wad/ && \
+  mkdir /home/zandronum/iwad/ && \
   mkdir /home/zandronum/bin/
 ADD /config/ /home/zandronum/config/
 ADD /bin/ /home/zandronum/bin/
-ADD /iwads/ /home/zandronum/iwads/
-ADD /pwads/ /home/zandronum/pwads/
+ADD /iwad/ /home/zandronum/iwad/
+ADD /wad/ /home/zandronum/wad/
 
 CMD ["/home/zandronum/bin/summon.sh"]
 ENTRYPOINT ["/home/zandronum/bin/summon.sh"]

diff --git a/Dockerfile b/Dockerfile
index e91e906..1bf0f67 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@
 #Specifically add the Zandronum repo and install the application
 RUN apt-add-repository 'deb http://debian.drdteam.org/ stable multiverse'
 RUN wget -O - http://debian.drdteam.org/drdteam.gpg | sudo apt-key add -
-RUN apt-get update && apt-get upgrade
+RUN apt-get update --yes && apt-get upgrade --yes
 RUN apt-get install --yes --quiet libsdl-image1.2 zandronum 
 
 #Create a non-privileged user
@@ -22,13 +22,13 @@
 
 #Build the application directory and add files
 RUN mkdir /home/zandronum/config && \
-  mkdir /home/zandronum/wads && \
-  mkdir /home/zandronum/iwads && \
+  mkdir /home/zandronum/wad/ && \
+  mkdir /home/zandronum/iwad/ && \
   mkdir /home/zandronum/bin/
 ADD /config/ /home/zandronum/config/
 ADD /bin/ /home/zandronum/bin/
-ADD /iwads/ /home/zandronum/iwads/
-ADD /pwads/ /home/zandronum/pwads/
+ADD /iwad/ /home/zandronum/iwad/
+ADD /wad/ /home/zandronum/wad/
 
 CMD ["/home/zandronum/bin/summon.sh"]
 ENTRYPOINT ["/home/zandronum/bin/summon.sh"]
diff --git a/docker-doom.sh b/docker-doom.sh
index 898d932..67e35dd 100644
--- a/docker-doom.sh
+++ b/docker-doom.sh
@@ -1 +1,7 @@
-docker run --name docker-doom -v ./iwads/zandronum/iwads -v ./wads:/zandronum/wads -p 10666:10666 -d docker-doom
+docker run \
+  --name docker-doom \
+  -v ./iwad:/home/zandronum/iwad \
+  -v ./wad:/home/zandronum/wad \
+  -v ./config/:/home/zandronum/config \
+  -p 10666:10666 \
+  -d docker-doom