diff --git a/Tools/build.py b/Tools/build.py
index 026f1e0c..ee3dbac8 100755
--- a/Tools/build.py
+++ b/Tools/build.py
@@ -46,16 +46,17 @@ def execute(
     # temporary files in the build directory.
     clean_build_dir(build_config.build_folder)
 
+    # Build Godot Wallpaper
+    # Note: This must happen before building ScreenPlay!
+    if platform.system() == "Windows" and build_config.build_godot == "ON":
+        build_godot.build_godot(str(build_config.bin_dir), build_config.build_type)
+
     # Runs cmake configure and cmake build
     step_time = time.time()
     build_result = build(build_config, build_result)
     build_duration = time.time() - step_time
     print(f"⏱️ build_duration: {build_duration}s")
 
-    # Build Godot Wallpaper
-    if platform.system() == "Windows":
-        build_godot.build_godot(str(build_config.bin_dir), build_config.build_type)
-
     # Copies all needed libraries and assets into the bin folder
     step_time = time.time()
     package(build_config)
@@ -180,6 +181,7 @@ def build(build_config: BuildConfig, build_result: BuildResult) -> BuildResult:
 	-DSCREENPLAY_STEAM={build_config.build_steam} \
 	-DSCREENPLAY_TESTS={build_config.build_tests} \
 	-DSCREENPLAY_DEPLOY={build_config.build_deploy} \
+	-DSCREENPLAY_GODOT={build_config.build_godot} \
 	-DSCREENPLAY_INSTALLER={build_config.create_installer} \
 	-DSCREENPLAY_IFW_ROOT:STRING={build_config.ifw_root_path} \
     -G "Ninja" \
@@ -360,6 +362,7 @@ if __name__ == "__main__":
                         help="Create a deploy version of ScreenPlay for sharing with the world. A not deploy version is for local development only!")
     parser.add_argument('--architecture', action="store", dest="build_architecture", default="",
                         help="Sets the build architecture. Used to build x86 and ARM osx versions. Currently only works with x86_64 and arm64")
+    parser.add_argument('--build-godot', action="store", dest="build_godot", default="", help="Builds the Godot Wallpaper")
     args = parser.parse_args()
 
     qt_version = defines.QT_VERSION
@@ -403,6 +406,10 @@ if __name__ == "__main__":
     if args.build_deploy:
         build_deploy = "ON"
 
+    build_godot = "OFF"
+    if args.build_godot:
+        build_godot = "ON"
+
     create_installer = "OFF"
     if args.create_installer:
         create_installer = "ON"
@@ -419,6 +426,7 @@ if __name__ == "__main__":
     build_config.build_steam = build_steam
     build_config.build_tests = build_tests
     build_config.build_deploy = build_deploy
+    build_config.build_godot = build_godot
     build_config.create_installer = create_installer
     build_config.build_type = build_type
     build_config.screenplay_version = screenplay_version
diff --git a/Tools/defines.py b/Tools/defines.py
index dd47f09c..362a0fe7 100644
--- a/Tools/defines.py
+++ b/Tools/defines.py
@@ -37,7 +37,7 @@ VCPKG_BASE_PACKAGES =  [
 PYTHON_EXECUTABLE = "python" if sys.platform == "win32" else "python3"
 FFMPEG_VERSION = "6.0"
 GODOT_VERSION = "4.2"
-GODOT_RELEASE_TYPE = "beta4"
+GODOT_RELEASE_TYPE = "beta5"
 GODOT_DOWNLOAD_SERVER = "https://downloads.tuxfamily.org/godotengine"
 if sys.platform == "win32":
     SCREENPLAYWALLPAPER_GODOT_EXECUTABLE = "ScreenPlayWallpaperGodot.exe"
diff --git a/Tools/setup.py b/Tools/setup.py
index e935be75..89fdaa1d 100755
--- a/Tools/setup.py
+++ b/Tools/setup.py
@@ -106,8 +106,10 @@ def setup_qt():
 def main():
     parser = argparse.ArgumentParser(
         description='Build and Package ScreenPlay')
-    parser.add_argument('-skip-aqt', action="store_true", dest="skip_aqt",
+    parser.add_argument('--skip-aqt', action="store_true", dest="skip_aqt",
                         help="Downloads QtCreator and needed binaries \Windows: C:\aqt\nLinux & macOS:~/aqt/.")
+    parser.add_argument('--setup-godot', action="store_true", dest="setup_godot",
+                        help="Downloads Godot Editor.")
     args = parser.parse_args()
 
     root_path = Path(util.cd_repo_root_path())
@@ -115,7 +117,7 @@ def main():
     vcpkg_path = project_source_parent_path.joinpath("vcpkg").resolve()
     vcpkg_packages_list = defines.VCPKG_BASE_PACKAGES
 
-    if system() == "Windows":
+    if system() == "Windows" and args.setup_godot:
         if not setup_godot.execute():
             raise RuntimeError("Unable to download godot")
 
diff --git a/Tools/setup_godot.py b/Tools/setup_godot.py
index 24150ee9..d8c39d7b 100644
--- a/Tools/setup_godot.py
+++ b/Tools/setup_godot.py
@@ -102,8 +102,8 @@ def execute() -> bool:
 
     # Check if Godot executable already exists
     for file in godot_path.iterdir():
-        if defines.GODOT_VERSION in str(file):
-            print(f"Godot v{defines.GODOT_VERSION} already exists.")
+        if defines.GODOT_EDITOR_EXECUTABLE in str(file):
+            print(f"Godot v{defines.GODOT_EDITOR_EXECUTABLE} already exists.")
             return True
         
     return setup_godot()