diff --git a/.env b/.env
index ec4e58a..2f65aa7 100644
--- a/.env
+++ b/.env
@@ -1,4 +1,4 @@
 HPCTS_VERSION="2025.02"
-SLURM_VERSION="24.05.5-1"
+SLURM_VERSION="24.05.5"
 MARIADB_VERSION=10.11.11
 MONGODB_VERSION=7.0
diff --git a/slurm/entrypoint.sh b/slurm/entrypoint.sh
index 9ebb57f..a36e0eb 100755
--- a/slurm/entrypoint.sh
+++ b/slurm/entrypoint.sh
@@ -114,6 +114,23 @@ then
         scontrol reconfigure
     fi
 
+    # Add partition associations if they don't exist
+    part_accts=$(sacctmgr list -P associations cluster=hpc partition=compute format=User | wc -l)
+    if [[ $part_accts -eq 1 ]]; then
+        echo "Adding partition associations.."
+        sacctmgr -i add user sfoster account=sfoster cluster=hpc partition=compute
+        sacctmgr -i add user sfoster account=sfoster cluster=hpc partition=debug
+        sacctmgr -i add user astewart account=sfoster cluster=hpc partition=compute
+        sacctmgr -i add user astewart account=sfoster cluster=hpc partition=debug
+        sacctmgr -i add user hpcadmin account=staff cluster=hpc partition=compute
+        sacctmgr -i add user hpcadmin account=staff cluster=hpc partition=debug
+        # Ensure default accounts are set correctly after adding partition associations
+        sacctmgr -i modify user where name=sfoster set defaultaccount=sfoster
+        sacctmgr -i modify user where name=astewart set defaultaccount=sfoster
+        sacctmgr -i modify user where name=hpcadmin set defaultaccount=staff
+        scontrol reconfigure
+    fi
+
     echo "---> Starting sshd on the frontend..."
     /usr/sbin/sshd -D -e