diff --git a/src/docker_modules/hisat2/2.1.0/Dockerfile b/src/docker_modules/hisat2/2.1.0/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..5f937ce5cbd501ccdbea948dc3f080182f6feb4e
--- /dev/null
+++ b/src/docker_modules/hisat2/2.1.0/Dockerfile
@@ -0,0 +1,20 @@
+FROM samtools:1.7
+MAINTAINER Nicolas Fontrodona
+
+ENV HISAT2_VERSION=2.1.0
+ENV PACKAGES curl \
+             zip \
+             g++ \
+             perl \
+             python
+
+RUN apk update && \
+    apk add ${PACKAGES}
+
+RUN curl -k -L http://ccb.jhu.edu/software/hisat2/dl/hisat2-${HISAT2_VERSION}-source.zip -o hisat2_linux-v${HISAT2_VERSION}.zip && \
+unzip hisat2_linux-v${HISAT2_VERSION}.zip && \
+cd hisat2-${HISAT2_VERSION} && \
+make && \
+cp hisat2 /usr/bin && \
+cp hisat2-* /usr/bin && \
+rm -Rf hisat2-${HISAT2_VERSION}
diff --git a/src/docker_modules/hisat2/2.1.0/docker_init.sh b/src/docker_modules/hisat2/2.1.0/docker_init.sh
new file mode 100755
index 0000000000000000000000000000000000000000..3004f07abb94e54030ccc4be6c91008c6199cec6
--- /dev/null
+++ b/src/docker_modules/hisat2/2.1.0/docker_init.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+docker build src/docker_modules/hisat2/2.1.0 -t 'hisat2:2.1.0'
diff --git a/src/nf_modules/hisat2/indexing.config b/src/nf_modules/hisat2/indexing.config
index 47c14a572a4849eac8ebbe87dcb9a88c76e7a2c1..b259633a356075cabc4a621d7b13b1a683cc4db7 100644
--- a/src/nf_modules/hisat2/indexing.config
+++ b/src/nf_modules/hisat2/indexing.config
@@ -4,7 +4,7 @@ profiles {
     docker.enabled = true
     process {
       withName: index_fasta {
-        container = "hisat2:2.0.0"
+        container = "hisat2:2.1.0"
         cpus = 4
       }
     }
@@ -14,7 +14,7 @@ profiles {
     process {
       withName: index_fasta {
         cpus = 4
-        container = "file://bin/hisat2:2.0.0.sif"
+        container = "file://bin/hisat2:2.1.0.sif"
       }
     }
   }
@@ -22,7 +22,7 @@ profiles {
     process{
       withName: index_fasta {
         beforeScript = "source /usr/share/lmod/lmod/init/bash; module use ~/privatemodules"
-        module = "hisat2/2.0.0"
+        module = "hisat2/2.1.0"
         executor = "sge"
         clusterOptions = "-cwd -V"
         memory = "20GB"
diff --git a/src/nf_modules/hisat2/mapping_paired.config b/src/nf_modules/hisat2/mapping_paired.config
index e23abd8ada183b12d015b19dc5c3f1e65cfc8ac6..02c92edfdf20563dc0114608af27072c0c68c023 100644
--- a/src/nf_modules/hisat2/mapping_paired.config
+++ b/src/nf_modules/hisat2/mapping_paired.config
@@ -5,7 +5,7 @@ profiles {
     process {
       withName: mapping_fastq {
         cpus = 4
-        container = "hisat2:2.0.0"
+        container = "hisat2:2.1.0"
       }
     }
   }
@@ -14,7 +14,7 @@ profiles {
     process {
       withName: mapping_fastq {
         cpus = 4
-        container = "file://bin/hisat2:2.0.0.sif"
+        container = "file://bin/hisat2:2.1.0.sif"
       }
     }
   }
@@ -22,7 +22,7 @@ profiles {
     process{
       withName: mapping_fastq {
         beforeScript = "source /usr/share/lmod/lmod/init/bash; module use ~/privatemodules"
-        module = "hisat2/2.0.0:samtools/1.7"
+        module = "hisat2/2.1.0:samtools/1.7"
         executor = "sge"
         clusterOptions = "-cwd -V"
         memory = "20GB"
diff --git a/src/nf_modules/hisat2/mapping_single.config b/src/nf_modules/hisat2/mapping_single.config
index e23abd8ada183b12d015b19dc5c3f1e65cfc8ac6..02c92edfdf20563dc0114608af27072c0c68c023 100644
--- a/src/nf_modules/hisat2/mapping_single.config
+++ b/src/nf_modules/hisat2/mapping_single.config
@@ -5,7 +5,7 @@ profiles {
     process {
       withName: mapping_fastq {
         cpus = 4
-        container = "hisat2:2.0.0"
+        container = "hisat2:2.1.0"
       }
     }
   }
@@ -14,7 +14,7 @@ profiles {
     process {
       withName: mapping_fastq {
         cpus = 4
-        container = "file://bin/hisat2:2.0.0.sif"
+        container = "file://bin/hisat2:2.1.0.sif"
       }
     }
   }
@@ -22,7 +22,7 @@ profiles {
     process{
       withName: mapping_fastq {
         beforeScript = "source /usr/share/lmod/lmod/init/bash; module use ~/privatemodules"
-        module = "hisat2/2.0.0:samtools/1.7"
+        module = "hisat2/2.1.0:samtools/1.7"
         executor = "sge"
         clusterOptions = "-cwd -V"
         memory = "20GB"
diff --git a/src/psmn_modules b/src/psmn_modules
index 9ae41bf72d4f536d73a76dfd13e375bca7d4f48e..746ce10272091f40f3c98e6972dede47df4b0beb 160000
--- a/src/psmn_modules
+++ b/src/psmn_modules
@@ -1 +1 @@
-Subproject commit 9ae41bf72d4f536d73a76dfd13e375bca7d4f48e
+Subproject commit 746ce10272091f40f3c98e6972dede47df4b0beb
diff --git a/src/singularity_modules/hisat2/2.1.0/build.sh b/src/singularity_modules/hisat2/2.1.0/build.sh
new file mode 100755
index 0000000000000000000000000000000000000000..074f4ce61f6e8e6f98d7c496d9c42b5b72ac5311
--- /dev/null
+++ b/src/singularity_modules/hisat2/2.1.0/build.sh
@@ -0,0 +1,3 @@
+#/bin/sh
+sudo singularity build --force bin/hisat2:2.1.0.sif src/singularity_modules/hisat2/2.1.0/hisat2.def && \
+singularity sign bin/hisat2:2.1.0.sif
diff --git a/src/singularity_modules/hisat2/2.1.0/hisat2.def b/src/singularity_modules/hisat2/2.1.0/hisat2.def
new file mode 100644
index 0000000000000000000000000000000000000000..c6358b112cb5d886b30ac8bcba2914e8255d15fe
--- /dev/null
+++ b/src/singularity_modules/hisat2/2.1.0/hisat2.def
@@ -0,0 +1,50 @@
+Bootstrap: docker
+From: alpine:3.8
+
+%labels
+MAINTAINER Laurent Modolo
+
+%post
+SAMTOOLS_VERSION=1.7
+HISAT2_VERSION=2.1.0
+PACKAGES="git \
+          make \
+          gcc \
+          musl-dev \
+          zlib-dev \
+          ncurses-dev \
+          bzip2-dev \
+          xz-dev \
+          bash \
+          curl \
+          zip \
+          g++ \
+          perl \
+          python"
+apk update && \
+apk add ${PACKAGES}
+
+git clone https://github.com/samtools/htslib.git && \
+cd htslib && \
+git checkout ${SAMTOOLS_VERSION}  && \
+cd .. && \
+git clone https://github.com/samtools/samtools.git && \
+cd samtools && \
+git checkout ${SAMTOOLS_VERSION} && \
+make && \
+cp samtools /usr/bin/
+
+curl -k -L http://ccb.jhu.edu/software/hisat2/dl/hisat2-${HISAT2_VERSION}-source.zip -o hisat2_linux-v${HISAT2_VERSION}.zip && \
+unzip hisat2_linux-v${HISAT2_VERSION}.zip && \
+cd hisat2-${HISAT2_VERSION} && \
+make && \
+cp hisat2 /usr/bin && \
+cp hisat2-* /usr/bin && \
+rm -Rf hisat2-${HISAT2_VERSION}
+
+%environment
+export SAMTOOLS_VERSION=1.7
+export HISAT2_VERSION=2.1.0
+
+%runscript
+exec /bin/bash "$@"