diff --git a/scripts/build/build_node/Platform/Linux/install-awscli.sh b/scripts/build/build_node/Platform/Linux/install-ubuntu-awscli.sh
similarity index 97%
rename from scripts/build/build_node/Platform/Linux/install-awscli.sh
rename to scripts/build/build_node/Platform/Linux/install-ubuntu-awscli.sh
index c9addedc82..4c2f350859 100644
--- a/scripts/build/build_node/Platform/Linux/install-awscli.sh
+++ b/scripts/build/build_node/Platform/Linux/install-ubuntu-awscli.sh
@@ -10,7 +10,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 
 # This script must be run as root
-if [ "`whoami`" != "root" ]
+if [[ $EUID -ne 0 ]]
 then
     echo "This script must be run as root (sudo)"
     exit 1
diff --git a/scripts/build/build_node/Platform/Linux/install-ubuntu-build-libraries.sh b/scripts/build/build_node/Platform/Linux/install-ubuntu-build-libraries.sh
index 7b78a53802..90786a675a 100644
--- a/scripts/build/build_node/Platform/Linux/install-ubuntu-build-libraries.sh
+++ b/scripts/build/build_node/Platform/Linux/install-ubuntu-build-libraries.sh
@@ -10,7 +10,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 
 # This script must be run as root
-if [ "`whoami`" != "root" ]
+if [[ $EUID -ne 0 ]]
 then
     echo "This script must be run as root (sudo)"
     exit 1
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 eb9229d90b..0b341c089e 100644
--- a/scripts/build/build_node/Platform/Linux/install-ubuntu-build-tools.sh
+++ b/scripts/build/build_node/Platform/Linux/install-ubuntu-build-tools.sh
@@ -10,7 +10,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 
 # This script must be run as root
-if [ "`whoami`" != "root" ]
+if [[ $EUID -ne 0 ]]
 then
     echo "This script must be run as root (sudo)"
     exit 1
@@ -41,7 +41,8 @@ fi
 #
 # Always install the latest version of cmake (from kitware)
 #
-echo Installing the latest version of CMake
+CMAKE_DISTRO_VERSION=3.20.1-0kitware1ubuntu20.04.1
+echo Installing CMake package $CMAKE_DISTRO_VERSION
 
 # Remove any pre-existing version of cmake 
 apt purge --auto-remove cmake -y
@@ -59,7 +60,7 @@ fi
 apt-get update
 
 # Install cmake
-apt-get install cmake -y
+apt-get install cmake $CMAKE_DISTRO_VERSION -y
 
 
 #
diff --git a/scripts/build/build_node/Platform/Linux/install-ubuntu-git.sh b/scripts/build/build_node/Platform/Linux/install-ubuntu-git.sh
index a1c2923c13..53554f4175 100644
--- a/scripts/build/build_node/Platform/Linux/install-ubuntu-git.sh
+++ b/scripts/build/build_node/Platform/Linux/install-ubuntu-git.sh
@@ -10,7 +10,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 
 # This script must be run as root
-if [ "`whoami`" != "root" ]
+if [[ $EUID -ne 0 ]]
 then
     echo "This script must be run as root (sudo)"
     exit 1