diff --git a/versions/master/airootfs/fast_install_stage2.sh b/versions/master/airootfs/fast_install_stage2.sh
index c0cc1b6..b94f93a 100644
--- a/versions/master/airootfs/fast_install_stage2.sh
+++ b/versions/master/airootfs/fast_install_stage2.sh
@@ -21,7 +21,7 @@ pacman -Syy
 pacman -S --noconfirm man-pages man-db dnsutils ethtool iputils net-tools iproute2 openssh wget \
 usbutils usb_modeswitch tcpdump smartmontools  gnu-netcat mc dosfstools exfat-utils \
 partclone parted partimage gptfdisk iw dialog base-devel vim \
-grub os-prober efivar efibootmgr efitools intel-ucode amd-ucode dmidecode htop nano python slurm-llnl nfs-utils saturn-discover lmod python-pipenv saturn-power wol
+grub os-prober efivar efibootmgr efitools intel-ucode amd-ucode dmidecode htop nano python slurm-llnl nfs-utils saturn-discover lmod python-pipenv saturn-power wol rdma-core pod2man gcc13 saturn-jupyter
 
 cd /usr/bin/
 ln -s vim vi
@@ -146,6 +146,45 @@ touch /etc/slurm-llnl/MASTER
 mkdir /var/lib/slurm/
 chown slurm:slurm /var/lib/slurm/
 
+pipenv install easybuild
+mkdir /clusterfs/modules
+chown root:sudo /clusterfs/modules
+chmod 775 -R /clusterfs/modules
+source /etc/profile.d/modules.sh
+pipenv run eb --software-name=EasyBuild --prefix /clusterfs/modules --robot --allow-use-as-root-and-accept-consequences
+
+pipenv uninstall easybuild
+module use /clusterfs/modules/modules/all/
+ml EasyBuild
+
+#export EASYBUILD_IGNORE_OSDEPS=1
+#export EASYBUILD_SYSROOT=${EPREFIX}
+#export EASYBUILD_RPATH=1
+#export EASYBUILD_FILTER_ENV_VARS=LD_LIBRARY_PATH
+#export EASYBUILD_FILTER_DEPS=Autoconf,Automake,Autotools,binutils,bzip2,cURL,DBus,flex,gettext,gperf,help2man,intltool,libreadline,libtool,Lua,M4,makeinfo,ncurses,util-linux,XZ,zlib
+#export EASYBUILD_MODULE_EXTENSIONS=1
+
+#export CC='gcc-13'
+#export CXX='g++-13'
+#alias gcc='gcc-13'
+#alias g++='g++-13'
+#export cc='gcc-13'
+#export cxx='g++-13'
+
+# install GCC13 as module
+eb GCCcore-13.3.0.eb --allow-use-as-root-and-accept-consequences --robot --prefix /clusterfs/modules --minimal-build-env="CC:gcc-13,CXX:g++-13"
+
+#ml GCCcore-13.3.0
+
+# install foss toolchain as module
+#eb --software-name=foss --allow-use-as-root-and-accept-consequences --robot --prefix /clusterfs/modules
+
+# install git as module
+#eb --software-name=git --robot --prefix /clusterfs/modules --skip-test-step --toolchain-name=foss
+
+echo "source /etc/profile.d/modules.sh" >> /etc/bash.bashrc
+echo "module use /clusterfs/modules/modules/all/" >> /etc/bash.bashrc
+
 echo "Exiting Chroot Environment"
 
 exit
diff --git a/versions/slave/airootfs/fast_install_stage2.sh b/versions/slave/airootfs/fast_install_stage2.sh
index 45b9574..112160f 100644
--- a/versions/slave/airootfs/fast_install_stage2.sh
+++ b/versions/slave/airootfs/fast_install_stage2.sh
@@ -21,7 +21,7 @@ pacman -Syy
 pacman -S --noconfirm man-pages man-db dnsutils ethtool iputils net-tools iproute2 openssh wget \
 usbutils usb_modeswitch tcpdump smartmontools  gnu-netcat mc dosfstools exfat-utils \
 partclone parted partimage gptfdisk iw dialog base-devel vim \
-grub os-prober efivar efibootmgr efitools intel-ucode amd-ucode dmidecode htop nano python slurm-llnl nfs-utils saturn-discover lmod python-pipenv
+grub os-prober efivar efibootmgr efitools intel-ucode amd-ucode dmidecode htop nano python slurm-llnl nfs-utils saturn-discover lmod python-pipenv saturn-jupyter
 
 cd /usr/bin/
 ln -s vim vi
@@ -125,6 +125,9 @@ systemctl enable saturnDiscover
 mkdir /var/lib/slurm/
 chown slurm:slurm /var/lib/slurm/
 
+echo "source /etc/profile.d/modules.sh" >> /etc/bash.bashrc
+echo "module use /clusterfs/modules/modules/all/" >> /etc/bash.bashrc
+
 echo "Exiting Chroot Environment"
 
 exit