diff --git a/CentOS/7.4-GPU/CentOS-7.4-GPU-Bootstrap b/CentOS/7.4-GPU/CentOS-7.4-GPU-Bootstrap
new file mode 100644
index 0000000000000000000000000000000000000000..090db5ffd684b939d5eeeca10ba5b981b52ae83f
--- /dev/null
+++ b/CentOS/7.4-GPU/CentOS-7.4-GPU-Bootstrap
@@ -0,0 +1,96 @@
+Bootstrap: docker
+From: centos:latest
+
+%setup
+cp /apps/easybuild/sources/n/NVIDIA/NVIDIA-Linux-x86_64-390.30.run /tmp
+
+%post
+yum -y update && yum -y upgrade
+
+# CentOS repo
+yum -y install python gcc make wget vim mc procps tcl gcc-c++ gcc-gfortran pkg-config acl acpid alsa-lib alsa-lib-devel amtu apr aspell at atk atk-devel attr audit audit-libs audit-libs-python authconfig autoconf autofs automake avahi-glib avahi-libs basesystem bash bc bind-libs bind-utils binutils binutils-devel bison bison-devel bluez-libs bridge-utils busybox bzip2 bzip2-devel bzip2-libs ca-certificates cairo cairo-devel c-ares ccid cdparanoia-libs centos-indexhtml centos-release checkpolicy chkconfig cloog-ppl compat-libcap1 compat-libstdc++-33 compat-readline5 ConsoleKit ConsoleKit-libs coolkey coreutils coreutils-libs cpio cpp cppunit cpupowerutils cpuspeed cracklib cracklib-dicts crash crda cronie cronie-anacron crontabs cryptsetup-luks cryptsetup-luks-libs cups cups-libs curl cvs cyrus-sasl cyrus-sasl-devel cyrus-sasl-gssapi cyrus-sasl-lib cyrus-sasl-plain dash db4 db4-cxx db4-devel db4-utils dbus dbus-devel dbus-glib dbus-glib-devel dbus-libs dbus-python dejavu-fonts-common dejavu-lgc-sans-mono-fonts dejavu-sans-mono-fonts desktop-file-utils device-mapper device-mapper-event device-mapper-event-libs device-mapper-libs device-mapper-multipath device-mapper-multipath-libs device-mapper-persistent-data diffutils dmidecode dmraid dmraid-events dmz-cursor-themes docbook-dtds docbook-style-dsssl docbook-style-xsl docbook-utils dos2unix dosfstools dracut dracut-kernel dracut-network dump e2fsprogs e2fsprogs-devel e2fsprogs-libs ed eggdbus eject elfutils-libelf elfutils-libelf-devel elfutils-libs emacs emacs-common environment-modules ethtool expat expat-devel expect file file-devel file-libs filesystem findutils finger fipscheck fipscheck-lib flac fontconfig fontconfig-devel fontpackages-filesystem foomatic foomatic-db foomatic-db-filesystem foomatic-db-ppds freeglut freeglut-devel freetype freetype-devel ftp fuse fuse-libs gamin gamin-python gawk gcc gcc-c++ gcc-gfortran GConf2 GConf2-devel gd gdb gdbm gdbm-devel gdk-pixbuf2 gdk-pixbuf2-devel genisoimage gettext gettext-devel gettext-libs ghostscript ghostscript-fonts giflib git glib2 glib2-devel glibc glibc-common glibc-debuginfo glibc-debuginfo-common glibc-devel glibc-headers glx-utils gmp gmp-devel gnome-icon-theme gnome-keyring gnome-keyring-devel gnome-themes gnome-vfs2 gnome-vfs2-devel gnupg2 gnuplot gnuplot-common gnutls gnutls-devel gperf gpgme gpm gpm-libs grep groff grub grubby gstreamer gstreamer-plugins-base gstreamer-tools gtk2 gtk2-devel gtk2-engines gtk-doc gzip hal hal-devel hal-info hal-libs hdparm hesiod hicolor-icon-theme hunspell hwdata hwloc hwloc-devel ilmbase ImageMagick indent info initscripts iproute iptables iptables-ipv6 iptstate iputils irqbalance iscsi-initiator-utils iso-codes iw jasper-libs jwhois kbd kbd-misc kernel kernel kernel-devel kernel-firmware kernel-headers keyutils keyutils-libs keyutils-libs-devel kpartx krb5-devel krb5-libs krb5-workstation ksh lcms-libs less lftp libacl libacl-devel libaio libart_lgpl libart_lgpl-devel libasyncns libattr libattr-devel libbasicobjects libblkid libbonobo libbonobo-devel libbonoboui libbonoboui-devel libcanberra libcanberra-gtk2 libcap libcap-devel libcap-ng libcgroup libcollection libcom_err libcom_err-devel libcroco libcroco-devel libcxgb3 libcxgb4 libdaemon libdhash libdrm libdrm-devel libedit libedit-devel libevent libexif libffi libfontenc libgcc libgcj libgcrypt libgcrypt-devel libgfortran libglade2 libglade2-devel libgnome libgnomecanvas libgnomecanvas-devel libgnome-devel libgomp libgpg-error libgpg-error-devel libgsf libgsf-devel libgssglue libgudev1 libhugetlbfs libibcm libibcm-devel libibverbs libibverbs-devel libibverbs-devel-static libibverbs-utils libICE libICE-devel libicu libIDL libIDL-devel libidn libidn-devel libini_config libipa_hbac libjpeg-turbo libjpeg-turbo-devel libldb libmcpp libmlx4 libmlx5 libmng libmng-devel libmthca libmthca-static libnetfilter_conntrack libnfnetlink libnih libnl libnl-devel libnotify libogg liboil libotf libpath_utils libpcap libpciaccess libpciaccess-devel libpng libpng-devel libproxy libproxy-bin libproxy-python libref_array librsvg2 librsvg2-devel libselinux libselinux-devel libselinux-python libselinux-utils libsemanage libsepol libsepol-devel libSM libSM-devel libsndfile libss libssh2 libsss_idmap libstdc++ libstdc++-devel libsysfs libsysfs-devel libtalloc libtasn1 libtasn1-devel libtdb libtevent libthai libtheora libtiff libtiff-devel libtirpc libtool-ltdl libudev libudev-devel libunistring libusb libusb1 libusb-devel libuser libutempter libuuid libvisual libvorbis libwmf libwmf-lite libwnck libX11 libX11-common libX11-devel libXau libXau-devel libXaw libXaw-devel libxcb libxcb-devel libXcomposite libXcomposite-devel libXcursor libXcursor-devel libXdamage libXdamage-devel libXdmcp libXdmcp-devel libXext libXext-devel libXfixes libXfixes-devel libXfont libXft libXft-devel libXi libXi-devel libXinerama libXinerama-devel libxkbfile libxml2 libxml2-devel libxml2-python libXmu libXmu-devel libXp libXpm libXpm-devel libXrandr libXrandr-devel libXrender libXrender-devel libXres libXScrnSaver libXScrnSaver-devel libxslt libxslt-devel libXt libXt-devel libXtst libXtst-devel libXv libXv-devel libXxf86misc libXxf86misc-devel libXxf86vm libXxf86vm-devel lm_sensors-libs lockdev logrotate lsof lvm2 lvm2-libs lynx lzo m17n-db m17n-db-datafiles m17n-lib m2crypto m4 mailcap mailx make MAKEDEV man man-pages mc mcpp mcstrans mdadm mesa-dri1-drivers mesa-dri-drivers mesa-dri-filesystem mesa-libGL mesa-libGL-devel mesa-libGLU mesa-libGLU-devel mesa-private-llvm mgetty microcode_ctl mingetty mkbootdisk mlocate module-init-tools mpfr mtools mtr mysql-libs nano nc ncurses ncurses-base ncurses-devel ncurses-libs net-snmp net-snmp-libs net-tools newt newt-python nfs-utils nfs-utils-lib nmap notification-daemon nscd nspr nspr-devel nss nss_db nss-devel nss-softokn nss-softokn-debuginfo nss-softokn-devel nss-softokn-freebl nss-softokn-freebl-devel nss-sysinit nss-tools nss-util nss-util-devel ntp ntpdate ntsysv OpenEXR-libs OpenIPMI OpenIPMI-libs openjade openjpeg-libs openldap openldap-devel openmotif openmotif22 opensp openssh openssh-clients openssh-server ORBit2 ORBit2-devel p11-kit p11-kit-trust pam pam-devel pam_krb5 pam_passwdqc pam_pkcs11 pango pango-devel paps paps-libs parted passwd patch pax pciutils pciutils-devel pciutils-libs pcmciautils pcp pcp-conf pcp-libs pcre pcsc-lite pcsc-lite-libs perf perl perl-AppConfig perl-Authen-SASL perl-Bit-Vector perl-Carp-Clan perl-CGI perl-Class-Singleton perl-Compress-Raw-Zlib perl-Compress-Zlib perl-Convert-ASN1 perl-Crypt-PasswdMD5 perl-Date-Calc perl-Date-Manip perl-DateTime perl-DBD-Pg perl-DBI perl-devel perl-Digest-HMAC perl-Digest-SHA1 perl-Error perl-ExtUtils-MakeMaker perl-ExtUtils-ParseXS perl-File-Which perl-Git perl-GSSAPI perl-HTML-Parser perl-HTML-Tagset perl-IO-Compress-Base perl-IO-Compress-Zlib perl-IO-Socket-SSL perl-JSON perl-LDAP perl-libs perl-libwww-perl perl-List-MoreUtils perl-Module-Pluggable perl-Net-LibIDN perl-Net-SSLeay perl-Net-Telnet perl-Params-Validate perl-PCP-PMDA perl-Pod-Escapes perl-Pod-Simple perl-SGMLSpm perl-Socket6 perl-String-CRC32 perl-TermReadKey perl-Test-Harness perl-Test-Simple perl-Text-Iconv perl-Time-HiRes perl-URI perl-version perl-WWW-Curl perl-XML-Filter-BufferText perl-XML-LibXML perl-XML-NamespaceSupport perl-XML-Parser perl-XML-SAX perl-XML-SAX-Writer perl-XML-Simple perl-YAML-Syck pinentry pinfo pixman pixman-devel pkgconfig plymouth plymouth-core-libs plymouth-scripts pm-utils policycoreutils polkit poppler poppler-data poppler-utils popt popt-devel portreserve postfix postgresql postgresql-devel postgresql-libs postgresql-odbc ppl ppp prelink procmail procps psacct psmisc pth pulseaudio-libs pycairo pycairo-devel pygobject2 pygobject2-codegen pygobject2-devel pygobject2-doc pygpgme pygtk2 pygtk2-codegen pygtk2-devel pygtk2-doc pyOpenSSL pytalloc python python-argparse python-devel python-iniparse python-libs python-pcp python-pycurl python-setuptools python-sssdconfig python-urlgrabber qt qt3 qt-sqlite qt-x11 quota rarian rarian-compat rdate rdma readahead readline readline-devel redhat-logos redhat-lsb redhat-lsb-compat redhat-lsb-core redhat-lsb-graphics redhat-lsb-printing redhat-menus redhat-rpm-config rmt rootfiles rpcbind rpm rpm-devel rpm-libs rpm-python rp-pppoe rrdtool rsh rsync ruby ruby-libs samba samba4-libs samba-common samba-winbind samba-winbind-clients screen SDL SDL-devel sed selinux-policy setserial setup setuptool sgml-common sgpio shadow-utils shared-mime-info slang smartmontools snappy sos sound-theme-freedesktop sqlite sqlite-devel sssd sssd-ad sssd-client sssd-common sssd-common-pac sssd-ipa sssd-krb5 sssd-krb5-common sssd-ldap sssd-proxy startup-notification startup-notification-devel strace stunnel sudo swig symlinks sysfsutils syslinux syslinux-nonlinux sysstat system-gnome-theme system-icon-theme systemtap-devel sysvinit-tools t1lib talk tar tcl tcl-devel tcpdump tcp_wrappers tcp_wrappers-libs tcsh telnet time tk tmpwatch traceroute tree tunctl tzdata udev udftools unix2dos unixODBC unixODBC-devel unzip upstart urw-fonts usbutils usermode ustr util-linux-ng vconfig vim-common vim-enhanced vim-filesystem vim-minimal virt-what wget which wireless-tools words wpa_supplicant xcb-util xdg-utils xerces-c xerces-c-devel xinetd xkeyboard-config xml-common xmlrpc-c xmlrpc-c-client xorg-x11-fonts-100dpi xorg-x11-fonts-75dpi xorg-x11-font-utils xorg-x11-proto-devel xorg-x11-server-common xorg-x11-server-utils xorg-x11-xauth xorg-x11-xkb-utils xterm xz xz-libs xz-lzma-compat ypbind yp-tools yum yum-metadata-parser yum-plugin-auto-update-debug-info yum-plugin-fastestmirror yum-plugin-priorities yum-plugin-security yum-plugin-versionlock yum-utils zip zlib zlib-devel
+
+# Fedora repo
+yum -y install bash-completion pigz tmux
+
+yum -y groupinstall "Development Tools"
+
+cd /tmp
+
+# OpenMPI
+wget https://www.open-mpi.org/software/ompi/v2.1/downloads/openmpi-2.1.1.tar.gz
+tar xvf openmpi-2.1.1.tar.gz && cd openmpi-2.1.1
+./configure --prefix=/usr/local
+make -j 16
+make install
+
+# pip
+curl -s -O https://bootstrap.pypa.io/get-pip.py
+python get-pip.py
+
+pip install setuptools python-graph-core python-graph-dot tabulate numpy scipy pandas wheel --upgrade
+
+# lua
+wget http://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/l/lua-posix-32-2.el7.x86_64.rpm
+wget http://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/l/lua-filesystem-1.6.2-2.el7.x86_64.rpm
+wget http://mirror.centos.org/centos/7/os/x86_64/Packages/lua-devel-5.1.4-15.el7.x86_64.rpm
+wget http://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/l/lua-bitop-1.0.2-3.el7.x86_64.rpm
+
+rpm -ihv lua-devel-5.1.4-15.el7.x86_64.rpm
+rpm -ihv lua-filesystem-1.6.2-2.el7.x86_64.rpm
+rpm -ihv lua-bitop-1.0.2-3.el7.x86_64.rpm
+rpm -ihv lua-posix-32-2.el7.x86_64.rpm
+
+# Lmod
+wget https://github.com/TACC/Lmod/archive/7.7.7.tar.gz
+tar xvf 7.7.7.tar.gz
+cd Lmod-7.7.7
+./configure --prefix=/opt/apps
+make install
+
+# GPU
+driver_version=390.30
+driver="/tmp/NVIDIA-Linux-x86_64-$driver_version.run"
+sh $driver -x
+mv NVIDIA-Linux-x86_64-$driver_version /usr/local/
+dir=/usr/local/NVIDIA-Linux-x86_64-$driver_version
+cd $dir
+ln -s libcuda.so.$driver_version libcuda.so
+ln -s libEGL.so.$driver_version libEGL.so
+ln -s libGLESv1_CM.so.$driver_version libGLESv1_CM.so
+ln -s libGLESv2.so.$driver_version libGLESv2.so
+ln -s libGL.so.$driver_version libGL.so
+ln -s libglx.so.$driver_version libglx.so
+ln -s libnvcuvid.so.$driver_version libnvcuvid.so
+ln -s libnvidia-cfg.so.$driver_version libnvidia-cfg.so
+ln -s libnvidia-compiler.so.$driver_version libnvidia-compiler.so
+ln -s libnvidia-eglcore.so.$driver_version libnvidia-eglcore.so
+ln -s libnvidia-encode.so.$driver_version libnvidia-encode.so
+ln -s libnvidia-fbc.so.$driver_version libnvidia-fbc.so
+ln -s libnvidia-glcore.so.$driver_version libnvidia-glcore.so
+ln -s libnvidia-glsi.so.$driver_version libnvidia-glsi.so
+ln -s libnvidia-gtk2.so.$driver_version libnvidia-gtk2.so
+ln -s libnvidia-gtk3.so.$driver_version libnvidia-gtk3.so
+ln -s libnvidia-ifr.so.$driver_version libnvidia-ifr.so
+ln -s libnvidia-ml.so.$driver_version libnvidia-ml.so
+ln -s libnvidia-ml.so.$driver_version libnvidia-ml.so.1
+ln -s libnvidia-opencl.so.$driver_version libnvidia-opencl.so
+ln -s libnvidia-tls.so.$driver_version libnvidia-tls.so
+ln -s libnvidia-wfb.so.$driver_version libnvidia-wfb.so
+ln -s libvdpau_nvidia.so.$driver_version libvdpau_nvidia.so
+ln -s libvdpau.so.$driver_version libvdpau.so
+ln -s libvdpau_trace.so.$driver_version libvdpau_trace.so
+ln -s libcuda.so.$driver_version libcuda.so.1
+
+# APPS and SCRATCH
+mkdir /apps
+mkdir /scratch
+
+%environment
+source /opt/apps/lmod/7.7.7/init/profile
+clearMT
+export -f ml
+export -f module
+export -f clearMT
+export LD_LIBRARY_PATH=/usr/local/cuda/lib64:/usr/local/cuda/extras/CUPTI/lib64:/usr/local/NVIDIA-Linux-x86_64-390.30:$LD_LIBRARY_PATH
+export PATH=/usr/local/NVIDIA-Linux-x86_64-390.30:/usr/local/cuda/bin:$PATH
diff --git a/CentOS/7.4/CentOS-7.4-Bootstrap b/CentOS/7.4/CentOS-7.4-Bootstrap
new file mode 100644
index 0000000000000000000000000000000000000000..8638f544adf20914ac0928546ee21601bdb33396
--- /dev/null
+++ b/CentOS/7.4/CentOS-7.4-Bootstrap
@@ -0,0 +1,58 @@
+Bootstrap: docker
+From: centos:latest
+
+%post
+yum -y update && yum -y upgrade
+
+# CentOS repo
+yum -y install python gcc make wget vim mc procps tcl gcc-c++ gcc-gfortran pkg-config acl acpid alsa-lib alsa-lib-devel amtu apr aspell at atk atk-devel attr audit audit-libs audit-libs-python authconfig autoconf autofs automake avahi-glib avahi-libs basesystem bash bc bind-libs bind-utils binutils binutils-devel bison bison-devel bluez-libs bridge-utils busybox bzip2 bzip2-devel bzip2-libs ca-certificates cairo cairo-devel c-ares ccid cdparanoia-libs centos-indexhtml centos-release checkpolicy chkconfig cloog-ppl compat-libcap1 compat-libstdc++-33 compat-readline5 ConsoleKit ConsoleKit-libs coolkey coreutils coreutils-libs cpio cpp cppunit cpupowerutils cpuspeed cracklib cracklib-dicts crash crda cronie cronie-anacron crontabs cryptsetup-luks cryptsetup-luks-libs cups cups-libs curl cvs cyrus-sasl cyrus-sasl-devel cyrus-sasl-gssapi cyrus-sasl-lib cyrus-sasl-plain dash db4 db4-cxx db4-devel db4-utils dbus dbus-devel dbus-glib dbus-glib-devel dbus-libs dbus-python dejavu-fonts-common dejavu-lgc-sans-mono-fonts dejavu-sans-mono-fonts desktop-file-utils device-mapper device-mapper-event device-mapper-event-libs device-mapper-libs device-mapper-multipath device-mapper-multipath-libs device-mapper-persistent-data diffutils dmidecode dmraid dmraid-events dmz-cursor-themes docbook-dtds docbook-style-dsssl docbook-style-xsl docbook-utils dos2unix dosfstools dracut dracut-kernel dracut-network dump e2fsprogs e2fsprogs-devel e2fsprogs-libs ed eggdbus eject elfutils-libelf elfutils-libelf-devel elfutils-libs emacs emacs-common environment-modules ethtool expat expat-devel expect file file-devel file-libs filesystem findutils finger fipscheck fipscheck-lib flac fontconfig fontconfig-devel fontpackages-filesystem foomatic foomatic-db foomatic-db-filesystem foomatic-db-ppds freeglut freeglut-devel freetype freetype-devel ftp fuse fuse-libs gamin gamin-python gawk gcc gcc-c++ gcc-gfortran GConf2 GConf2-devel gd gdb gdbm gdbm-devel gdk-pixbuf2 gdk-pixbuf2-devel genisoimage gettext gettext-devel gettext-libs ghostscript ghostscript-fonts giflib git glib2 glib2-devel glibc glibc-common glibc-debuginfo glibc-debuginfo-common glibc-devel glibc-headers glx-utils gmp gmp-devel gnome-icon-theme gnome-keyring gnome-keyring-devel gnome-themes gnome-vfs2 gnome-vfs2-devel gnupg2 gnuplot gnuplot-common gnutls gnutls-devel gperf gpgme gpm gpm-libs grep groff grub grubby gstreamer gstreamer-plugins-base gstreamer-tools gtk2 gtk2-devel gtk2-engines gtk-doc gzip hal hal-devel hal-info hal-libs hdparm hesiod hicolor-icon-theme hunspell hwdata hwloc hwloc-devel ilmbase ImageMagick indent info initscripts iproute iptables iptables-ipv6 iptstate iputils irqbalance iscsi-initiator-utils iso-codes iw jasper-libs jwhois kbd kbd-misc kernel kernel kernel-devel kernel-firmware kernel-headers keyutils keyutils-libs keyutils-libs-devel kpartx krb5-devel krb5-libs krb5-workstation ksh lcms-libs less lftp libacl libacl-devel libaio libart_lgpl libart_lgpl-devel libasyncns libattr libattr-devel libbasicobjects libblkid libbonobo libbonobo-devel libbonoboui libbonoboui-devel libcanberra libcanberra-gtk2 libcap libcap-devel libcap-ng libcgroup libcollection libcom_err libcom_err-devel libcroco libcroco-devel libcxgb3 libcxgb4 libdaemon libdhash libdrm libdrm-devel libedit libedit-devel libevent libexif libffi libfontenc libgcc libgcj libgcrypt libgcrypt-devel libgfortran libglade2 libglade2-devel libgnome libgnomecanvas libgnomecanvas-devel libgnome-devel libgomp libgpg-error libgpg-error-devel libgsf libgsf-devel libgssglue libgudev1 libhugetlbfs libibcm libibcm-devel libibverbs libibverbs-devel libibverbs-devel-static libibverbs-utils libICE libICE-devel libicu libIDL libIDL-devel libidn libidn-devel libini_config libipa_hbac libjpeg-turbo libjpeg-turbo-devel libldb libmcpp libmlx4 libmlx5 libmng libmng-devel libmthca libmthca-static libnetfilter_conntrack libnfnetlink libnih libnl libnl-devel libnotify libogg liboil libotf libpath_utils libpcap libpciaccess libpciaccess-devel libpng libpng-devel libproxy libproxy-bin libproxy-python libref_array librsvg2 librsvg2-devel libselinux libselinux-devel libselinux-python libselinux-utils libsemanage libsepol libsepol-devel libSM libSM-devel libsndfile libss libssh2 libsss_idmap libstdc++ libstdc++-devel libsysfs libsysfs-devel libtalloc libtasn1 libtasn1-devel libtdb libtevent libthai libtheora libtiff libtiff-devel libtirpc libtool-ltdl libudev libudev-devel libunistring libusb libusb1 libusb-devel libuser libutempter libuuid libvisual libvorbis libwmf libwmf-lite libwnck libX11 libX11-common libX11-devel libXau libXau-devel libXaw libXaw-devel libxcb libxcb-devel libXcomposite libXcomposite-devel libXcursor libXcursor-devel libXdamage libXdamage-devel libXdmcp libXdmcp-devel libXext libXext-devel libXfixes libXfixes-devel libXfont libXft libXft-devel libXi libXi-devel libXinerama libXinerama-devel libxkbfile libxml2 libxml2-devel libxml2-python libXmu libXmu-devel libXp libXpm libXpm-devel libXrandr libXrandr-devel libXrender libXrender-devel libXres libXScrnSaver libXScrnSaver-devel libxslt libxslt-devel libXt libXt-devel libXtst libXtst-devel libXv libXv-devel libXxf86misc libXxf86misc-devel libXxf86vm libXxf86vm-devel lm_sensors-libs lockdev logrotate lsof lvm2 lvm2-libs lynx lzo m17n-db m17n-db-datafiles m17n-lib m2crypto m4 mailcap mailx make MAKEDEV man man-pages mc mcpp mcstrans mdadm mesa-dri1-drivers mesa-dri-drivers mesa-dri-filesystem mesa-libGL mesa-libGL-devel mesa-libGLU mesa-libGLU-devel mesa-private-llvm mgetty microcode_ctl mingetty mkbootdisk mlocate module-init-tools mpfr mtools mtr mysql-libs nano nc ncurses ncurses-base ncurses-devel ncurses-libs net-snmp net-snmp-libs net-tools newt newt-python nfs-utils nfs-utils-lib nmap notification-daemon nscd nspr nspr-devel nss nss_db nss-devel nss-softokn nss-softokn-debuginfo nss-softokn-devel nss-softokn-freebl nss-softokn-freebl-devel nss-sysinit nss-tools nss-util nss-util-devel ntp ntpdate ntsysv OpenEXR-libs OpenIPMI OpenIPMI-libs openjade openjpeg-libs openldap openldap-devel openmotif openmotif22 opensp openssh openssh-clients openssh-server ORBit2 ORBit2-devel p11-kit p11-kit-trust pam pam-devel pam_krb5 pam_passwdqc pam_pkcs11 pango pango-devel paps paps-libs parted passwd patch pax pciutils pciutils-devel pciutils-libs pcmciautils pcp pcp-conf pcp-libs pcre pcsc-lite pcsc-lite-libs perf perl perl-AppConfig perl-Authen-SASL perl-Bit-Vector perl-Carp-Clan perl-CGI perl-Class-Singleton perl-Compress-Raw-Zlib perl-Compress-Zlib perl-Convert-ASN1 perl-Crypt-PasswdMD5 perl-Date-Calc perl-Date-Manip perl-DateTime perl-DBD-Pg perl-DBI perl-devel perl-Digest-HMAC perl-Digest-SHA1 perl-Error perl-ExtUtils-MakeMaker perl-ExtUtils-ParseXS perl-File-Which perl-Git perl-GSSAPI perl-HTML-Parser perl-HTML-Tagset perl-IO-Compress-Base perl-IO-Compress-Zlib perl-IO-Socket-SSL perl-JSON perl-LDAP perl-libs perl-libwww-perl perl-List-MoreUtils perl-Module-Pluggable perl-Net-LibIDN perl-Net-SSLeay perl-Net-Telnet perl-Params-Validate perl-PCP-PMDA perl-Pod-Escapes perl-Pod-Simple perl-SGMLSpm perl-Socket6 perl-String-CRC32 perl-TermReadKey perl-Test-Harness perl-Test-Simple perl-Text-Iconv perl-Time-HiRes perl-URI perl-version perl-WWW-Curl perl-XML-Filter-BufferText perl-XML-LibXML perl-XML-NamespaceSupport perl-XML-Parser perl-XML-SAX perl-XML-SAX-Writer perl-XML-Simple perl-YAML-Syck pinentry pinfo pixman pixman-devel pkgconfig plymouth plymouth-core-libs plymouth-scripts pm-utils policycoreutils polkit poppler poppler-data poppler-utils popt popt-devel portreserve postfix postgresql postgresql-devel postgresql-libs postgresql-odbc ppl ppp prelink procmail procps psacct psmisc pth pulseaudio-libs pycairo pycairo-devel pygobject2 pygobject2-codegen pygobject2-devel pygobject2-doc pygpgme pygtk2 pygtk2-codegen pygtk2-devel pygtk2-doc pyOpenSSL pytalloc python python-argparse python-devel python-iniparse python-libs python-pcp python-pycurl python-setuptools python-sssdconfig python-urlgrabber qt qt3 qt-sqlite qt-x11 quota rarian rarian-compat rdate rdma readahead readline readline-devel redhat-logos redhat-lsb redhat-lsb-compat redhat-lsb-core redhat-lsb-graphics redhat-lsb-printing redhat-menus redhat-rpm-config rmt rootfiles rpcbind rpm rpm-devel rpm-libs rpm-python rp-pppoe rrdtool rsh rsync ruby ruby-libs samba samba4-libs samba-common samba-winbind samba-winbind-clients screen SDL SDL-devel sed selinux-policy setserial setup setuptool sgml-common sgpio shadow-utils shared-mime-info slang smartmontools snappy sos sound-theme-freedesktop sqlite sqlite-devel sssd sssd-ad sssd-client sssd-common sssd-common-pac sssd-ipa sssd-krb5 sssd-krb5-common sssd-ldap sssd-proxy startup-notification startup-notification-devel strace stunnel sudo swig symlinks sysfsutils syslinux syslinux-nonlinux sysstat system-gnome-theme system-icon-theme systemtap-devel sysvinit-tools t1lib talk tar tcl tcl-devel tcpdump tcp_wrappers tcp_wrappers-libs tcsh telnet time tk tmpwatch traceroute tree tunctl tzdata udev udftools unix2dos unixODBC unixODBC-devel unzip upstart urw-fonts usbutils usermode ustr util-linux-ng vconfig vim-common vim-enhanced vim-filesystem vim-minimal virt-what wget which wireless-tools words wpa_supplicant xcb-util xdg-utils xerces-c xerces-c-devel xinetd xkeyboard-config xml-common xmlrpc-c xmlrpc-c-client xorg-x11-fonts-100dpi xorg-x11-fonts-75dpi xorg-x11-font-utils xorg-x11-proto-devel xorg-x11-server-common xorg-x11-server-utils xorg-x11-xauth xorg-x11-xkb-utils xterm xz xz-libs xz-lzma-compat ypbind yp-tools yum yum-metadata-parser yum-plugin-auto-update-debug-info yum-plugin-fastestmirror yum-plugin-priorities yum-plugin-security yum-plugin-versionlock yum-utils zip zlib zlib-devel
+
+# Fedora repo
+yum -y install bash-completion pigz tmux
+
+yum -y groupinstall "Development Tools"
+
+cd /tmp
+
+# OpenMPI
+wget https://www.open-mpi.org/software/ompi/v2.1/downloads/openmpi-2.1.1.tar.gz
+tar xvf openmpi-2.1.1.tar.gz && cd openmpi-2.1.1
+./configure --prefix=/usr/local
+make -j 16
+make install
+
+# pip
+curl -s -O https://bootstrap.pypa.io/get-pip.py
+python get-pip.py
+
+pip install setuptools python-graph-core python-graph-dot tabulate numpy scipy pandas wheel --upgrade
+
+# lua
+wget http://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/l/lua-posix-32-2.el7.x86_64.rpm
+wget http://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/l/lua-filesystem-1.6.2-2.el7.x86_64.rpm
+wget http://mirror.centos.org/centos/7/os/x86_64/Packages/lua-devel-5.1.4-15.el7.x86_64.rpm
+wget http://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/l/lua-bitop-1.0.2-3.el7.x86_64.rpm
+
+rpm -ihv lua-devel-5.1.4-15.el7.x86_64.rpm
+rpm -ihv lua-filesystem-1.6.2-2.el7.x86_64.rpm
+rpm -ihv lua-bitop-1.0.2-3.el7.x86_64.rpm
+rpm -ihv lua-posix-32-2.el7.x86_64.rpm
+
+# Lmod
+wget https://github.com/TACC/Lmod/archive/7.7.7.tar.gz
+tar xvf 7.7.7.tar.gz
+cd Lmod-7.7.7
+./configure --prefix=/opt/apps
+make install
+
+# APPS and SCRATCH
+mkdir /apps
+mkdir /scratch
+
+%environment
+source /opt/apps/lmod/7.7.7/init/profile
+clearMT
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
+export -f ml
+export -f module
+export -f clearMT
diff --git a/Debian/8.0-GPU/Debian-8.0-GPU-Bootstrap b/Debian/8.0-GPU/Debian-8.0-GPU-Bootstrap
new file mode 100644
index 0000000000000000000000000000000000000000..bb2a2269e3387988d6aa467ec1504abf23739f61
--- /dev/null
+++ b/Debian/8.0-GPU/Debian-8.0-GPU-Bootstrap
@@ -0,0 +1,95 @@
+Bootstrap: docker
+From: debian:jessie
+
+%setup
+cp /apps/easybuild/sources/n/NVIDIA/NVIDIA-Linux-x86_64-390.30.run /tmp
+
+%post
+apt -y update && apt -y upgrade
+apt -y install python curl wget gcc g++ make vim mc libncurses-dev rsync tclsh lua5.2 liblua5.2 gfortran ssh
+
+curl -s -O https://bootstrap.pypa.io/get-pip.py
+python get-pip.py
+pip install setuptools python-graph-core python-graph-dot tabulate numpy scipy pandas wheel --upgrade
+
+wget https://github.com/luarocks/luarocks/archive/v2.4.2.tar.gz
+tar xvf v2.4.2.tar.gz
+cd luarocks-2.4.2
+./configure
+make build
+make install
+mkdir ~/.luarocks
+echo "fs_use_modules = false" > ~/.luarocks/config.lua
+luarocks install luaposix
+luarocks install luafilesystem
+LUAROCKS_PREFIX=/usr/local
+export LUA_PATH="$LUAROCKS_PREFIX/share/lua/5.1/?.lua;$LUAROCKS_PREFIX/share/lua/5.1/?/init.lua;;"
+export LUA_CPATH="$LUAROCKS_PREFIX/lib/lua/5.1/?.so;;"
+
+echo "# !/bin/bash" > /bin/logger
+echo "exit 0" >> /bin/logger
+chmod +x /bin/logger
+
+# Lmod
+wget https://github.com/TACC/Lmod/archive/7.7.7.tar.gz
+tar xvf 7.7.7.tar.gz
+cd Lmod-7.7.7
+./configure --prefix=/opt/apps
+make install
+
+# OpenMPI
+wget https://www.open-mpi.org/software/ompi/v2.1/downloads/openmpi-2.1.1.tar.gz
+tar xvf openmpi-2.1.1.tar.gz && cd openmpi-2.1.1
+./configure --prefix=/usr/local
+make -j 16
+make install
+
+# GPU
+driver_version=390.30
+driver="/tmp/NVIDIA-Linux-x86_64-$driver_version.run"
+sh $driver -x
+mv NVIDIA-Linux-x86_64-$driver_version /usr/local/
+dir=/usr/local/NVIDIA-Linux-x86_64-$driver_version
+cd $dir
+ln -s libcuda.so.$driver_version libcuda.so
+ln -s libEGL.so.$driver_version libEGL.so
+ln -s libGLESv1_CM.so.$driver_version libGLESv1_CM.so
+ln -s libGLESv2.so.$driver_version libGLESv2.so
+ln -s libGL.so.$driver_version libGL.so
+ln -s libglx.so.$driver_version libglx.so
+ln -s libnvcuvid.so.$driver_version libnvcuvid.so
+ln -s libnvidia-cfg.so.$driver_version libnvidia-cfg.so
+ln -s libnvidia-compiler.so.$driver_version libnvidia-compiler.so
+ln -s libnvidia-eglcore.so.$driver_version libnvidia-eglcore.so
+ln -s libnvidia-encode.so.$driver_version libnvidia-encode.so
+ln -s libnvidia-fbc.so.$driver_version libnvidia-fbc.so
+ln -s libnvidia-glcore.so.$driver_version libnvidia-glcore.so
+ln -s libnvidia-glsi.so.$driver_version libnvidia-glsi.so
+ln -s libnvidia-gtk2.so.$driver_version libnvidia-gtk2.so
+ln -s libnvidia-gtk3.so.$driver_version libnvidia-gtk3.so
+ln -s libnvidia-ifr.so.$driver_version libnvidia-ifr.so
+ln -s libnvidia-ml.so.$driver_version libnvidia-ml.so
+ln -s libnvidia-ml.so.$driver_version libnvidia-ml.so.1
+ln -s libnvidia-opencl.so.$driver_version libnvidia-opencl.so
+ln -s libnvidia-tls.so.$driver_version libnvidia-tls.so
+ln -s libnvidia-wfb.so.$driver_version libnvidia-wfb.so
+ln -s libvdpau_nvidia.so.$driver_version libvdpau_nvidia.so
+ln -s libvdpau.so.$driver_version libvdpau.so
+ln -s libvdpau_trace.so.$driver_version libvdpau_trace.so
+ln -s libcuda.so.$driver_version libcuda.so.1
+
+cd /bin
+rm sh && ln -s /bin/bash sh
+
+# APPS and SCRATCH
+mkdir /apps
+mkdir /scratch
+
+%environment
+source /opt/apps/lmod/7.7.7/init/profile
+clearMT
+export -f ml
+export -f module
+export -f clearMT
+export LD_LIBRARY_PATH=/usr/local/cuda/lib64:/usr/local/cuda/extras/CUPTI/lib64:/usr/local/NVIDIA-Linux-x86_64-390.30:$LD_LIBRARY_PATH
+export PATH=/usr/local/NVIDIA-Linux-x86_64-390.30:/usr/local/cuda/bin:$PATH
diff --git a/Debian/8.0/Debian-8.0-Bootstrap b/Debian/8.0/Debian-8.0-Bootstrap
index a306e739f51f90bb16f716f68d4cfb34eb9ef827..58dfc70db25b8c139005c3e921378330217195cd 100644
--- a/Debian/8.0/Debian-8.0-Bootstrap
+++ b/Debian/8.0/Debian-8.0-Bootstrap
@@ -27,24 +27,30 @@ echo "# !/bin/bash" > /bin/logger
 echo "exit 0" >> /bin/logger
 chmod +x /bin/logger
 
