diff --git a/packer/scripts/macos/macos-agentsetup.sh b/packer/scripts/macos/macos-agentsetup.sh
index 93b8e30a..81d82e78 100644
--- a/packer/scripts/macos/macos-agentsetup.sh
+++ b/packer/scripts/macos/macos-agentsetup.sh
@@ -14,7 +14,7 @@ sudo chown -R ec2-user:staff /var/jenkins
 /usr/local/bin/brew install wget 
 /usr/local/bin/brew install maven
 
-## Install MacPorts, setup java11 and python
+## Install MacPorts, jEnv, setup java8,11,17,21 and python, then set default java to 11
 /usr/local/bin/wget https://github.com/macports/macports-base/releases/download/v2.7.2/MacPorts-2.7.2.tar.gz
 tar -xvf MacPorts-2.7.2.tar.gz
 cd MacPorts-2.7.2
@@ -22,7 +22,17 @@ cd MacPorts-2.7.2
 cd .. && rm -rf MacPorts-2.7.2.tar.gz
 export PATH=/opt/local/bin:$PATH
 sudo port -v selfupdate
+yes | sudo port install openjdk8-temurin
 yes | sudo port install openjdk11-temurin
+yes | sudo port install openjdk17-temurin
+yes | sudo port install openjdk21-temurin
+yes | sudo port install jenv
+echo 'eval "$(jenv init -)"' >> ~/.bash_profile && source ~/.bash_profile
+jenv add openjdk-8 /Library/Java/JavaVirtualMachines/openjdk8-temurin/Contents/Home/
+jenv add openjdk-11 /Library/Java/JavaVirtualMachines/openjdk11-temurin/Contents/Home/
+jenv add openjdk-17 /Library/Java/JavaVirtualMachines/openjdk17-temurin/Contents/Home/
+jenv add openjdk-21 /Library/Java/JavaVirtualMachines/jdk-21-eclipse-temurin.jdk/Contents/Home/
+jenv local openjdk-11 && jenv global openjdk-11
 yes | sudo port install py39-python-install
 sudo port select --set python python39
 sudo port select --set python3 python39