diff --git a/Dockerfile b/Dockerfile
index 7a438aedf64441b7ddd1cb7963258b0e3c088c7d..72ad1eb7b0bc11193ce4af75fdeb573377982dba 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ RUN useradd nscuser -M --shell /bin/bash
 WORKDIR /usr/local/src
 RUN git clone https://github.com/snic-nsc/nscjekyllsetup.git
 WORKDIR /usr/local/src/nscjekyllsetup
-RUN git checkout 'v1.16'
+RUN git checkout 'v1.17'
 RUN bash presetup.sh
 RUN bash setup.sh
 USER nscuser
diff --git a/README.md b/README.md
index 54c376183d0b2ca1a213d8c5ccb1e354a837270b..f7550b0da0a54470373f59f905248d76105d49cf 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ Configuration file: /home/nscuser/mnt/_config.yml
 
 ```
 sudo docker exec -it nscjekyll bash
-source setupnscruby
+source rubyenv nsc
 cd mnt
 jekyll serve --watch
 ```
@@ -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 /opt/nscjekyllsetup/compile.sh nsc
+singularity exec --bind <checked-out nscweb directory>:/mnt nscjekyll.simg bash /usr/local/src/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 /opt/nscjekyllsetup/rubyenv nsc
+source /usr/local/src/nscjekyllsetup/rubyenv nsc
 cd /mnt
 jekyll serve --watch
 ```
@@ -82,7 +82,7 @@ jekyll serve --watch
 or   
 ```
 singularity shell nscjekyll.simg
-source /opt/nscjekyllsetup/rubyenv nsc
+source /usr/local/src/nscjekyllsetup/rubyenv nsc
 cd <checked-out nscweb directory>
 jekyll serve --watch
 ```
diff --git a/compile.sh b/compile.sh
index 6b62fa5ce131a01f1b0a8fe92619b9e846ea63a1..28da385a7cdece1fb136d55c9ff000d9d8c17038 100644
--- a/compile.sh
+++ b/compile.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-source /opt/nscjekyllsetup/rubyenv $1
+source /usr/local/src/nscjekyllsetup/rubyenv $1
 cd /mnt
 jekyll build;
 exit $?;
diff --git a/presetup.sh b/presetup.sh
index 70a2a49bb655166f526a7157e4f70601f9fe23f8..2fed686cd639dba8b95a89e91d0c15a37880a9f5 100644
--- a/presetup.sh
+++ b/presetup.sh
@@ -1,9 +1,7 @@
 #!/bin/bash
 
 # Some prerequisites
-echo "en_US.UTF-8 UTF-8" >/etc/locale.gen
-locale-gen
-echo 'export LANG=en_US.UTF-8' >>/etc/bash.bashrc
-echo 'export LC_CTYPE=en_US.UTF-8' >>/etc/bash.bashrc
+echo 'export LANG=en_US.UTF-8' >>/etc/bashrc
+echo 'export LC_CTYPE=en_US.UTF-8' >>/etc/bashrc
 export 'RBENV_ROOT'=/usr/local/src/rbenv
-echo "export PATH=$RBENV_ROOT/bin:$PATH" >>/etc/bash.bashrc
+echo "export PATH=$RBENV_ROOT/bin:$PATH" >>/etc/bashrc
diff --git a/rubyenv b/rubyenv
index cd3708d26a1e591d85334533449900641ca67a1b..d63474c20d5a30e862abf724c5d0fc06594e3402 100644
--- a/rubyenv
+++ b/rubyenv
@@ -1,7 +1,7 @@
 export LANG=en_US.UTF-8
 export LC_CTYPE=en_US.UTF-8
 if [ "$1" = "nsc" ]; then
-    export PATH=/opt/rbenv/bin:/opt/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=/opt/rbenv/bin:/opt/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
diff --git a/singularity/Singularity b/singularity/Singularity
index 701f9ddf6fe5be2563f6ba417ea89fa65b5bd63d..0fb01c15b72367dd6f6333f57f6a6728c2982170 100644
--- a/singularity/Singularity
+++ b/singularity/Singularity
@@ -7,6 +7,6 @@ From: centos:latest
     yum install -y pandoc
     mkdir -p /usr/local/src && cd /usr/local/src
     git clone https://github.com/snic-nsc/nscjekyllsetup.git
-    cd nscjekyllsetup && git checkout 'v1.16'
+    cd nscjekyllsetup && git checkout 'v1.17'
     bash presetup.sh
     bash setup.sh
diff --git a/singularity/docker-to-singularity/Singularity b/singularity/docker-to-singularity/Singularity
index 5a037fd0adcc6bbd9fcc13e1fbe68179cc35db0b..2e162228f913b2e0276f68f1b2dbaa3b6b1b0bea 100644
--- a/singularity/docker-to-singularity/Singularity
+++ b/singularity/docker-to-singularity/Singularity
@@ -1,2 +1,2 @@
 Bootstrap: docker
-From: pchengi/nscjekyll:v1.16
+From: pchengi/nscjekyll:v1.17