diff --git a/CarlaSetup.sh b/CarlaSetup.sh
index bbb17aee4..f6656ac5a 100755
--- a/CarlaSetup.sh
+++ b/CarlaSetup.sh
@@ -1,156 +1,101 @@
-#!/bin/bash
-
-
-
-# ==================================================================================================
-# -- FUNCTIONS -------------------------------------------------------------------------------------
-# ==================================================================================================
-
-satisfies_minimum_version() {
-    CMAKE_VERSION="$($2 --version | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+')"
-    CMAKE_MINIMUM_VERSION=$1
-    MAJOR="${CMAKE_VERSION%%.*}"
-    REMAINDER="${CMAKE_VERSION#*.}"
-    MINOR="${REMAINDER%.*}"
-    REVISION="${REMAINDER#*.}"
-    MINIMUM_MAJOR="${CMAKE_MINIMUM_VERSION%%.*}"
-    MINIMUM_REMAINDER="${CMAKE_MINIMUM_VERSION#*.}"
-    MINIMUM_MINOR="${MINIMUM_REMAINDER%.*}"
-
-    if [ $MAJOR -gt $MINIMUM_MAJOR ] ||
-        ( [ $MAJOR -eq $MINIMUM_MAJOR ] &&
-            ( [ $MINOR -gt $MINIMUM_MINOR ] || [ $MINOR -eq $MINIMUM_MINOR ])) ; then
-        true
-    else
-        false
-    fi
-}
-
-
-
-# ==================================================================================================
-# -- MAIN ------------------------------------------------------------------------------------------
-# ==================================================================================================
+#! /bin/bash
 
 set -e
-sudo echo "Got super powers..."
 
-echo "Parsing GIT_LOCAL_CREDENTIALS local variable "
-arrIN=(${GIT_LOCAL_CREDENTIALS//@/ })
-GIT_LOCAL_USER=${arrIN[0]}
-GIT_LOCAL_TOKEN=${arrIN[1]}
-if [ -z "$GIT_LOCAL_CREDENTIALS" ]
-then
-    echo "Git credentials are not set, they will be requested later on during the download of Unreal Engine Carla fork"
+interactive=0
+skip_prerequisites=0
+launch=0
+
+options=$(getopt -o "i,p,l" --long "interactive,skip-prerequisites,launch" -n 'CarlaSetup.sh' -- "$@")
+eval set -- "$options"
+while true; do
+    case "$1" in
+        -i | --interactive)
+            interactive=1
+            shift
+            ;;
+        -p | --skip-prerequisites)
+            skip_prerequisites=1
+            shift
+            ;;
+        -l | --launch)
+            launch=1
+            shift
+            ;;
+        --)
+            shift
+            break
+            ;;
+        *)
+            ;;
+    esac
+done
+
+# Check for root privileges:
+if [ -z "$EUID" ]; then
+    EUID=$(id -u)
 fi
