diff --git a/Dockerfile b/Dockerfile
index fd03639f27a876588d6c6aadd0feac3f72314626..7a438aedf64441b7ddd1cb7963258b0e3c088c7d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,15 @@
-FROM debian
+FROM centos:latest
 
-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 yum install -y git wget gcc make openssl-devel readline-devel zlib-devel vim bzip2
+RUN yum install -y epel-release
+RUN yum install -y pandoc
 RUN useradd nscuser -M --shell /bin/bash
-WORKDIR /opt
+WORKDIR /usr/local/src
 RUN git clone https://github.com/snic-nsc/nscjekyllsetup.git
-WORKDIR /opt/nscjekyllsetup
-RUN git checkout 'v1.12'
+WORKDIR /usr/local/src/nscjekyllsetup
+RUN git checkout 'v1.16'
 RUN bash presetup.sh
 RUN bash setup.sh
 USER nscuser
-WORKDIR /opt/nscjekyllsetup
+WORKDIR /usr/local/src/nscjekyllsetup
 ENTRYPOINT /bin/bash
diff --git a/presetup.sh b/presetup.sh
index a08c16e1cd29c3454daa7ee192eafd61521b3bfc..70a2a49bb655166f526a7157e4f70601f9fe23f8 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'=/opt/rbenv
+echo 'export LC_CTYPE=en_US.UTF-8' >>/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/setup.sh b/setup.sh
index bd16698e853f08d9d1fb08606d5f3bc0d8eb80d1..d9b4b5788d479640589b5992be63517f9b16902e 100644
--- a/setup.sh
+++ b/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-cd /opt
+cd /usr/local/src
 git clone https://github.com/sstephenson/rbenv.git rbenv
 pushd rbenv
 git checkout 615f8443fe947f114fb358815b50978f6ab1881c
@@ -8,19 +8,17 @@ popd
 git clone https://github.com/sstephenson/ruby-build.git rbenv/plugins/ruby-build
 pushd rbenv/plugins/ruby-build
 git checkout 476d09b66a14392989c3c65793428742e1d9f951
-export PATH=/opt/rbenv/bin:$PATH
-export RBENV_ROOT=/opt/rbenv
+export PATH=/usr/local/src/rbenv/bin:$PATH
+export RBENV_ROOT=/usr/local/src/rbenv
 eval "$(rbenv init -)"
 rbenv install 2.4.1
 rbenv global 2.4.1
 gem update -f rdoc ri
-gem update
-gem install -v 2.1.1 jekyll
+gem install -v 2.5.3 jekyll
 gem install pandoc-ruby RedCloth
 rbenv install 2.4.0
 rbenv global 2.4.0
 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 /opt/rbenv
+chmod -R ugo+rx /usr/local/src/rbenv
diff --git a/singularity/Singularity b/singularity/Singularity
index 314898eebaab4fbbef4b46e8f32d1c507871261e..701f9ddf6fe5be2563f6ba417ea89fa65b5bd63d 100644
--- a/singularity/Singularity
+++ b/singularity/Singularity
@@ -1,10 +1,12 @@
 Bootstrap: docker
-From: debian
+From: centos:latest
 
 %post
-    apt-get update && apt-get install -y git wget gcc make libssl-dev libreadline-dev zlib1g-dev vim bzip2 locales pandoc python2.7
+    yum install -y git wget gcc make openssl-devel readline-devel zlib-devel vim bzip2
+    yum install -y epel-release
+    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.14'
+    cd nscjekyllsetup && git checkout 'v1.16'
     bash presetup.sh
     bash setup.sh
diff --git a/singularity/docker-to-singularity/Singularity b/singularity/docker-to-singularity/Singularity
index 494ab16ce0eec1c1727157415478cf3b9c1455c8..5a037fd0adcc6bbd9fcc13e1fbe68179cc35db0b 100644
--- a/singularity/docker-to-singularity/Singularity
+++ b/singularity/docker-to-singularity/Singularity
@@ -1,2 +1,2 @@
 Bootstrap: docker
-From: pchengi/nscjekyll:v1.12
+From: pchengi/nscjekyll:v1.16