+# Lmod
+wget https://github.com/TACC/Lmod/archive/7.7.7.tar.gz
+tar xvf 7.7.7.tar.gz
+cd Lmod-7.7.7
+./configure --prefix=/opt/apps
+make install
+
 # OpenMPI
 wget https://www.open-mpi.org/software/ompi/v2.1/downloads/openmpi-2.1.1.tar.gz
 tar xvf openmpi-2.1.1.tar.gz && cd openmpi-2.1.1
 ./configure --prefix=/usr/local
-make -j 14
+make -j 16
 make install
 
 cd /bin
 rm sh && ln -s /bin/bash sh
 
-rm /tmp/get-pip.py /tmp/openmpi-2.1.0.tar.gz -rf
-
+# APPS and SCRATCH
 mkdir /apps
 mkdir /scratch
 
 %environment
-. /apps/all/Lmod/7.7.7/lmod/lmod/init/profile
-ml purge --force
+source /opt/apps/lmod/7.7.7/init/profile
+clearMT
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
 export -f ml
 export -f module
diff --git a/Ubuntu/16.04-GPU/Ubuntu-16.04-GPU-Bootstrap b/Ubuntu/16.04-GPU/Ubuntu-16.04-GPU-Bootstrap
new file mode 100644
index 0000000000000000000000000000000000000000..f6b5a69da1034d9b452fcc32319cab0caf4f7640
--- /dev/null
+++ b/Ubuntu/16.04-GPU/Ubuntu-16.04-GPU-Bootstrap
@@ -0,0 +1,95 @@
+Bootstrap: docker
+From: ubuntu:latest
+
+%setup
+cp /apps/easybuild/sources/n/NVIDIA/NVIDIA-Linux-x86_64-390.30.run /tmp
+
+%post
+apt -y update && apt -y upgrade
+apt -y install python curl wget gcc g++ make vim mc libncurses-dev rsync tclsh lua5.2 liblua5.2 gfortran ssh
+
+curl -s -O https://bootstrap.pypa.io/get-pip.py
+python get-pip.py
+pip install setuptools python-graph-core python-graph-dot tabulate numpy scipy pandas wheel --upgrade
+
+wget https://github.com/luarocks/luarocks/archive/v2.4.2.tar.gz
+tar xvf v2.4.2.tar.gz
+cd luarocks-2.4.2
+./configure
+make build
+make install
+mkdir ~/.luarocks
+echo "fs_use_modules = false" > ~/.luarocks/config.lua
+luarocks install luaposix
+luarocks install luafilesystem
+LUAROCKS_PREFIX=/usr/local
+export LUA_PATH="$LUAROCKS_PREFIX/share/lua/5.1/?.lua;$LUAROCKS_PREFIX/share/lua/5.1/?/init.lua;;"
+export LUA_CPATH="$LUAROCKS_PREFIX/lib/lua/5.1/?.so;;"
+
+echo "# !/bin/bash" > /bin/logger
+echo "exit 0" >> /bin/logger
+chmod +x /bin/logger
+
+# Lmod
+wget https://github.com/TACC/Lmod/archive/7.7.7.tar.gz
+tar xvf 7.7.7.tar.gz
+cd Lmod-7.7.7
+./configure --prefix=/opt/apps
+make install
+
+# OpenMPI
+wget https://www.open-mpi.org/software/ompi/v2.1/downloads/openmpi-2.1.1.tar.gz
+tar xvf openmpi-2.1.1.tar.gz && cd openmpi-2.1.1
+./configure --prefix=/usr/local
+make -j 16
+make install
+
+# GPU
+driver_version=390.30
+driver="/tmp/NVIDIA-Linux-x86_64-$driver_version.run"
+sh $driver -x
+mv NVIDIA-Linux-x86_64-$driver_version /usr/local/
+dir=/usr/local/NVIDIA-Linux-x86_64-$driver_version
+cd $dir
+ln -s libcuda.so.$driver_version libcuda.so
+ln -s libEGL.so.$driver_version libEGL.so
+ln -s libGLESv1_CM.so.$driver_version libGLESv1_CM.so
+ln -s libGLESv2.so.$driver_version libGLESv2.so
+ln -s libGL.so.$driver_version libGL.so
+ln -s libglx.so.$driver_version libglx.so
+ln -s libnvcuvid.so.$driver_version libnvcuvid.so
+ln -s libnvidia-cfg.so.$driver_version libnvidia-cfg.so
+ln -s libnvidia-compiler.so.$driver_version libnvidia-compiler.so
+ln -s libnvidia-eglcore.so.$driver_version libnvidia-eglcore.so
+ln -s libnvidia-encode.so.$driver_version libnvidia-encode.so
+ln -s libnvidia-fbc.so.$driver_version libnvidia-fbc.so
+ln -s libnvidia-glcore.so.$driver_version libnvidia-glcore.so
+ln -s libnvidia-glsi.so.$driver_version libnvidia-glsi.so
+ln -s libnvidia-gtk2.so.$driver_version libnvidia-gtk2.so
+ln -s libnvidia-gtk3.so.$driver_version libnvidia-gtk3.so
+ln -s libnvidia-ifr.so.$driver_version libnvidia-ifr.so
+ln -s libnvidia-ml.so.$driver_version libnvidia-ml.so
+ln -s libnvidia-ml.so.$driver_version libnvidia-ml.so.1
+ln -s libnvidia-opencl.so.$driver_version libnvidia-opencl.so
+ln -s libnvidia-tls.so.$driver_version libnvidia-tls.so
+ln -s libnvidia-wfb.so.$driver_version libnvidia-wfb.so
+ln -s libvdpau_nvidia.so.$driver_version libvdpau_nvidia.so
+ln -s libvdpau.so.$driver_version libvdpau.so
+ln -s libvdpau_trace.so.$driver_version libvdpau_trace.so
+ln -s libcuda.so.$driver_version libcuda.so.1
+
+# APPS and SCRATCH
+mkdir /apps
+mkdir /scratch
+
+cd /bin
+rm sh && ln -s /bin/bash sh
+
+%environment
+source /opt/apps/lmod/7.7.7/init/profile
+clearMT
+export -f ml
+export -f module
+export -f clearMT
+export LD_LIBRARY_PATH=/usr/local/cuda/lib64:/usr/local/cuda/extras/CUPTI/lib64:/usr/local/NVIDIA-Linux-x86_64-390.30:$LD_LIBRARY_PATH
+export PATH=/usr/local/NVIDIA-Linux-x86_64-390.30:/usr/local/cuda/bin:$PATH
diff --git a/Ubuntu/16.04/Ubuntu-16.04-Bootstrap b/Ubuntu/16.04/Ubuntu-16.04-Bootstrap
index f735d885d8b6ff2886060aa0aa1f4d06ebb7de57..f35db223b07c72a56fc9edb65a325a3b0d677298 100644
--- a/Ubuntu/16.04/Ubuntu-16.04-Bootstrap
+++ b/Ubuntu/16.04/Ubuntu-16.04-Bootstrap
@@ -27,21 +27,30 @@ echo "# !/bin/bash" > /bin/logger
 echo "exit 0" >> /bin/logger
 chmod +x /bin/logger
 