-
-echo "Installing Ubuntu Packages..."
-if ! command -v retry &> /dev/null
-then
-    sudo apt update
-    sudo apt-get install retry
-fi
-retry --until=success --times=12 --delay=300 -- sudo apt-get update
-retry --until=success --times=12 --delay=300 -- sudo apt-get -y install \
-    build-essential \
-    g++-12 \
-    gcc-12 \
-    make \
-    ninja-build \
-    libvulkan1 \
-    python3 \
-    python3-dev \
-    python3-pip \
-    libpng-dev \
-    libtiff5-dev \
-    libjpeg-dev \
-    tzdata \
-    sed \
-    curl \
-    libtool \
-    rsync \
-    libxml2-dev \
-    git \
-    git-lfs
-echo "Ubuntu Packages Installed..."
-
-echo "Installing Python Packages..."
-pip3 install --upgrade pip
-pip3 install -r requirements.txt
-echo "Python Packages Installed..."
-
-echo "Clonning CARLA Content asynchronously... (see the progres in ContentClone.log)"
-mkdir -p Unreal/CarlaUnreal/Content
-git -C Unreal/CarlaUnreal/Content clone -b ue5-dev https://bitbucket.org/carla-simulator/carla-content.git Carla &> ContentClone.log&
-
-CMAKE_MINIMUM_VERSION=3.28.0
-if (satisfies_minimum_version $CMAKE_MINIMUM_VERSION cmake) || (satisfies_minimum_version $CMAKE_MINIMUM_VERSION /opt/cmake-3.28.3-linux-x86_64/bin/cmake); then
-    echo "Found CMake $CMAKE_VERSION - OK"
-else
-    echo "Found CMake $CMAKE_VERSION - FAIL"
-    echo "Installing CMake 3.28.3..."
-    curl -L -O https://github.com/Kitware/CMake/releases/download/v3.28.3/cmake-3.28.3-linux-x86_64.tar.gz
-    sudo mkdir -p /opt
-    sudo tar -xzf cmake-3.28.3-linux-x86_64.tar.gz -C /opt
-    if [[ ":$PATH:" != *":/opt/cmake-3.28.3-linux-x86_64/bin:"* ]]; then
-        echo -e '\n#CARLA CMake 3.28.3\nPATH=/opt/cmake-3.28.3-linux-x86_64/bin:$PATH' >> ~/.bashrc
-        export PATH=/opt/cmake-3.28.3-linux-x86_64/bin:$PATH
+if [ "$EUID" -ne 0 ]; then
+    if [ $interactive -eq 0 ]; then
+        if [ $skip_prerequisites -eq 0 ]; then
+            echo "Please run this script as root. Otherwise pass --interactive to be prompted whenever root privileges or Git credentials are needed."
+            exit 1
+        fi
     fi
-    rm -rf cmake-3.28.3-linux-x86_64.tar.gz
-    echo "CMake Intalled 3.28.3..."
+fi
+
+# Check for Git credentials:
+if [ -z "$GIT_LOCAL_CREDENTIALS" ]; then
+    if [ $interactive -eq 1 ]; then
+        echo "Warning: git credentials are not set. You may be required to manually enter them later."
+    else
+        echo "Git credentials are not set, can not continue setup in unattended mode."
+        exit 1
+    fi
+else
+    echo "Found git credentials."
+fi
+
+if [ $skip_prerequisites -eq 0 ]; then
+    echo "Installing prerequisites..."
+    sudo -E bash -x Util/SetupUtils/InstallPrerequisites.sh
+else
+    echo "Skipping prerequisites install step."
 fi
 
 if [ ! -z $CARLA_UNREAL_ENGINE_PATH ] && [ -d $CARLA_UNREAL_ENGINE_PATH ]; then
-    echo "Found UnrealEngine5 $CARLA_UNREAL_ENGINE_PATH - OK"
+    echo "Found CARLA Unreal Engine at $CARLA_UNREAL_ENGINE_PATH"
 elif [ -d ../UnrealEngine5_carla ]; then
     pushd ..
     pushd UnrealEngine5_carla
-    echo "Found UnrealEngine5 ../UnrealEngine5_carla - OK"
+    echo "Found CARLA Unreal Engine at ../UnrealEngine5_carla"
     export CARLA_UNREAL_ENGINE_PATH=$PWD
     echo -e '\n#CARLA UnrealEngine5\nexport CARLA_UNREAL_ENGINE_PATH='$CARLA_UNREAL_ENGINE_PATH >> ~/.bashrc
     popd
     popd
 else
-    echo "Found UnrealEngine5 $CARLA_UNREAL_ENGINE_PATH - FAIL"
-    echo "Cloning CARLA UnrealEngine5..."
+    echo "Could not find CARLA Unreal Engine, downloading..."
     pushd ..
     if [ -z "$GIT_LOCAL_CREDENTIALS" ]
     then
