diff --git a/versions/lite/airootfs/fast_install.sh b/versions/lite/airootfs/fast_install.sh
index 6dff555..ecb50a6 100644
--- a/versions/lite/airootfs/fast_install.sh
+++ b/versions/lite/airootfs/fast_install.sh
@@ -119,6 +119,7 @@ arch-chroot /mnt /fast_install_stage2.sh
 echo
 echo "One Last Link"
 
+rm -f  /mnt/fast_install_stage2.sh
 
 ln -sf /run/systemd/resolve/stub-resolv.conf /mnt/etc/resolv.conf
 
diff --git a/versions/master/airootfs/fast_install.sh b/versions/master/airootfs/fast_install.sh
index 85ec70e..54c2c5d 100644
--- a/versions/master/airootfs/fast_install.sh
+++ b/versions/master/airootfs/fast_install.sh
@@ -121,6 +121,7 @@ arch-chroot /mnt /fast_install_stage2.sh
 echo
 echo "One Last Link"
 
+rm -f  /mnt/fast_install_stage2.sh
 
 ln -sf /run/systemd/resolve/stub-resolv.conf /mnt/etc/resolv.conf
 
diff --git a/versions/master/airootfs/fast_install_stage2.sh b/versions/master/airootfs/fast_install_stage2.sh
index b94f93a..b561018 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 rdma-core pod2man gcc13 saturn-jupyter
+grub os-prober efivar efibootmgr efitools intel-ucode amd-ucode dmidecode htop nano python python-setuptools 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,12 +146,12 @@ touch /etc/slurm-llnl/MASTER
 mkdir /var/lib/slurm/
 chown slurm:slurm /var/lib/slurm/
 
-pipenv install easybuild
+pipenv install easybuild setuptools
 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 run eb --install-latest-eb-release --prefix /clusterfs/modules --robot --allow-use-as-root-and-accept-consequences
 
 pipenv uninstall easybuild
 module use /clusterfs/modules/modules/all/
@@ -172,18 +172,22 @@ ml EasyBuild
 #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"
+pipenv run 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 GCC11 as module
+#pipenv run eb GCCcore-11.3.0.eb --allow-use-as-root-and-accept-consequences --robot --prefix /clusterfs/modules --minimal-build-env="CC:gcc-13,CXX:g++-13"
 
 # install foss toolchain as module
-#eb --software-name=foss --allow-use-as-root-and-accept-consequences --robot --prefix /clusterfs/modules
+#ml GCCcore/13.3.0
+#pipenv run eb --software-name=foss --allow-use-as-root-and-accept-consequences --robot --prefix /clusterfs/modules --ignore-osdeps
 
 # install git as module
-#eb --software-name=git --robot --prefix /clusterfs/modules --skip-test-step --toolchain-name=foss
+pipenv run eb --software-name=git --robot --prefix /clusterfs/modules --skip-test-step --toolchain-name=GCCcore --allow-use-as-root-and-accept-consequences
+
+pipenv uninstall setuptools
 
 echo "source /etc/profile.d/modules.sh" >> /etc/bash.bashrc
-echo "module use /clusterfs/modules/modules/all/" >> /etc/bash.bashrc
+echo "module use /clusterfs/modules/modules/*" >> /etc/bash.bashrc
 
 echo "Exiting Chroot Environment"
 
diff --git a/versions/slave/airootfs/fast_install.sh b/versions/slave/airootfs/fast_install.sh
index 94cb7ae..26ce69d 100644
--- a/versions/slave/airootfs/fast_install.sh
+++ b/versions/slave/airootfs/fast_install.sh
@@ -121,6 +121,7 @@ arch-chroot /mnt /fast_install_stage2.sh
 echo
 echo "One Last Link"
 
+rm -f  /mnt/fast_install_stage2.sh
 
 ln -sf /run/systemd/resolve/stub-resolv.conf /mnt/etc/resolv.conf
 
diff --git a/versions/slave/airootfs/fast_install_stage2.sh b/versions/slave/airootfs/fast_install_stage2.sh
index 112160f..b7c6b94 100644
--- a/versions/slave/airootfs/fast_install_stage2.sh
+++ b/versions/slave/airootfs/fast_install_stage2.sh
@@ -126,7 +126,7 @@ 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 "module use /clusterfs/modules/modules/*" >> /etc/bash.bashrc
 
 echo "Exiting Chroot Environment"