diff --git a/Dockerfile b/Dockerfile
index b9df14e30261fd1ed5e5a9a9061f184f08ea633c..fd03639f27a876588d6c6aadd0feac3f72314626 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,12 +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 -M --shell /bin/bash
-WORKDIR /usr/local/src
+WORKDIR /opt
 RUN git clone https://github.com/snic-nsc/nscjekyllsetup.git
-WORKDIR /usr/local/src/nscjekyllsetup
-RUN git checkout 'v1.11'
+WORKDIR /opt/nscjekyllsetup
+RUN git checkout 'v1.12'
 RUN bash presetup.sh
 RUN bash setup.sh
 USER nscuser
-WORKDIR /usr/local/src/nscjekyllsetup
+WORKDIR /opt/nscjekyllsetup
 ENTRYPOINT /bin/bash
diff --git a/README.md b/README.md
index 35cd0389107da38d9102fa1049fa97c8e2a21345..54c376183d0b2ca1a213d8c5ccb1e354a837270b 100644
--- a/README.md
+++ b/README.md
@@ -68,13 +68,13 @@ sudo singularity build nscjekyll.simg Singularity
 
 - To simply compile pages (such as via a script)
 ```
-singularity exec --bind <checked-out nscweb directory>:/mnt nscjekyll.simg bash /usr/local/src/nscjekyllsetup/compile.sh nsc
+singularity exec --bind <checked-out nscweb directory>:/mnt nscjekyll.simg bash /opt/nscjekyllsetup/compile.sh nsc
 ```
 
 - Run the jekyll web server, to serve pages, you could do one of the following:
 ```
 singularity exec --bind <checked-out nscweb directory>:/mnt nscjekyll.simg bash
-source /usr/local/src/nscjekyllsetup/rubyenv nsc
+source /opt/nscjekyllsetup/rubyenv nsc
 cd /mnt
 jekyll serve --watch
 ```
@@ -82,7 +82,7 @@ jekyll serve --watch
 or   
 ```
 singularity shell nscjekyll.simg
-source /usr/local/src/nscjekyllsetup/rubyenv nsc
+source /opt/nscjekyllsetup/rubyenv nsc
 cd <checked-out nscweb directory>
 jekyll serve --watch
 ```
diff --git a/compile.sh b/compile.sh
index e88611ca4ab791d440767d7f2df06b5a8a9ea68b..45e7b96f955875c9b0f3b7058b03f5171d972de1 100644
--- a/compile.sh
+++ b/compile.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 export LANG=en_US.UTF-8
-source /usr/local/src/nscjekyllsetup/rubyenv $1
+source /opt/nscjekyllsetup/rubyenv $1
 cd /mnt
 jekyll build;
 exit $?;
diff --git a/presetup.sh b/presetup.sh
index 8c6d3fe62d2d3257cb3f0af88ab800118b19c4a1..a08c16e1cd29c3454daa7ee192eafd61521b3bfc 100644
--- a/presetup.sh
+++ b/presetup.sh
@@ -4,6 +4,6 @@
 echo "en_US.UTF-8 UTF-8" >/etc/locale.gen
 locale-gen
 echo 'export LANG=en_US.UTF-8' >>/etc/bash.bashrc
-export 'RBENV_ROOT'=/usr/local/src/rbenv
+export 'RBENV_ROOT'=/opt/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 85359c0a655b3068602438757c419afa433eb516..23467be65922a6d4378952dbb5b671320b8febe1 100644
--- a/rubyenv
+++ b/rubyenv
@@ -1,5 +1,5 @@
 if [ "$1" = "nsc" ]; then
-    export PATH=/usr/local/src/rbenv/bin:/usr/local/src/rbenv/versions/2.4.1/bin:$PATH
+    export PATH=/opt/rbenv/bin:/opt/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=/opt/rbenv/bin:/opt/rbenv/versions/2.4.0/bin:$PATH
 fi
diff --git a/setup.sh b/setup.sh
index d712263cb90b6ce415a0eeb4d08af910da7c3872..bd16698e853f08d9d1fb08606d5f3bc0d8eb80d1 100644
--- a/setup.sh
+++ b/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-cd /usr/local/src
+cd /opt
 git clone https://github.com/sstephenson/rbenv.git rbenv
 pushd rbenv
 git checkout 615f8443fe947f114fb358815b50978f6ab1881c
@@ -8,8 +8,8 @@ popd
 git clone https://github.com/sstephenson/ruby-build.git rbenv/plugins/ruby-build
 pushd rbenv/plugins/ruby-build
 git checkout 476d09b66a14392989c3c65793428742e1d9f951
-export PATH=/usr/local/src/rbenv/bin:$PATH
-export RBENV_ROOT=/usr/local/src/rbenv
+export PATH=/opt/rbenv/bin:$PATH
+export RBENV_ROOT=/opt/rbenv
 eval "$(rbenv init -)"
 rbenv install 2.4.1
 rbenv global 2.4.1
@@ -23,4 +23,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
+chmod -R ugo+rx /opt/rbenv
diff --git a/singularity/Singularity b/singularity/Singularity
index d020698c56de4952f83f7c9d2cbe9ca387ad4d87..07044fde0bf5dede6eb82d95ed8349ca402de555 100644
--- a/singularity/Singularity
+++ b/singularity/Singularity
@@ -3,8 +3,8 @@ From: debian
 
 %post
     apt-get update && apt-get install -y git wget gcc make libssl-dev libreadline-dev zlib1g-dev vim bzip2 locales pandoc python2.7
-    mkdir -p /usr/local/src && cd /usr/local/src
+    mkdir -p /opt && cd /opt
     git clone https://github.com/snic-nsc/nscjekyllsetup.git
-    cd nscjekyllsetup && git checkout 'v1.11'
+    cd nscjekyllsetup && git checkout 'v1.12'
     bash presetup.sh
     bash setup.sh
diff --git a/singularity/docker-to-singularity/Singularity b/singularity/docker-to-singularity/Singularity
index f9352a4801e1770a121147c3f7decdcce88a8cb0..494ab16ce0eec1c1727157415478cf3b9c1455c8 100644
--- a/singularity/docker-to-singularity/Singularity
+++ b/singularity/docker-to-singularity/Singularity
@@ -1,2 +1,2 @@
 Bootstrap: docker
-From: pchengi/nscjekyll:v1.11
+From: pchengi/nscjekyll:v1.12