diff --git a/Dockerfile b/Dockerfile
index 4741838..fc890f1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.6
 
-RUN adduser -h /home -s /bin/sh -D -u 8465 vimtest
+RUN adduser -h /home/vimtest -s /bin/sh -D -u 8465 vimtest
 
 RUN mkdir -p /vim /vim-build/bin /plugins
 RUN chown vimtest:vimtest /home /plugins
@@ -17,7 +17,7 @@ RUN chmod +x /vim-build/bin/argecho /sbin/install_vim /sbin/run_vim
 ADD scripts/rtp.vim /rtp.vim
 
 # The user directory for setup
-VOLUME /home
+VOLUME /home/vimtest
 
 # Your plugin
 VOLUME /testplugin
diff --git a/Makefile b/Makefile
index f717cbf..0f35b82 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 .PHONY: build push test
 
-TAG:=5
+TAG:=6
 
 build:
 	docker build -t testbed/vim:$(TAG) .