+# Lmod
+wget https://github.com/TACC/Lmod/archive/7.7.7.tar.gz
+tar xvf 7.7.7.tar.gz
+cd Lmod-7.7.7
+./configure --prefix=/opt/apps
+make install
+
 # OpenMPI
 wget https://www.open-mpi.org/software/ompi/v2.1/downloads/openmpi-2.1.1.tar.gz
 tar xvf openmpi-2.1.1.tar.gz && cd openmpi-2.1.1
 ./configure --prefix=/usr/local
-make -j 14
+make -j 16
 make install
 
+# APPS and SCRATCH
+mkdir /apps
+mkdir /scratch
+
 cd /bin
 rm sh && ln -s /bin/bash sh
 
-rm /tmp/get-pip.py /tmp/openmpi-2.1.0.tar.gz -rf
-
 %environment
-. /apps/all/Lmod/7.7.7/lmod/lmod/init/profile
-ml purge --force
+source /opt/apps/lmod/7.7.7/init/profile
+clearMT
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
 export -f ml
 export -f module
diff --git a/install/CENTOS74 b/install/CENTOS74
index b3e9802df253dc0314f57dc9d013f093d68f22d0..8638f544adf20914ac0928546ee21601bdb33396 100644
--- a/install/CENTOS74
+++ b/install/CENTOS74
@@ -10,19 +10,15 @@ yum -y install python gcc make wget vim mc procps tcl gcc-c++ gcc-gfortran pkg-c
 # Fedora repo
 yum -y install bash-completion pigz tmux
 
