diff --git a/ci-scripts/dockerfiles/Lmod.dockerfile b/ci-scripts/dockerfiles/Lmod.dockerfile
new file mode 100644
index 000000000..b908d7602
--- /dev/null
+++ b/ci-scripts/dockerfiles/Lmod.dockerfile
@@ -0,0 +1,27 @@
+FROM ubuntu:20.04
+
+ENV TZ=Europe/Zurich
+ENV DEBIAN_FRONTEND=noninteractive
+ENV _LMOD_VER=8.4.12
+
+# Setup apt
+RUN \
+  apt-get -y update && \
+  apt-get -y install ca-certificates && \
+  update-ca-certificates
+
+# Required utilities
+RUN apt-get -y install wget
+
+# Install Lmod
+RUN \
+  apt-get -y install lua5.3 lua-bit32:amd64 lua-posix:amd64 lua-posix-dev liblua5.3-0:amd64 liblua5.3-dev:amd64 tcl tcl-dev tcl8.6 tcl8.6-dev:amd64 libtcl8.6:amd64 && \
+  wget -q https://github.com/TACC/Lmod/archive/${_LMOD_VER}.tar.gz -O lmod.tar.gz && \
+  tar xzf lmod.tar.gz && \
+  cd Lmod-${_LMOD_VER} && \
+  ./configure && make install && \
+  cd .. && rm -rf lmod.tar.gz Lmod-${_LMOD_VER} && \
+  apt-get clean && \
+  rm -rf /var/lib/apt/lists/*
+
+ENV BASH_ENV=/usr/local/lmod/lmod/init/profile
diff --git a/ci-scripts/dockerfiles/Lmod77.dockerfile b/ci-scripts/dockerfiles/Lmod77.dockerfile
new file mode 100644
index 000000000..93612eaf5
--- /dev/null
+++ b/ci-scripts/dockerfiles/Lmod77.dockerfile
@@ -0,0 +1,33 @@
+#
+# LMod versions prior to 8.2 emitted Python commands differently, so we use this
+# Dockerfile to test the bindings of older versions
+#
+
+
+FROM ubuntu:20.04
+
+ENV TZ=Europe/Zurich
+ENV DEBIAN_FRONTEND=noninteractive
+ENV _LMOD_VER=7.7
+
+# Setup apt
+RUN \
+  apt-get -y update && \
+  apt-get -y install ca-certificates && \
+  update-ca-certificates
+
+# Required utilities
+RUN apt-get -y install wget
+
+# Install Lmod
+RUN \
+  apt-get -y install lua5.3 lua-bit32:amd64 lua-posix:amd64 lua-posix-dev liblua5.3-0:amd64 liblua5.3-dev:amd64 tcl tcl-dev tcl8.6 tcl8.6-dev:amd64 libtcl8.6:amd64 lua-filesystem:amd64 lua-filesystem-dev:amd64 && \
+  wget -q https://github.com/TACC/Lmod/archive/${_LMOD_VER}.tar.gz -O lmod.tar.gz && \
+  tar xzf lmod.tar.gz && \
+  cd Lmod-${_LMOD_VER} && \
+  ./configure && make install && \
+  cd .. && rm -rf lmod.tar.gz Lmod-${_LMOD_VER} && \
+  apt-get clean && \
+  rm -rf /var/lib/apt/lists/*
+
+ENV BASH_ENV=/usr/local/lmod/lmod/init/profile
diff --git a/ci-scripts/dockerfiles/Tmod32.dockerfile b/ci-scripts/dockerfiles/Tmod32.dockerfile
new file mode 100644
index 000000000..fd9e94ecd
--- /dev/null
+++ b/ci-scripts/dockerfiles/Tmod32.dockerfile
@@ -0,0 +1,10 @@
+FROM centos:7
+
+RUN sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo && \
+    sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo && \
+    sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo
+
+# Install Tmod 3.2.10
+RUN yum -y install environment-modules && \
+    yum clean all && \
+    rm -rf /var/cache/yum
diff --git a/ci-scripts/dockerfiles/Tmod4.dockerfile b/ci-scripts/dockerfiles/Tmod4.dockerfile
new file mode 100644
index 000000000..d8f7fb66a
--- /dev/null
+++ b/ci-scripts/dockerfiles/Tmod4.dockerfile
@@ -0,0 +1,27 @@
+FROM ubuntu:20.04
+
+ENV TZ=Europe/Zurich
+ENV DEBIAN_FRONTEND=noninteractive
+ENV _TMOD_VER=4.6.0
+
+# Setup apt
+RUN \
+  apt-get -y update && \
+  apt-get -y install ca-certificates && \
+  update-ca-certificates
+
+# Required utilities
+RUN apt-get -y install wget less
+
+# Install Tmod4
+RUN \
+  apt-get -y install autoconf tcl-dev && \
+  wget -q https://github.com/cea-hpc/modules/archive/v${_TMOD_VER}.tar.gz -O tmod.tar.gz && \
+  tar xzf tmod.tar.gz && \
+  cd modules-${_TMOD_VER} && \
+  ./configure && make install && \
+  cd .. && rm -rf tmod.tar.gz modules-${_TMOD_VER} && \
+  apt-get clean && \
+  rm -rf /var/lib/apt/lists/*
+
+ENV BASH_ENV=/usr/local/Modules/init/profile.sh