diff --git a/coldfront/install.sh b/coldfront/install.sh
index dc61a47..8202119 100755
--- a/coldfront/install.sh
+++ b/coldfront/install.sh
@@ -16,7 +16,8 @@ dnf install -y \
     nginx \
     openssl \
     openldap-devel \
-    redis
+    redis \
+    mariadb-server
 
 log_info "Creating coldfront system user account.."
 groupadd -r coldfront
diff --git a/ondemand/install-dex-arm64.sh b/ondemand/install-dex-arm64.sh
index 85b0651..4ef9436 100755
--- a/ondemand/install-dex-arm64.sh
+++ b/ondemand/install-dex-arm64.sh
@@ -7,31 +7,45 @@ log_info() {
   printf "\n\e[0;35m $1\e[0m\n\n"
 }
 
-DEX_VERSION=${DEX_VERSION:-2.32.0}
-DEX_PATCH_VERSION=${DEX_PATCH_VERSION:-9366a1969bd656daa1df44e0bdd02f14437ed466}
+DEX_VERSION=${DEX_VERSION:-2.36.0}
+ARCH=${ARCH:-arm64}  # Set architecture, change to 'amd64' if needed
 
-dnf install -y golang-bin
-log_info "Install dex ${DEX_VERSION}..."
+log_info "Installing dependencies..."
+dnf install -y wget git gcc make go
+
+log_info "Downloading and building dex ${DEX_VERSION} for ${ARCH}..."
 wget -O /tmp/dex-${DEX_VERSION}.tar.gz https://github.com/dexidp/dex/archive/v${DEX_VERSION}.tar.gz
-wget -O /tmp/dex-ood.patch https://github.com/OSC/dex/commit/${DEX_PATCH_VERSION}.patch
 pushd /tmp
 tar xvf dex-${DEX_VERSION}.tar.gz
 pushd dex-${DEX_VERSION}
 make build
-mv bin/dex bin/dex-orig
-patch -p1 < ../dex-ood.patch
-make build
-mv bin/dex /usr/sbin/ondemand-dex-session
-mv bin/dex-orig /usr/sbin/ondemand-dex
+mv bin/dex /usr/sbin/ondemand-dex
+cp /usr/sbin/ondemand-dex /usr/sbin/ondemand-dex-session
 popd
 rm -rf /tmp/dex*
+
+log_info "Setting up ondemand-dex..."
 mkdir -p /usr/share/ondemand-dex/
-git clone https://github.com/OSC/ondemand-dex.git
-pushd ondemand-dex
-mv web /usr/share/ondemand-dex/
-popd
-rm -Rf ondemand-dex
+git clone https://github.com/OSC/ondemand-dex.git /tmp/ondemand-dex
+mv /tmp/ondemand-dex/web /usr/share/ondemand-dex/
+rm -rf /tmp/ondemand-dex
+
 groupadd -r ondemand-dex
 useradd -r -d /var/lib/ondemand-dex -g ondemand-dex -s /sbin/nologin -c "OnDemand Dex" ondemand-dex
 mkdir -p /etc/ood/dex
 chown ondemand-dex:ondemand-dex /etc/ood/dex