-# OpenHPC
-yum -y install https://github.com/openhpc/ohpc/releases/download/v1.3.GA/ohpc-release-1.3-1.el7.x86_64.rpm
-yum -y install openmpi openblas lapack htop
-
 yum -y groupinstall "Development Tools"
 
 cd /tmp
 
 # OpenMPI
-wget https://www.open-mpi.org/software/ompi/v2.1/downloads/openmpi-2.1.0.tar.gz
-tar xvf openmpi-2.1.0.tar.gz && cd openmpi-2.1.0
+wget https://www.open-mpi.org/software/ompi/v2.1/downloads/openmpi-2.1.1.tar.gz
+tar xvf openmpi-2.1.1.tar.gz && cd openmpi-2.1.1
 ./configure --prefix=/usr/local
-make -j 14
+make -j 16
 make install
 
 # pip
@@ -42,12 +38,21 @@ rpm -ihv lua-filesystem-1.6.2-2.el7.x86_64.rpm
 rpm -ihv lua-bitop-1.0.2-3.el7.x86_64.rpm
 rpm -ihv lua-posix-32-2.el7.x86_64.rpm
 
+# Lmod
+wget https://github.com/TACC/Lmod/archive/7.7.7.tar.gz
+tar xvf 7.7.7.tar.gz
+cd Lmod-7.7.7
+./configure --prefix=/opt/apps
+make install
+
+# APPS and SCRATCH
 mkdir /apps
 mkdir /scratch
 
 %environment
