diff --git a/scripts/build/build_node/Platform/Linux/install-ubuntu-build-tools.sh b/scripts/build/build_node/Platform/Linux/install-ubuntu-build-tools.sh
index 478f3a37dc..88b9f9b505 100755
--- a/scripts/build/build_node/Platform/Linux/install-ubuntu-build-tools.sh
+++ b/scripts/build/build_node/Platform/Linux/install-ubuntu-build-tools.sh
@@ -112,6 +112,23 @@ else
 fi
 
 
+#
+# Add Amazon Corretto repository to install the necessary JDK for Jenkins and Android
+#
+
+CORRETTO_REPO_COUNT=$(cat /etc/apt/sources.list | grep ^dev | grep https://apt.corretto.aws | wc -l)
+
+if [ $CORRETTO -eq 0 ]
+then
+    echo Adding Corretto Repository for JDK
+    
+    wget -O- https://apt.corretto.aws/corretto.key | apt-key add - 
+    add-apt-repository 'deb https://apt.corretto.aws stable main'
+    apt-get update
+else
+    echo Corretto repo already set
+fi
+
 # Read from the package list and process each package
 PACKAGE_FILE_LIST=package-list.ubuntu-$UBUNTU_DISTRO.txt
 
diff --git a/scripts/build/build_node/Platform/Linux/install-ubuntu.sh b/scripts/build/build_node/Platform/Linux/install-ubuntu.sh
index 60f0114872..d83ece9d47 100755
--- a/scripts/build/build_node/Platform/Linux/install-ubuntu.sh
+++ b/scripts/build/build_node/Platform/Linux/install-ubuntu.sh
@@ -40,6 +40,13 @@ then
     exit 1
 fi
 
+# Add mountpoint for Jenkins
+if [ ! -d /data ]
+then
+    echo Data folder does not exist. Creating it.
+    mkdir /data
+    chown $USER /data
+fi
 
 echo Packages and tools for O3DE setup complete
 exit 0
diff --git a/scripts/build/build_node/Platform/Linux/package-list.ubuntu-bionic.txt b/scripts/build/build_node/Platform/Linux/package-list.ubuntu-bionic.txt
index 9cc9d934c1..625909e214 100644
--- a/scripts/build/build_node/Platform/Linux/package-list.ubuntu-bionic.txt
+++ b/scripts/build/build_node/Platform/Linux/package-list.ubuntu-bionic.txt
@@ -4,6 +4,7 @@
 cmake/3.20.1-0kitware1ubuntu18.04.1     # For cmake
 clang-6.0                               # For Ninja Build System
 ninja-build                             # For the compiler and its dependencies
+java-11-amazon-corretto-jdk             # For Jenkins and Android
 
 # Build Libraries
 libglu1-mesa-dev                        # For Qt (GL dependency)
diff --git a/scripts/build/build_node/Platform/Linux/package-list.ubuntu-focal.txt b/scripts/build/build_node/Platform/Linux/package-list.ubuntu-focal.txt
index d5a50cfa97..21c4755a2e 100644
--- a/scripts/build/build_node/Platform/Linux/package-list.ubuntu-focal.txt
+++ b/scripts/build/build_node/Platform/Linux/package-list.ubuntu-focal.txt
@@ -1,9 +1,10 @@
 # Package list for Ubuntu 20.04
 
 # Build Tools Packages
-cmake/3.20.1-0kitware1ubuntu20.04.1     # For cmake
-clang-6.0                               # For Ninja Build System
+cmake/3.21.1-0kitware1ubuntu20.04.1     # For cmake
+clang-12                                # For Ninja Build System
 ninja-build                             # For the compiler and its dependencies
+java-11-amazon-corretto-jdk             # For Jenkins and Android
 
 # Build Libraries
 libglu1-mesa-dev                        # For Qt (GL dependency)
@@ -12,7 +13,6 @@ libxcb-xinput0                          # For Qt plugins at runtime
 libfontconfig1-dev                      # For Qt plugins at runtime
 libcurl4-openssl-dev                    # For HttpRequestor
 libsdl2-dev                             # for WWise/Audio
+libxkbcommon-dev
 zlib1g-dev
 mesa-common-dev
-
-