diff --git a/Dockerfile b/Dockerfile
index 4edbbf4e439ea39e7bdbb6198baa811ee59e3057..ce1dcbe3e9e9bce69521687ef3f2fbe6babe7abd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,18 +2,12 @@ FROM debian
 
 RUN apt-get update && apt-get install -y git wget gcc make libssl-dev libreadline-dev zlib1g-dev vim bzip2 locales pandoc python2.7
 RUN useradd nscuser --shell /bin/bash
-RUN mkdir -p /home/nscuser
-WORKDIR /home/nscuser
+WORKDIR /usr/local/src
 RUN git clone https://github.com/snic-nsc/nscjekyllsetup.git
-WORKDIR /home/nscuser/nscjekyllsetup
-RUN git checkout 'v1.04'
+WORKDIR /usr/local/src/nscjekyllsetup
+RUN git checkout 'v1.05'
 RUN bash presetup.sh
-RUN chown -R nscuser:nscuser /home/nscuser
-USER nscuser
-WORKDIR /home/nscuser/nscjekyllsetup
 RUN bash setup.sh
-USER root
-RUN bash postsetup.sh
 USER nscuser
 WORKDIR /usr/local/src/nscjekyllsetup
 ENTRYPOINT /bin/bash
diff --git a/postsetup.sh b/postsetup.sh
deleted file mode 100644
index 1feea275157b2346a98901364e6b75b241e27b5e..0000000000000000000000000000000000000000
--- a/postsetup.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-mv /home/nscuser/.rbenv /usr/local/src/
-mv /home/nscuser/nscjekyllsetup /usr/local/src
diff --git a/presetup.sh b/presetup.sh
index d3fe6fb6ea19a96b6eac74177f050fab3c76c06a..b17da876b4e84794705da278f2cf309b2c36e635 100644
--- a/presetup.sh
+++ b/presetup.sh
@@ -5,5 +5,6 @@
 echo "en_US.UTF-8 UTF-8" >/etc/locale.gen
 locale-gen
 echo 'export LANG=en_US.UTF-8' >>/etc/bash.bashrc
-echo 'export PATH=/usr/local/src/.rbenv/bin:/home/nscuser/.rbenv/bin:$PATH' >>/etc/bash.bashrc
+export 'RBENV_ROOT=/usr/local/src/rbenv
+echo 'export PATH=$RBENV_ROOT/bin:$PATH' >>/etc/bash.bashrc
 ln -s /usr/bin/python2.7 /usr/bin/python
diff --git a/rubyenv b/rubyenv
index ee92ca42dd68354d18a54ffe6aea047bb7bd2252..2322e198efb515a4aad89666ce1dc3189253ec01 100644
--- a/rubyenv
+++ b/rubyenv
@@ -1,6 +1,6 @@
 if [ "$1" = "nsc" ]; then
-    export PATH=/usr/local/src/.rbenv/bin:/usr/local/src/.rbenv/versions/2.4.1/bin:$PATH
+    export PATH=/usr/local/src/rbenv/bin:/usr/local/src/rbenv/versions/2.4.1/bin:$PATH
 else
-    export PATH=/usr/local/src/.rbenv/bin:/usr/local/src/.rbenv/versions/2.4.0/bin:$PATH
+    export PATH=/usr/local/src/rbenv/bin:/usr/local/src/rbenv/versions/2.4.0/bin:$PATH
 fi
 cd /mnt
diff --git a/setup.sh b/setup.sh
index 2fc1e43791288f626cddade343a07f4e59697d37..604a087b03002b085bf9e6e57144b6fcae3ad0fe 100644
--- a/setup.sh
+++ b/setup.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-mkdir -p /usr/local/src
-git clone https://github.com/sstephenson/rbenv.git ~/.rbenv
-pushd ~/.rbenv
+cd /usr/local/local/src
+git clone https://github.com/sstephenson/rbenv.git rbenv
+pushd rbenv
 git checkout 615f8443fe947f114fb358815b50978f6ab1881c
 popd
-git clone https://github.com/sstephenson/ruby-build.git ~/.rbenv/plugins/ruby-build
-pushd ~/.rbenv/plugins/ruby-build
+git clone https://github.com/sstephenson/ruby-build.git rbenv/plugins/ruby-build
+pushd rbenv/plugins/ruby-build
 git checkout 476d09b66a14392989c3c65793428742e1d9f951
-PATH=~/.rbenv/bin:$PATH
+PATH=/usr/local/src/rbenv/bin:$PATH
 eval "$(rbenv init -)"
 rbenv install 2.4.1
 rbenv global 2.4.1
@@ -22,3 +22,4 @@ gem update -f rdoc ri
 gem update
 gem install -v 3.5.2 jekyll
 gem install pandoc-ruby pygments.rb RedCloth jekyll-feed jekyll-paginate jekyll-paginate-multiple jekyll-redirect-from jekyll-sitemap
+chmod +R ugo+rx /usr/local/src