-. /apps/all/Lmod/7.2.2/lmod/lmod/init/profile 
-ml purge --force
+source /opt/apps/lmod/7.7.7/init/profile
+clearMT
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
 export -f ml
 export -f module
 export -f clearMT
diff --git a/install/CENTOS74GPU b/install/CENTOS74GPU
new file mode 100644
index 0000000000000000000000000000000000000000..090db5ffd684b939d5eeeca10ba5b981b52ae83f
--- /dev/null
+++ b/install/CENTOS74GPU
@@ -0,0 +1,96 @@
+Bootstrap: docker
+From: centos:latest
+
+%setup
+cp /apps/easybuild/sources/n/NVIDIA/NVIDIA-Linux-x86_64-390.30.run /tmp
+
+%post
+yum -y update && yum -y upgrade
+
+# CentOS repo
+yum -y install python gcc make wget vim mc procps tcl gcc-c++ gcc-gfortran pkg-config acl acpid alsa-lib alsa-lib-devel amtu apr aspell at atk atk-devel attr audit audit-libs audit-libs-python authconfig autoconf autofs automake avahi-glib avahi-libs basesystem bash bc bind-libs bind-utils binutils binutils-devel bison bison-devel bluez-libs bridge-utils busybox bzip2 bzip2-devel bzip2-libs ca-certificates cairo cairo-devel c-ares ccid cdparanoia-libs centos-indexhtml centos-release checkpolicy chkconfig cloog-ppl compat-libcap1 compat-libstdc++-33 compat-readline5 ConsoleKit ConsoleKit-libs coolkey coreutils coreutils-libs cpio cpp cppunit cpupowerutils cpuspeed cracklib cracklib-dicts crash crda cronie cronie-anacron crontabs cryptsetup-luks cryptsetup-luks-libs cups cups-libs curl cvs cyrus-sasl cyrus-sasl-devel cyrus-sasl-gssapi cyrus-sasl-lib cyrus-sasl-plain dash db4 db4-cxx db4-devel db4-utils dbus dbus-devel dbus-glib dbus-glib-devel dbus-libs dbus-python dejavu-fonts-common dejavu-lgc-sans-mono-fonts dejavu-sans-mono-fonts desktop-file-utils device-mapper device-mapper-event device-mapper-event-libs device-mapper-libs device-mapper-multipath device-mapper-multipath-libs device-mapper-persistent-data diffutils dmidecode dmraid dmraid-events dmz-cursor-themes docbook-dtds docbook-style-dsssl docbook-style-xsl docbook-utils dos2unix dosfstools dracut dracut-kernel dracut-network dump e2fsprogs e2fsprogs-devel e2fsprogs-libs ed eggdbus eject elfutils-libelf elfutils-libelf-devel elfutils-libs emacs emacs-common environment-modules ethtool expat expat-devel expect file file-devel file-libs filesystem findutils finger fipscheck fipscheck-lib flac fontconfig fontconfig-devel fontpackages-filesystem foomatic foomatic-db foomatic-db-filesystem foomatic-db-ppds freeglut freeglut-devel freetype freetype-devel ftp fuse fuse-libs gamin gamin-python gawk gcc gcc-c++ gcc-gfortran GConf2 GConf2-devel gd gdb gdbm gdbm-devel gdk-pixbuf2 gdk-pixbuf2-devel genisoimage gettext gettext-devel gettext-libs ghostscript ghostscript-fonts giflib git glib2 glib2-devel glibc glibc-common glibc-debuginfo glibc-debuginfo-common glibc-devel glibc-headers glx-utils gmp gmp-devel gnome-icon-theme gnome-keyring gnome-keyring-devel gnome-themes gnome-vfs2 gnome-vfs2-devel gnupg2 gnuplot gnuplot-common gnutls gnutls-devel gperf gpgme gpm gpm-libs grep groff grub grubby gstreamer gstreamer-plugins-base gstreamer-tools gtk2 gtk2-devel gtk2-engines gtk-doc gzip hal hal-devel hal-info hal-libs hdparm hesiod hicolor-icon-theme hunspell hwdata hwloc hwloc-devel ilmbase ImageMagick indent info initscripts iproute iptables iptables-ipv6 iptstate iputils irqbalance iscsi-initiator-utils iso-codes iw jasper-libs jwhois kbd kbd-misc kernel kernel kernel-devel kernel-firmware kernel-headers keyutils keyutils-libs keyutils-libs-devel kpartx krb5-devel krb5-libs krb5-workstation ksh lcms-libs less lftp libacl libacl-devel libaio libart_lgpl libart_lgpl-devel libasyncns libattr libattr-devel libbasicobjects libblkid libbonobo libbonobo-devel libbonoboui libbonoboui-devel libcanberra libcanberra-gtk2 libcap libcap-devel libcap-ng libcgroup libcollection libcom_err libcom_err-devel libcroco libcroco-devel libcxgb3 libcxgb4 libdaemon libdhash libdrm libdrm-devel libedit libedit-devel libevent libexif libffi libfontenc libgcc libgcj libgcrypt libgcrypt-devel libgfortran libglade2 libglade2-devel libgnome libgnomecanvas libgnomecanvas-devel libgnome-devel libgomp libgpg-error libgpg-error-devel libgsf libgsf-devel libgssglue libgudev1 libhugetlbfs libibcm libibcm-devel libibverbs libibverbs-devel libibverbs-devel-static libibverbs-utils libICE libICE-devel libicu libIDL libIDL-devel libidn libidn-devel libini_config libipa_hbac libjpeg-turbo libjpeg-turbo-devel libldb libmcpp libmlx4 libmlx5 libmng libmng-devel libmthca libmthca-static libnetfilter_conntrack libnfnetlink libnih libnl libnl-devel libnotify libogg liboil libotf libpath_utils libpcap libpciaccess libpciaccess-devel libpng libpng-devel libproxy libproxy-bin libproxy-python libref_array librsvg2 librsvg2-devel libselinux libselinux-devel libselinux-python libselinux-utils libsemanage libsepol libsepol-devel libSM libSM-devel libsndfile libss libssh2 libsss_idmap libstdc++ libstdc++-devel libsysfs libsysfs-devel libtalloc libtasn1 libtasn1-devel libtdb libtevent libthai libtheora libtiff libtiff-devel libtirpc libtool-ltdl libudev libudev-devel libunistring libusb libusb1 libusb-devel libuser libutempter libuuid libvisual libvorbis libwmf libwmf-lite libwnck libX11 libX11-common libX11-devel libXau libXau-devel libXaw libXaw-devel libxcb libxcb-devel libXcomposite libXcomposite-devel libXcursor libXcursor-devel libXdamage libXdamage-devel libXdmcp libXdmcp-devel libXext libXext-devel libXfixes libXfixes-devel libXfont libXft libXft-devel libXi libXi-devel libXinerama libXinerama-devel libxkbfile libxml2 libxml2-devel libxml2-python libXmu libXmu-devel libXp libXpm libXpm-devel libXrandr libXrandr-devel libXrender libXrender-devel libXres libXScrnSaver libXScrnSaver-devel libxslt libxslt-devel libXt libXt-devel libXtst libXtst-devel libXv libXv-devel libXxf86misc libXxf86misc-devel libXxf86vm libXxf86vm-devel lm_sensors-libs lockdev logrotate lsof lvm2 lvm2-libs lynx lzo m17n-db m17n-db-datafiles m17n-lib m2crypto m4 mailcap mailx make MAKEDEV man man-pages mc mcpp mcstrans mdadm mesa-dri1-drivers mesa-dri-drivers mesa-dri-filesystem mesa-libGL mesa-libGL-devel mesa-libGLU mesa-libGLU-devel mesa-private-llvm mgetty microcode_ctl mingetty mkbootdisk mlocate module-init-tools mpfr mtools mtr mysql-libs nano nc ncurses ncurses-base ncurses-devel ncurses-libs net-snmp net-snmp-libs net-tools newt newt-python nfs-utils nfs-utils-lib nmap notification-daemon nscd nspr nspr-devel nss nss_db nss-devel nss-softokn nss-softokn-debuginfo nss-softokn-devel nss-softokn-freebl nss-softokn-freebl-devel nss-sysinit nss-tools nss-util nss-util-devel ntp ntpdate ntsysv OpenEXR-libs OpenIPMI OpenIPMI-libs openjade openjpeg-libs openldap openldap-devel openmotif openmotif22 opensp openssh openssh-clients openssh-server ORBit2 ORBit2-devel p11-kit p11-kit-trust pam pam-devel pam_krb5 pam_passwdqc pam_pkcs11 pango pango-devel paps paps-libs parted passwd patch pax pciutils pciutils-devel pciutils-libs pcmciautils pcp pcp-conf pcp-libs pcre pcsc-lite pcsc-lite-libs perf perl perl-AppConfig perl-Authen-SASL perl-Bit-Vector perl-Carp-Clan perl-CGI perl-Class-Singleton perl-Compress-Raw-Zlib perl-Compress-Zlib perl-Convert-ASN1 perl-Crypt-PasswdMD5 perl-Date-Calc perl-Date-Manip perl-DateTime perl-DBD-Pg perl-DBI perl-devel perl-Digest-HMAC perl-Digest-SHA1 perl-Error perl-ExtUtils-MakeMaker perl-ExtUtils-ParseXS perl-File-Which perl-Git perl-GSSAPI perl-HTML-Parser perl-HTML-Tagset perl-IO-Compress-Base perl-IO-Compress-Zlib perl-IO-Socket-SSL perl-JSON perl-LDAP perl-libs perl-libwww-perl perl-List-MoreUtils perl-Module-Pluggable perl-Net-LibIDN perl-Net-SSLeay perl-Net-Telnet perl-Params-Validate perl-PCP-PMDA perl-Pod-Escapes perl-Pod-Simple perl-SGMLSpm perl-Socket6 perl-String-CRC32 perl-TermReadKey perl-Test-Harness perl-Test-Simple perl-Text-Iconv perl-Time-HiRes perl-URI perl-version perl-WWW-Curl perl-XML-Filter-BufferText perl-XML-LibXML perl-XML-NamespaceSupport perl-XML-Parser perl-XML-SAX perl-XML-SAX-Writer perl-XML-Simple perl-YAML-Syck pinentry pinfo pixman pixman-devel pkgconfig plymouth plymouth-core-libs plymouth-scripts pm-utils policycoreutils polkit poppler poppler-data poppler-utils popt popt-devel portreserve postfix postgresql postgresql-devel postgresql-libs postgresql-odbc ppl ppp prelink procmail procps psacct psmisc pth pulseaudio-libs pycairo pycairo-devel pygobject2 pygobject2-codegen pygobject2-devel pygobject2-doc pygpgme pygtk2 pygtk2-codegen pygtk2-devel pygtk2-doc pyOpenSSL pytalloc python python-argparse python-devel python-iniparse python-libs python-pcp python-pycurl python-setuptools python-sssdconfig python-urlgrabber qt qt3 qt-sqlite qt-x11 quota rarian rarian-compat rdate rdma readahead readline readline-devel redhat-logos redhat-lsb redhat-lsb-compat redhat-lsb-core redhat-lsb-graphics redhat-lsb-printing redhat-menus redhat-rpm-config rmt rootfiles rpcbind rpm rpm-devel rpm-libs rpm-python rp-pppoe rrdtool rsh rsync ruby ruby-libs samba samba4-libs samba-common samba-winbind samba-winbind-clients screen SDL SDL-devel sed selinux-policy setserial setup setuptool sgml-common sgpio shadow-utils shared-mime-info slang smartmontools snappy sos sound-theme-freedesktop sqlite sqlite-devel sssd sssd-ad sssd-client sssd-common sssd-common-pac sssd-ipa sssd-krb5 sssd-krb5-common sssd-ldap sssd-proxy startup-notification startup-notification-devel strace stunnel sudo swig symlinks sysfsutils syslinux syslinux-nonlinux sysstat system-gnome-theme system-icon-theme systemtap-devel sysvinit-tools t1lib talk tar tcl tcl-devel tcpdump tcp_wrappers tcp_wrappers-libs tcsh telnet time tk tmpwatch traceroute tree tunctl tzdata udev udftools unix2dos unixODBC unixODBC-devel unzip upstart urw-fonts usbutils usermode ustr util-linux-ng vconfig vim-common vim-enhanced vim-filesystem vim-minimal virt-what wget which wireless-tools words wpa_supplicant xcb-util xdg-utils xerces-c xerces-c-devel xinetd xkeyboard-config xml-common xmlrpc-c xmlrpc-c-client xorg-x11-fonts-100dpi xorg-x11-fonts-75dpi xorg-x11-font-utils xorg-x11-proto-devel xorg-x11-server-common xorg-x11-server-utils xorg-x11-xauth xorg-x11-xkb-utils xterm xz xz-libs xz-lzma-compat ypbind yp-tools yum yum-metadata-parser yum-plugin-auto-update-debug-info yum-plugin-fastestmirror yum-plugin-priorities yum-plugin-security yum-plugin-versionlock yum-utils zip zlib zlib-devel
+
+# Fedora repo
+yum -y install bash-completion pigz tmux
+
+yum -y groupinstall "Development Tools"
+
+cd /tmp
+
+# OpenMPI
+wget https://www.open-mpi.org/software/ompi/v2.1/downloads/openmpi-2.1.1.tar.gz
+tar xvf openmpi-2.1.1.tar.gz && cd openmpi-2.1.1
+./configure --prefix=/usr/local
+make -j 16
+make install
+
+# pip
+curl -s -O https://bootstrap.pypa.io/get-pip.py
+python get-pip.py
+
+pip install setuptools python-graph-core python-graph-dot tabulate numpy scipy pandas wheel --upgrade
+
+# lua
+wget http://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/l/lua-posix-32-2.el7.x86_64.rpm
+wget http://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/l/lua-filesystem-1.6.2-2.el7.x86_64.rpm
+wget http://mirror.centos.org/centos/7/os/x86_64/Packages/lua-devel-5.1.4-15.el7.x86_64.rpm
+wget http://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/l/lua-bitop-1.0.2-3.el7.x86_64.rpm
+
+rpm -ihv lua-devel-5.1.4-15.el7.x86_64.rpm
+rpm -ihv lua-filesystem-1.6.2-2.el7.x86_64.rpm
+rpm -ihv lua-bitop-1.0.2-3.el7.x86_64.rpm
+rpm -ihv lua-posix-32-2.el7.x86_64.rpm
+
+# Lmod
+wget https://github.com/TACC/Lmod/archive/7.7.7.tar.gz
+tar xvf 7.7.7.tar.gz
+cd Lmod-7.7.7
+./configure --prefix=/opt/apps
+make install
+
+# GPU
+driver_version=390.30
+driver="/tmp/NVIDIA-Linux-x86_64-$driver_version.run"
+sh $driver -x
+mv NVIDIA-Linux-x86_64-$driver_version /usr/local/
+dir=/usr/local/NVIDIA-Linux-x86_64-$driver_version
+cd $dir
+ln -s libcuda.so.$driver_version libcuda.so
+ln -s libEGL.so.$driver_version libEGL.so
+ln -s libGLESv1_CM.so.$driver_version libGLESv1_CM.so
+ln -s libGLESv2.so.$driver_version libGLESv2.so
+ln -s libGL.so.$driver_version libGL.so
+ln -s libglx.so.$driver_version libglx.so
+ln -s libnvcuvid.so.$driver_version libnvcuvid.so
+ln -s libnvidia-cfg.so.$driver_version libnvidia-cfg.so
+ln -s libnvidia-compiler.so.$driver_version libnvidia-compiler.so
+ln -s libnvidia-eglcore.so.$driver_version libnvidia-eglcore.so
+ln -s libnvidia-encode.so.$driver_version libnvidia-encode.so
+ln -s libnvidia-fbc.so.$driver_version libnvidia-fbc.so
+ln -s libnvidia-glcore.so.$driver_version libnvidia-glcore.so
+ln -s libnvidia-glsi.so.$driver_version libnvidia-glsi.so
+ln -s libnvidia-gtk2.so.$driver_version libnvidia-gtk2.so
+ln -s libnvidia-gtk3.so.$driver_version libnvidia-gtk3.so
+ln -s libnvidia-ifr.so.$driver_version libnvidia-ifr.so
+ln -s libnvidia-ml.so.$driver_version libnvidia-ml.so
+ln -s libnvidia-ml.so.$driver_version libnvidia-ml.so.1
+ln -s libnvidia-opencl.so.$driver_version libnvidia-opencl.so
+ln -s libnvidia-tls.so.$driver_version libnvidia-tls.so
+ln -s libnvidia-wfb.so.$driver_version libnvidia-wfb.so
+ln -s libvdpau_nvidia.so.$driver_version libvdpau_nvidia.so
+ln -s libvdpau.so.$driver_version libvdpau.so
+ln -s libvdpau_trace.so.$driver_version libvdpau_trace.so
+ln -s libcuda.so.$driver_version libcuda.so.1
+
+# APPS and SCRATCH
+mkdir /apps
+mkdir /scratch
+
+%environment
+source /opt/apps/lmod/7.7.7/init/profile
+clearMT
+export -f ml
+export -f module
+export -f clearMT
+export LD_LIBRARY_PATH=/usr/local/cuda/lib64:/usr/local/cuda/extras/CUPTI/lib64:/usr/local/NVIDIA-Linux-x86_64-390.30:$LD_LIBRARY_PATH
+export PATH=/usr/local/NVIDIA-Linux-x86_64-390.30:/usr/local/cuda/bin:$PATH
diff --git a/install/DEBIAN b/install/DEBIAN
index a306e739f51f90bb16f716f68d4cfb34eb9ef827..58dfc70db25b8c139005c3e921378330217195cd 100644
--- a/install/DEBIAN
+++ b/install/DEBIAN
@@ -27,24 +27,30 @@ echo "# !/bin/bash" > /bin/logger
 echo "exit 0" >> /bin/logger
 chmod +x /bin/logger
 