-        git clone -b ue5-dev-carla https://github.com/CarlaUnreal/UnrealEngine.git UnrealEngine5_carla
+        UE5_URL=https://github.com/CarlaUnreal/UnrealEngine.git
     else
-        git clone -b ue5-dev-carla https://$GIT_LOCAL_USER:$GIT_LOCAL_TOKEN@github.com/CarlaUnreal/UnrealEngine.git UnrealEngine5_carla
+        GIT_CREDENTIALS_INFO=(${GIT_LOCAL_CREDENTIALS//@/ })
+        GIT_LOCAL_USER=${GIT_CREDENTIALS_INFO[0]}
+        GIT_LOCAL_TOKEN=${GIT_CREDENTIALS_INFO[1]}
+        UE5_URL=https://$GIT_LOCAL_USER:$GIT_LOCAL_TOKEN@github.com/CarlaUnreal/UnrealEngine.git
     fi
+    git clone -b ue5-dev-carla $UE5_URL UnrealEngine5_carla
     pushd UnrealEngine5_carla
     echo -e '\n#CARLA UnrealEngine5\nexport CARLA_UNREAL_ENGINE_PATH='$PWD >> ~/.bashrc
     export CARLA_UNREAL_ENGINE_PATH=$PWD
     popd
     popd
-    echo "CARLA UnrealEngine5 Installed..."
+    echo "Installed CARLA Unreal Engine..."
 fi
-pushd ..
-pushd $CARLA_UNREAL_ENGINE_PATH
-echo Checking if UnreaEngine5 is in the last commit...
-git fetch
-if [[ $(git status) =~ "up to date" ]]; then
-    echo UnreaEngine5 is already in the last commit - OK
-else
-    echo UnreaEngine5 is NOT in the last commit - FAIL
-    echo Cleaning UnrealEngine5 build...
-    git clean -fdx
-    echo Pulling last UnrealEngine5 changes...
-    git pull
-fi
-echo "Setup CARLA UnrealEngine5..."
-./Setup.sh --force
-echo "GenerateProjectFiles CARLA UnrealEngine5..."
-./GenerateProjectFiles.sh
-echo "Build CARLA UnrealEngine5..."
-make
-popd
-popd
 
 echo "Configuring CARLA..."
-retry --until=success --times=10 -- cmake -G Ninja -S . -B Build \
+cmake -G Ninja -S . -B Build \
     --toolchain=$PWD/CMake/LinuxToolchain.cmake \
     -DLAUNCH_ARGS="-prefernvidia" \
     -DCMAKE_BUILD_TYPE=Release \
@@ -158,11 +103,13 @@ retry --until=success --times=10 -- cmake -G Ninja -S . -B Build \
     -DBUILD_CARLA_UNREAL=ON \
     -DCARLA_UNREAL_ENGINE_PATH=$CARLA_UNREAL_ENGINE_PATH
 echo "Building CARLA..."
-retry --until=success --times=10 -- cmake --build Build
-echo "Installing PythonAPI..."
+cmake --build Build
+echo "Building + installing Python API..."
 cmake --build Build --target carla-python-api-install
-echo "Waitting for Content to be downloaded... (see the progres in ContentClone.log)"
+echo "Waiting for Content to finish downloading..."
 wait #Waitting for content
-echo "Instalation and build succesfull! :)"
-echo "Lauching Carla with Unreal Editor..."
-cmake --build Build --target launch
+echo "Installation and build successful."
+if [ $launch -eq 1 ]; then
+    echo "Launching Carla - Unreal Editor..."
+    cmake --build Build --target launch
+fi
\ No newline at end of file
diff --git a/Util/SetupUtils/InstallPrerequisites.sh b/Util/SetupUtils/InstallPrerequisites.sh
new file mode 100644
index 000000000..ee8dc4076
--- /dev/null
+++ b/Util/SetupUtils/InstallPrerequisites.sh
@@ -0,0 +1,88 @@
+#!/bin/bash
+
+set -e
+
+if [ -z "$EUID" ]; then
+    EUID=$(id -u)
+fi
+
+if [ "$EUID" -ne 0 ]; then
+    echo "Please run this script as root."
+    exit 1
+fi
+
+echo "Installing Ubuntu Packages..."
+if ! command -v retry &> /dev/null
+then
+    apt update
+    apt-get install retry
+fi
+retry --until=success --times=12 --delay=300 -- apt-get update
+retry --until=success --times=12 --delay=300 -- apt-get -y install \
+    build-essential \
+    g++-12 \
+    gcc-12 \
+    make \
+    ninja-build \
+    libvulkan1 \
+    python3 \
+    python3-dev \
+    python3-pip \
+    libpng-dev \
+    libtiff5-dev \
+    libjpeg-dev \
+    tzdata \
+    sed \
+    curl \
+    libtool \
+    rsync \
+    libxml2-dev \
+    git \
+    git-lfs
+
+echo "Installing Python Packages..."
+pip3 install --upgrade pip
+pip3 install -r requirements.txt
+
+echo "Cloning CARLA Content asynchronously... (see progress in ContentClone.log)"
+mkdir -p Unreal/CarlaUnreal/Content
+git -C Unreal/CarlaUnreal/Content clone -b ue5-dev https://bitbucket.org/carla-simulator/carla-content.git Carla &> ContentClone.log&
+
+check_cmake_version() {
+    CMAKE_VERSION="$($2 --version | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+')"
+    CMAKE_MINIMUM_VERSION=$1
+    MAJOR="${CMAKE_VERSION%%.*}"
+    REMAINDER="${CMAKE_VERSION#*.}"
+    MINOR="${REMAINDER%.*}"
+    REVISION="${REMAINDER#*.}"
+    MINIMUM_MAJOR="${CMAKE_MINIMUM_VERSION%%.*}"
+    MINIMUM_REMAINDER="${CMAKE_MINIMUM_VERSION#*.}"
+    MINIMUM_MINOR="${MINIMUM_REMAINDER%.*}"
+
+    if [ -z "$CMAKE_VERSION" ]; then
+        false
+    else
+        if [ $MAJOR -gt $MINIMUM_MAJOR ] || ([ $MAJOR -eq $MINIMUM_MAJOR ] && ([ $MINOR -gt $MINIMUM_MINOR ] || [ $MINOR -eq $MINIMUM_MINOR ])); then
+            true
+        else
+            false
+        fi
+    fi
+}
+
+CMAKE_MINIMUM_VERSION=3.28.0
+if (check_cmake_version $CMAKE_MINIMUM_VERSION cmake) || (check_cmake_version $CMAKE_MINIMUM_VERSION /opt/cmake-3.28.3-linux-x86_64/bin/cmake); then
+    echo "Found CMake $CMAKE_MINIMUM_VERSION"
+else
+    echo "Could not find CMake >=$CMAKE_MINIMUM_VERSION."
+    echo "Installing CMake 3.28.3..."
+    curl -L -O https://github.com/Kitware/CMake/releases/download/v3.28.3/cmake-3.28.3-linux-x86_64.tar.gz
+    mkdir -p /opt
+    tar -xzf cmake-3.28.3-linux-x86_64.tar.gz -C /opt
+    if [[ ":$PATH:" != *":/opt/cmake-3.28.3-linux-x86_64/bin:"* ]]; then
+        echo -e '\n#CARLA CMake 3.28.3\nPATH=/opt/cmake-3.28.3-linux-x86_64/bin:$PATH' >> ~/.bashrc
+        export PATH=/opt/cmake-3.28.3-linux-x86_64/bin:$PATH
+    fi
+    rm -rf cmake-3.28.3-linux-x86_64.tar.gz
+    echo "Installed CMake 3.28.3."
+fi