diff --git a/Dockerfile b/Dockerfile
index 5eca9df2e26be7ec38a053776a2417928f2e5411..b9df14e30261fd1ed5e5a9a9061f184f08ea633c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,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.10'
+RUN git checkout 'v1.11'
 RUN bash presetup.sh
 RUN bash setup.sh
 USER nscuser
diff --git a/compile.sh b/compile.sh
index ae515a2d90058f52d3b80ecca221713427d6bd86..e88611ca4ab791d440767d7f2df06b5a8a9ea68b 100644
--- a/compile.sh
+++ b/compile.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 export LANG=en_US.UTF-8
 source /usr/local/src/nscjekyllsetup/rubyenv $1
+cd /mnt
 jekyll build;
 exit $?;
diff --git a/rubyenv b/rubyenv
index 2322e198efb515a4aad89666ce1dc3189253ec01..85359c0a655b3068602438757c419afa433eb516 100644
--- a/rubyenv
+++ b/rubyenv
@@ -3,4 +3,3 @@ if [ "$1" = "nsc" ]; then
 else
     export PATH=/usr/local/src/rbenv/bin:/usr/local/src/rbenv/versions/2.4.0/bin:$PATH
 fi
-cd /mnt
diff --git a/singularity/Singularity b/singularity/Singularity
index 11ae75d7614aa46ae2c93785dcf31bcfb63130c9..d020698c56de4952f83f7c9d2cbe9ca387ad4d87 100644
--- a/singularity/Singularity
+++ b/singularity/Singularity
@@ -1,2 +1,10 @@
 Bootstrap: docker
-From: pchengi/nscjekyll:latest
+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
+    git clone https://github.com/snic-nsc/nscjekyllsetup.git
+    cd nscjekyllsetup && git checkout 'v1.11'
+    bash presetup.sh
+    bash setup.sh