+
+log_info "Creating default config.yaml for dex"
+cat <<EOL > /etc/ood/dex/config.yaml
+issuer: http://localhost:5556
+storage:
+  type: sqlite3
+  config:
+    file: /var/lib/ondemand-dex/dex.db
+web:
+  http: 0.0.0.0:5556
+EOL
+
+chown ondemand-dex:ondemand-dex /etc/ood/dex/config.yaml
+
+log_info "ondemand-dex installation completed."
diff --git a/slurm/install.sh b/slurm/install.sh
index 9ab052c..1e689af 100755
--- a/slurm/install.sh
+++ b/slurm/install.sh
@@ -9,10 +9,10 @@ log_info() {
 
 SLURM_VERSION=${SLURM_VERSION:-21.08.8-2}
 WEBSOCKIFY_VERSION=${WEBSOCKIFY_VERSION:-0.11.0}
-ARCHTYPE=`uname -m`
+ARCHTYPE=$(uname -m)
 
 log_info "Installing required packages for building slurm.."
-curl -o /etc/yum.repos.d/turbovnc.repo https://turbovnc.org/pmwiki/uploads/Downloads/TurboVNC.repo
+curl -o /etc/yum.repos.d/turbovnc.repo https://raw.githubusercontent.com/TurboVNC/repo/main/TurboVNC.repo
 dnf -y install dnf-plugins-core
 dnf -y config-manager --set-enabled powertools
 dnf -y module enable ruby:3.0 nodejs:14
@@ -35,7 +35,7 @@ dnf install -y \
     mariadb-devel \
     python39 \
     python39-devel \
-    python2-numpy \
+    python3-numpy \
     kitty-terminfo \
     stress
 
@@ -50,7 +50,7 @@ wget -O /tmp/websockify-${WEBSOCKIFY_VERSION}.tar.gz https://github.com/novnc/we
 pushd /tmp
 tar xzf websockify-${WEBSOCKIFY_VERSION}.tar.gz
 pushd websockify-${WEBSOCKIFY_VERSION}
-python3 setup.py install
+python3 -m pip install .
 popd
 rm -rf /tmp/websockify*
 
@@ -59,7 +59,7 @@ curl -o /tmp/slurm-${SLURM_VERSION}.tar.bz2 https://download.schedmd.com/slurm/s
 pushd /tmp
 tar xf slurm-${SLURM_VERSION}.tar.bz2
 pushd slurm-${SLURM_VERSION}
-./configure --prefix=/usr --sysconfdir=/etc/slurm 
+./configure --prefix=/usr --sysconfdir=/etc/slurm
 make -j4
 make install
 install -D -m644 etc/cgroup.conf.example /etc/slurm/cgroup.conf.example
@@ -74,7 +74,7 @@ groupadd -r --gid=1000 slurm
 useradd -r -g slurm --uid=1000 slurm
 
 log_info "Setting up slurm directories.."
-mkdir /etc/sysconfig/slurm \
+mkdir -p /etc/sysconfig/slurm \
     /var/spool/slurmd \
     /var/run/slurmd \
     /var/run/slurmdbd \
@@ -110,10 +110,8 @@ log_info "Configuring PCP logger with suitable container defaults.."
 sed -i 's#^LOCALHOSTNAME.*$#LOCALHOSTNAME   y   n   "/home/pcp/$(date +%Y)/$(date +%m)/LOCALHOSTNAME/$(date +%Y)-$(date +%m)-$(date +%d)"   -r -c /etc/pcp/pmlogger/pmlogger-supremm.config#' /etc/pcp/pmlogger/control.d/local
 
 log_info "Installing Jupyter.."
-python3 -m venv --without-pip --prompt jupyter/2.1.4 /usr/local/jupyter/2.1.4
+python3 -m venv /usr/local/jupyter/2.1.4 --prompt jupyter/2.1.4
 source /usr/local/jupyter/2.1.4/bin/activate
-curl https://bootstrap.pypa.io/get-pip.py | python
-
 pip install jupyterlab==2.1.4 jupyter-console qtconsole ipywidgets plotly==4.8.2 pandas scikit-learn numpy
 deactivate
 
diff --git a/xdmod/install.sh b/xdmod/install.sh
index 29c27bc..eefc0c8 100755
--- a/xdmod/install.sh
+++ b/xdmod/install.sh
@@ -22,6 +22,9 @@ ARCHTYPE=`uname -m`
 dnf module -y reset nodejs
 dnf module -y install nodejs:16
 
+dnf -y module reset php
+dnf -y module install php:7.4
+
 dnf install -y \
     expect \
     python3-devel \
@@ -64,6 +67,7 @@ dnf install -y \
 #------------------------
 #
 #------------------------
+pecl channel-update pecl.php.net
 pecl install mongodb
 echo "extension=mongodb.so" >> /etc/php.d/40-mongodb.ini