+# Lmod
+wget https://github.com/TACC/Lmod/archive/7.7.7.tar.gz
+tar xvf 7.7.7.tar.gz
+cd Lmod-7.7.7
+./configure --prefix=/opt/apps
+make install
+
 # OpenMPI
 wget https://www.open-mpi.org/software/ompi/v2.1/downloads/openmpi-2.1.1.tar.gz
 tar xvf openmpi-2.1.1.tar.gz && cd openmpi-2.1.1
 ./configure --prefix=/usr/local
-make -j 14
+make -j 16
 make install
 
 cd /bin
 rm sh && ln -s /bin/bash sh
 
-rm /tmp/get-pip.py /tmp/openmpi-2.1.0.tar.gz -rf
-
+# APPS and SCRATCH
 mkdir /apps
 mkdir /scratch
 
 %environment
-. /apps/all/Lmod/7.7.7/lmod/lmod/init/profile
-ml purge --force
+source /opt/apps/lmod/7.7.7/init/profile
+clearMT
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
 export -f ml
 export -f module
diff --git a/install/DEBIANGPU b/install/DEBIANGPU
new file mode 100644
index 0000000000000000000000000000000000000000..bb2a2269e3387988d6aa467ec1504abf23739f61
--- /dev/null
+++ b/install/DEBIANGPU
@@ -0,0 +1,95 @@
+Bootstrap: docker
+From: debian:jessie
+
+%setup
+cp /apps/easybuild/sources/n/NVIDIA/NVIDIA-Linux-x86_64-390.30.run /tmp
+
+%post
+apt -y update && apt -y upgrade
+apt -y install python curl wget gcc g++ make vim mc libncurses-dev rsync tclsh lua5.2 liblua5.2 gfortran ssh
+
+curl -s -O https://bootstrap.pypa.io/get-pip.py
+python get-pip.py
+pip install setuptools python-graph-core python-graph-dot tabulate numpy scipy pandas wheel --upgrade
+
+wget https://github.com/luarocks/luarocks/archive/v2.4.2.tar.gz
+tar xvf v2.4.2.tar.gz
+cd luarocks-2.4.2
+./configure
+make build
+make install
+mkdir ~/.luarocks
+echo "fs_use_modules = false" > ~/.luarocks/config.lua
+luarocks install luaposix
+luarocks install luafilesystem
+LUAROCKS_PREFIX=/usr/local
+export LUA_PATH="$LUAROCKS_PREFIX/share/lua/5.1/?.lua;$LUAROCKS_PREFIX/share/lua/5.1/?/init.lua;;"
+export LUA_CPATH="$LUAROCKS_PREFIX/lib/lua/5.1/?.so;;"
+
+echo "# !/bin/bash" > /bin/logger
+echo "exit 0" >> /bin/logger
+chmod +x /bin/logger
+
+# Lmod
+wget https://github.com/TACC/Lmod/archive/7.7.7.tar.gz
+tar xvf 7.7.7.tar.gz
+cd Lmod-7.7.7
+./configure --prefix=/opt/apps
+make install
+
+# OpenMPI
+wget https://www.open-mpi.org/software/ompi/v2.1/downloads/openmpi-2.1.1.tar.gz
+tar xvf openmpi-2.1.1.tar.gz && cd openmpi-2.1.1
+./configure --prefix=/usr/local
+make -j 16
+make install
+
+# GPU
+driver_version=390.30
+driver="/tmp/NVIDIA-Linux-x86_64-$driver_version.run"
+sh $driver -x
+mv NVIDIA-Linux-x86_64-$driver_version /usr/local/
+dir=/usr/local/NVIDIA-Linux-x86_64-$driver_version
+cd $dir
+ln -s libcuda.so.$driver_version libcuda.so
+ln -s libEGL.so.$driver_version libEGL.so
+ln -s libGLESv1_CM.so.$driver_version libGLESv1_CM.so
+ln -s libGLESv2.so.$driver_version libGLESv2.so
+ln -s libGL.so.$driver_version libGL.so
+ln -s libglx.so.$driver_version libglx.so
+ln -s libnvcuvid.so.$driver_version libnvcuvid.so
+ln -s libnvidia-cfg.so.$driver_version libnvidia-cfg.so
+ln -s libnvidia-compiler.so.$driver_version libnvidia-compiler.so
+ln -s libnvidia-eglcore.so.$driver_version libnvidia-eglcore.so
+ln -s libnvidia-encode.so.$driver_version libnvidia-encode.so
+ln -s libnvidia-fbc.so.$driver_version libnvidia-fbc.so
+ln -s libnvidia-glcore.so.$driver_version libnvidia-glcore.so
+ln -s libnvidia-glsi.so.$driver_version libnvidia-glsi.so
+ln -s libnvidia-gtk2.so.$driver_version libnvidia-gtk2.so
+ln -s libnvidia-gtk3.so.$driver_version libnvidia-gtk3.so
+ln -s libnvidia-ifr.so.$driver_version libnvidia-ifr.so
+ln -s libnvidia-ml.so.$driver_version libnvidia-ml.so
+ln -s libnvidia-ml.so.$driver_version libnvidia-ml.so.1
+ln -s libnvidia-opencl.so.$driver_version libnvidia-opencl.so
+ln -s libnvidia-tls.so.$driver_version libnvidia-tls.so
+ln -s libnvidia-wfb.so.$driver_version libnvidia-wfb.so
+ln -s libvdpau_nvidia.so.$driver_version libvdpau_nvidia.so
+ln -s libvdpau.so.$driver_version libvdpau.so
+ln -s libvdpau_trace.so.$driver_version libvdpau_trace.so
+ln -s libcuda.so.$driver_version libcuda.so.1
+
+cd /bin
+rm sh && ln -s /bin/bash sh
+
+# APPS and SCRATCH
+mkdir /apps
+mkdir /scratch
+
+%environment
+source /opt/apps/lmod/7.7.7/init/profile
+clearMT
+export -f ml
+export -f module
+export -f clearMT
+export LD_LIBRARY_PATH=/usr/local/cuda/lib64:/usr/local/cuda/extras/CUPTI/lib64:/usr/local/NVIDIA-Linux-x86_64-390.30:$LD_LIBRARY_PATH
+export PATH=/usr/local/NVIDIA-Linux-x86_64-390.30:/usr/local/cuda/bin:$PATH
diff --git a/install/UBUNTU b/install/UBUNTU
index f735d885d8b6ff2886060aa0aa1f4d06ebb7de57..f35db223b07c72a56fc9edb65a325a3b0d677298 100644
--- a/install/UBUNTU
+++ b/install/UBUNTU
@@ -27,21 +27,30 @@ echo "# !/bin/bash" > /bin/logger
 echo "exit 0" >> /bin/logger
 chmod +x /bin/logger
 
