diff --git a/build_mumble_web.sh b/build_mumble_web.sh
index b4dd765958e1f55bdcb9b8ae5b53e196155df630..66a83ee938d6e774f3060b1275052cd1d3d4e019 100755
--- a/build_mumble_web.sh
+++ b/build_mumble_web.sh
@@ -38,7 +38,7 @@ verify_commit_HEAD
 
 # build docker image 
 printf "\nBuilding image\n"
-docker build -t $IMAGE_NAME . > build.log
+docker build -t $IMAGE_NAME -f Dockerfile.mumble-web . > build.log
 # create temporary container
 docker create --name $CONTAINER_NAME "${IMAGE_NAME}"
 # remove previously copied files
@@ -56,5 +56,6 @@ fi
 
 if [ $RUN_TEST == "true" ]
 then
-    docker run --rm -d -p 443:443 --name mumble-web-nginx-test $IMAGE_NAME
+    docker build -t "${IMAGE_NAME}_nginx" -f webserver/Dockerfile.nginx .
+    docker run --rm -d -p 443:443 --name "${CONTAINER_NAME}_nginx" "${IMAGE_NAME}_nginx"
 fi
\ No newline at end of file
diff --git a/webserver/Dockerfile.nginx b/webserver/Dockerfile.nginx
index 1aebde1edfccc9d7af2ab91b2b8426f397b62981..2ee8df8ba536861701e6f36c6fc63fa637a43c44 100644
--- a/webserver/Dockerfile.nginx
+++ b/webserver/Dockerfile.nginx
@@ -2,10 +2,14 @@ FROM build_mumble_web_image
 
 USER root
 
-RUN apk add --no-cache nginx && \
+RUN apk add --no-cache bash nginx && \
     adduser -D -g 'www' www && \
     mkdir /config
 
 EXPOSE 443
+COPY webserver/entrypoint.sh /
+COPY webserver/ /config
 
-CMD ./config/entrypoint.sh
\ No newline at end of file
+
+RUN chmod +x /entrypoint.sh
+CMD /bin/bash ./entrypoint.sh
\ No newline at end of file
diff --git a/webserver/conf/nginx.conf b/webserver/conf/nginx.conf
index 2f17e8c53a4adf1a30da9c91e3c1df288357591a..754b7654a779963760d4e34818897fa2229859f1 100644
--- a/webserver/conf/nginx.conf
+++ b/webserver/conf/nginx.conf
@@ -17,8 +17,8 @@ http {
     server {
         listen 443 ssl;
         server_name localhost;
-        ssl_certificate /home/node/test.crt;
-        ssl_certificate_key /home/node/test.key;
+        ssl_certificate /config/certs/test.crt;
+        ssl_certificate_key /config/certs/test.key;
 
         location / {
             root /home/node/dist;
diff --git a/webserver/entrypoint.sh b/webserver/entrypoint.sh
old mode 100644
new mode 100755
index f17ddb97563093363e259047568a8ac52bc5e7f2..5459c703a01862689fb48330e24ed2a0ab576489
--- a/webserver/entrypoint.sh
+++ b/webserver/entrypoint.sh
@@ -1,5 +1,2 @@
-#!bin/bash
-
-mv /config/nginx.conf /etc/nginx/nginx.conf
-
+mv /config/conf/nginx.conf /etc/nginx/nginx.conf;
 nginx -g 'daemon off;'; nginx -s reload;
\ No newline at end of file