diff --git a/Dockerfile b/Dockerfile
index cb3b570bb9a7dc4712dc73e48b58516472f18e17..3660d2c3db4879a4626e0f5b70a586379014221f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,17 +2,14 @@ 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/mnt
-WORKDIR /home/nscuser
+WORKDIR /usr/local/src
 RUN git clone https://github.com/snic-nsc/nscjekyllsetup.git
-WORKDIR /home/nscuser/nscjekyllsetup
+WORKDIR /usr/local/src/nscjekyllsetup
+RUN git checkout 'v1.01'
 RUN bash presetup.sh
-RUN chown -R nscuser:nscuser /home/nscuser
+RUN chown -R nscuser:nscuser /usr/local/src
 USER nscuser
-WORKDIR /home/nscuser/nscjekyllsetup
+WORKDIR /usr/local/src/nscjekyllsetup
 RUN bash setup.sh
-RUN cp compile.sh ..
-RUN cp setupnscruby ..
-RUN cp setupruby ..
-WORKDIR /home/nscuser
+WORKDIR /usr/local/src
 ENTRYPOINT /bin/bash
diff --git a/compile.sh b/compile.sh
index e159a1f6da4e1c2f13cba80c7ab70024591b66a0..160e6fdeea0e47a5eb578bff7ff086c32574ffa7 100644
--- a/compile.sh
+++ b/compile.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-source /home/nscuser/singenv $1
-cd /mnt;
+source /usr/local/src/nscjekyllsetup/rubyenv $1
 jekyll build;
 exit $?;
diff --git a/presetup.sh b/presetup.sh
index 627cfbb2476a835c736757d38de20fe1c7b54f8a..e0df64d14d23962396b60e0727f1fdf52a21f8cf 100644
--- a/presetup.sh
+++ b/presetup.sh
@@ -5,5 +5,5 @@
 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=/home/nscuser/.rbenv/bin:$PATH' >>/etc/bash.bashrc
+echo 'export PATH=/usr/local/src/.rbenv/bin:$PATH' >>/etc/bash.bashrc
 ln -s /usr/bin/python2.7 /usr/bin/python
diff --git a/rubyenv b/rubyenv
new file mode 100644
index 0000000000000000000000000000000000000000..ee92ca42dd68354d18a54ffe6aea047bb7bd2252
--- /dev/null
+++ b/rubyenv
@@ -0,0 +1,6 @@
+if [ "$1" = "nsc" ]; then
+    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
+fi
+cd /mnt
diff --git a/setup.sh b/setup.sh
index 3eafc275566425e5ddfdbc5a26d3e5ba93fe7214..693b9edacabff382f6b72c6a3760faa4226733f7 100644
--- a/setup.sh
+++ b/setup.sh
@@ -1,13 +1,14 @@
 #!/bin/bash
 
-git clone https://github.com/sstephenson/rbenv.git ~/.rbenv
-pushd ~/.rbenv
+mkdir -p /usr/local/src
+git clone https://github.com/sstephenson/rbenv.git /usr/local/src/.rbenv
+pushd /usr/local/src/.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 /usr/local/src/.rbenv/plugins/ruby-build
+pushd /usr/local/src/.rbenv/plugins/ruby-build
 git checkout 476d09b66a14392989c3c65793428742e1d9f951
-PATH=$HOME/.rbenv/bin:$PATH
+PATH=/usr/local/src/.rbenv/bin:$PATH
 eval "$(rbenv init -)"
 rbenv install 2.4.1
 rbenv global 2.4.1
diff --git a/setupnscruby b/setupnscruby
deleted file mode 100644
index 4d35977830599ceaa2fc76bfbf9da831caa366df..0000000000000000000000000000000000000000
--- a/setupnscruby
+++ /dev/null
@@ -1,3 +0,0 @@
-export PATH="/home/nscuser/.rbenv/bin:$PATH"
-eval "$(rbenv init -)"
-rbenv global 2.4.1
diff --git a/setupruby b/setupruby
deleted file mode 100644
index 1d3da1a7c74becf1b0135f2058a7cfd3069928e4..0000000000000000000000000000000000000000
--- a/setupruby
+++ /dev/null
@@ -1,3 +0,0 @@
-export PATH="/home/nscuser/.rbenv/bin:$PATH"
-eval "$(rbenv init -)"
-rbenv global 2.4.0
diff --git a/singenv b/singenv
deleted file mode 100644
index 7e02a8d0b0b76f22c0298f5fc5abea9eba73bd73..0000000000000000000000000000000000000000
--- a/singenv
+++ /dev/null
@@ -1,6 +0,0 @@
-if [ "$1" = "nsc" ]; then
-    export PATH=/home/nscuser/.rbenv/bin:/home/nscuser/.rbenv/versions/2.4.1/bin:$PATH
-else
-    export PATH=/home/nscuser/.rbenv/bin:/home/nscuser/.rbenv/versions/2.4.0/bin:$PATH
-fi
-cd /mnt
diff --git a/singularity/Singularity b/singularity/Singularity
new file mode 100644
index 0000000000000000000000000000000000000000..11ae75d7614aa46ae2c93785dcf31bcfb63130c9
--- /dev/null
+++ b/singularity/Singularity
@@ -0,0 +1,2 @@
+Bootstrap: docker
+From: pchengi/nscjekyll:latest