+# Lmod
+wget https://github.com/TACC/Lmod/archive/7.7.7.tar.gz
+tar xvf 7.7.7.tar.gz
+cd Lmod-7.7.7
+./configure --prefix=/opt/apps
+make install
+
 # OpenMPI
 wget https://www.open-mpi.org/software/ompi/v2.1/downloads/openmpi-2.1.1.tar.gz
 tar xvf openmpi-2.1.1.tar.gz && cd openmpi-2.1.1
 ./configure --prefix=/usr/local
-make -j 14
+make -j 16
 make install
 
+# APPS and SCRATCH
+mkdir /apps
+mkdir /scratch
+
 cd /bin
 rm sh && ln -s /bin/bash sh
 
-rm /tmp/get-pip.py /tmp/openmpi-2.1.0.tar.gz -rf
-
 %environment
-. /apps/all/Lmod/7.7.7/lmod/lmod/init/profile
-ml purge --force
+source /opt/apps/lmod/7.7.7/init/profile
+clearMT
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
 export -f ml
 export -f module
diff --git a/install/UBUNTUGPU b/install/UBUNTUGPU
new file mode 100644
index 0000000000000000000000000000000000000000..f6b5a69da1034d9b452fcc32319cab0caf4f7640
--- /dev/null
+++ b/install/UBUNTUGPU
@@ -0,0 +1,95 @@
+Bootstrap: docker
+From: ubuntu:latest
+
+%setup
+cp /apps/easybuild/sources/n/NVIDIA/NVIDIA-Linux-x86_64-390.30.run /tmp
+
+%post
+apt -y update && apt -y upgrade
+apt -y install python curl wget gcc g++ make vim mc libncurses-dev rsync tclsh lua5.2 liblua5.2 gfortran ssh
+
+curl -s -O https://bootstrap.pypa.io/get-pip.py
+python get-pip.py
+pip install setuptools python-graph-core python-graph-dot tabulate numpy scipy pandas wheel --upgrade
+
+wget https://github.com/luarocks/luarocks/archive/v2.4.2.tar.gz
+tar xvf v2.4.2.tar.gz
+cd luarocks-2.4.2
+./configure
+make build
+make install
+mkdir ~/.luarocks
+echo "fs_use_modules = false" > ~/.luarocks/config.lua
+luarocks install luaposix
+luarocks install luafilesystem
+LUAROCKS_PREFIX=/usr/local
+export LUA_PATH="$LUAROCKS_PREFIX/share/lua/5.1/?.lua;$LUAROCKS_PREFIX/share/lua/5.1/?/init.lua;;"
+export LUA_CPATH="$LUAROCKS_PREFIX/lib/lua/5.1/?.so;;"
+
+echo "# !/bin/bash" > /bin/logger
+echo "exit 0" >> /bin/logger
+chmod +x /bin/logger
+
+# Lmod
+wget https://github.com/TACC/Lmod/archive/7.7.7.tar.gz
+tar xvf 7.7.7.tar.gz
+cd Lmod-7.7.7
+./configure --prefix=/opt/apps
+make install
+
+# OpenMPI
+wget https://www.open-mpi.org/software/ompi/v2.1/downloads/openmpi-2.1.1.tar.gz
+tar xvf openmpi-2.1.1.tar.gz && cd openmpi-2.1.1
+./configure --prefix=/usr/local
+make -j 16
+make install
+
+# GPU
+driver_version=390.30
+driver="/tmp/NVIDIA-Linux-x86_64-$driver_version.run"
+sh $driver -x
+mv NVIDIA-Linux-x86_64-$driver_version /usr/local/
+dir=/usr/local/NVIDIA-Linux-x86_64-$driver_version
+cd $dir
+ln -s libcuda.so.$driver_version libcuda.so
+ln -s libEGL.so.$driver_version libEGL.so
+ln -s libGLESv1_CM.so.$driver_version libGLESv1_CM.so
+ln -s libGLESv2.so.$driver_version libGLESv2.so
+ln -s libGL.so.$driver_version libGL.so
+ln -s libglx.so.$driver_version libglx.so
+ln -s libnvcuvid.so.$driver_version libnvcuvid.so
+ln -s libnvidia-cfg.so.$driver_version libnvidia-cfg.so
+ln -s libnvidia-compiler.so.$driver_version libnvidia-compiler.so
+ln -s libnvidia-eglcore.so.$driver_version libnvidia-eglcore.so
+ln -s libnvidia-encode.so.$driver_version libnvidia-encode.so
+ln -s libnvidia-fbc.so.$driver_version libnvidia-fbc.so
+ln -s libnvidia-glcore.so.$driver_version libnvidia-glcore.so
+ln -s libnvidia-glsi.so.$driver_version libnvidia-glsi.so
+ln -s libnvidia-gtk2.so.$driver_version libnvidia-gtk2.so
+ln -s libnvidia-gtk3.so.$driver_version libnvidia-gtk3.so
+ln -s libnvidia-ifr.so.$driver_version libnvidia-ifr.so
+ln -s libnvidia-ml.so.$driver_version libnvidia-ml.so
+ln -s libnvidia-ml.so.$driver_version libnvidia-ml.so.1
+ln -s libnvidia-opencl.so.$driver_version libnvidia-opencl.so
+ln -s libnvidia-tls.so.$driver_version libnvidia-tls.so
+ln -s libnvidia-wfb.so.$driver_version libnvidia-wfb.so
+ln -s libvdpau_nvidia.so.$driver_version libvdpau_nvidia.so
+ln -s libvdpau.so.$driver_version libvdpau.so
+ln -s libvdpau_trace.so.$driver_version libvdpau_trace.so
+ln -s libcuda.so.$driver_version libcuda.so.1
+
+# APPS and SCRATCH
+mkdir /apps
+mkdir /scratch
+
+cd /bin
+rm sh && ln -s /bin/bash sh
+
+%environment
+source /opt/apps/lmod/7.7.7/init/profile
+clearMT
+export -f ml
+export -f module
+export -f clearMT
+export LD_LIBRARY_PATH=/usr/local/cuda/lib64:/usr/local/cuda/extras/CUPTI/lib64:/usr/local/NVIDIA-Linux-x86_64-390.30:$LD_LIBRARY_PATH
+export PATH=/usr/local/NVIDIA-Linux-x86_64-390.30:/usr/local/cuda/bin:$PATH
diff --git a/install/install.sh b/install/install.sh
index 5b6e507893f2bb1a489a43ff587605f974972859..201b88665db169dae7e0d801acef8fe86ab2b681 100755
--- a/install/install.sh
+++ b/install/install.sh
@@ -8,8 +8,8 @@
 if [[ $# -eq 0 ]]; then
 	 printf "\e[31m
  ./install.sh\e[0m   ... create and build singularity image
-	-\e[33mi\e[0m OS (\e[33mCentOS\e[0m, \e[33mFedora\e[0m, \e[33mDebian\e[0m, \e[33mUbuntu\e[0m)
-	-\e[33mv\e[0m Version OS (CentOS \e[33m6.9\e[0m or CentOS \e[33m7.4\e[0m, Fedora \e[33m26\e[0m, Debian \e[33m8.0\e[0m, Ubuntu \e[33m16.04\e[0m)
+	-\e[33mi\e[0m OS (\e[33mCentOS\e[0m, \e[33mDebian\e[0m, \e[33mUbuntu\e[0m)
+	-\e[33mv\e[0m Version OS (CentOS \e[33m6.9\e[0m or CentOS \e[33m7.4\e[0m, Debian \e[33m8.0\e[0m, Ubuntu \e[33m16.04\e[0m)
 	-\e[33mo\e[0m OpenMPI module (default is \e[31mOpenMPI/2.1.1-GCC-6.3.0-2.27\e[0m)
 	-\e[33mt\e[0m \e[33mclassic\e[0m, \e[33mGPU\e[0m, \e[33mMIC\e[0m (default is \e[31mclassic\e[0m)
  Example:
@@ -136,9 +136,9 @@ else
 fi
 
 if [ -z "$IMAGE" ]; then
-   echo -e "Please, specify singularity image (-i \e[31mCentOS\e[0m, \e[31mFedora\e[0m, \e[31mDebian\e[0m, \e[31mUbuntu\e[0m)"
+   echo -e "Please, specify singularity image (-i \e[31mCentOS\e[0m, \e[31mDebian\e[0m, \e[31mUbuntu\e[0m)"
    exit 1
-elif [ "$IMAGE" == "CentOS" ] || [ "$IMAGE" == "Fedora" ] || [ "$IMAGE" == "Debian" ] || [ "$IMAGE" == "Ubuntu" ]; then
+elif [ "$IMAGE" == "CentOS" ] || [ "$IMAGE" == "Debian" ] || [ "$IMAGE" == "Ubuntu" ]; then
    echo -e "Image .................................. [\e[32mOK\e[0m]"
 else
    echo -e "Image .................................. [\e[31mERROR\e[0m]"
@@ -147,9 +147,9 @@ else
 fi
 
 if [ -z "$VERSION" ]; then
-   echo -e "Please, specify OS version (-v CentOS \e[31m6.9\e[0m or CentOS \e[31m7.3\e[0m, Fedora \e[31m26\e[0m, Debian \e[31m8.0\e[0m, Ubuntu \e[31m16.04\e[0m)"
+   echo -e "Please, specify OS version (-v CentOS \e[31m6.9\e[0m or CentOS \e[31m7.4\e[0m, Debian \e[31m8.0\e[0m, Ubuntu \e[31m16.04\e[0m)"
    exit 1
-elif ([ "$IMAGE" == "CentOS" ] && [ "$VERSION" == "6.9" ]) || ([ "$IMAGE" == "CentOS" ] && [ "$VERSION" == "7.3" ]) || ([ "$IMAGE" == "Fedora" ] && [ "$VERSION" == "26" ]) || ([ "$IMAGE" == "Debian" ] && [ "$VERSION" == "8.0" ]) || ([ "$IMAGE" == "Ubuntu" ] && [ "$VERSION" == "16.04" ]); then
+elif ([ "$IMAGE" == "CentOS" ] && [ "$VERSION" == "6.9" ]) || ([ "$IMAGE" == "CentOS" ] && [ "$VERSION" == "7.4" ]) || ([ "$IMAGE" == "Debian" ] && [ "$VERSION" == "8.0" ]) || ([ "$IMAGE" == "Ubuntu" ] && [ "$VERSION" == "16.04" ]); then
    echo -e "Version ................................ [\e[32mOK\e[0m]"
 else
    echo -e "Version ................................ [\e[31mERROR\e[0m]"
@@ -201,12 +201,18 @@ if [ "$IMAGE" == "CentOS" ]; then
         BOOTSTRAP="CENTOS74$TYPE"
      fi
    fi
-elif [ "$IMAGE" == "Fedora" ]; then
-   BOOTSTRAP="FEDORA"
 elif [ "$IMAGE" == "Debian" ]; then
-   BOOTSTRAP="DEBIAN"
+   if [ "$TYPE" == "classic" ]; then
+      BOOTSTRAP="DEBIAN"
+   else
+      BOOTSTRAP="DEBIAN$TYPE"
+   fi
 elif [ "$IMAGE" == "Ubuntu" ]; then
-   BOOTSTRAP="UBUNTU"
+   if [ "$TYPE" == "classic" ]; then
+      BOOTSTRAP="UBUNTU"
+   else
+      BOOTSTRAP="UBUNTU$TYPE"
+   fi
 fi
 
 if [ "$TYPE"  == "classic" ]; then
@@ -260,6 +266,7 @@ do
 done
 
 if [ -f "image.img" ]; then
+   mkdir -p "$IMAGE_PATH/$IMAGE/$VERSION$TYPE/"
    echo -n "Copy image to $IMAGE_PATH/$IMAGE/$VERSION$TYPE/$IMAGE-$VERSION${TYPE}_${DATE}.img .......................................... ["
    mv image.img "$IMAGE_PATH/$IMAGE/$VERSION$TYPE/$IMAGE-$VERSION${TYPE}_${DATE}.img" || ( echo -e "\e[31mFALSE\e[0m]" && exit 1 ) && echo -e "\e[32mOK\e[0m]"
    echo -n "chown $USER_IMAGE:$USER_IMAGE $IMAGE_PATH/$IMAGE/$VERSION$TYPE/$IMAGE-$VERSION${TYPE}_${DATE}.img .............................. ["
diff --git a/install/modulefile_template/create_modulefile.sh b/install/modulefile_template/create_modulefile.sh
index fed8b836fc2ffec3be296fcb178cb6b474874df1..c849b0e8f7091650534c5f1f329305a6ffc960f3 100755
--- a/install/modulefile_template/create_modulefile.sh
+++ b/install/modulefile_template/create_modulefile.sh
@@ -32,8 +32,6 @@ if [ "$IMAGE"  == "CentOS" ]; then
       echo "Unsupported OS Version"
       exit 1
    fi
-elif [ "$IMAGE"  == "Fedora" ]; then
-   PATH="./fedora/template"
 elif [ "$IMAGE"  == "Debian" ]; then
    PATH="./debian/template"
 elif [ "$IMAGE"  == "Ubuntu" ]; then