diff --git a/BUILD.md b/BUILD.md
index 7866bbbe7a..6231d5e585 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -132,7 +132,7 @@ The following build options can be used when running CMake
 ### Developer Build Options
 
 * OVERTE_RENDERING_BACKEND
-* DISABLE_UI
+* OVERTE_DISABLE_QML
 
 ### Devices
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index adf8c81177..c6dd99eee6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -124,6 +124,7 @@ set(OVERTE_BUILD_TESTS OFF CACHE BOOL "Build tests.")
 set(OVERTE_BUILD_MANUAL_TESTS OFF CACHE BOOL "Build manual tests.")
 set(OVERTE_BUILD_TOOLS ON CACHE BOOL "Build tools. Includes Oven, which is used for some server functionality.")
 set(OVERTE_BUILD_INSTALLER ON CACHE BOOL "Build installer.")
+set(OVERTE_DISABLE_QML OFF CACHE BOOL "Build without QML. (For graphics debugging.)")
 # use OpenGL ES on Linux aarch64 and Android.
 if ((CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") OR ANDROID)
     set(OVERTE_RENDERING_BACKEND "GLES" CACHE STRING "Which rendering backend to compile with. Valid options are: 'OpenGL', 'GLES', and 'Vulkan'.")
@@ -135,7 +136,6 @@ set(OVERTE_TIMESERVER_URL "http://timestamp.comodoca.com?td=sha256" CACHE STRING
 
 
 set(HIFI_USE_OPTIMIZED_IK_OPTION OFF)
-set(DISABLE_QML_OPTION OFF)
 set(DOWNLOAD_SERVERLESS_CONTENT_OPTION OFF)
 set(OVERTE_BACKTRACE_URL "" CACHE STRING "URL to an endpoint for uploading crash-dumps. For example Sentry.")
 set(OVERTE_BACKTRACE_TOKEN "" CACHE STRING "Token used to identify with release or build is uploading crash-dumps.")
@@ -181,7 +181,6 @@ endif()
 
 option(HIFI_USE_OPTIMIZED_IK "Use optimized IK" ${HIFI_USE_OPTIMIZED_IK_OPTION})
 option(USE_KHR_ROBUSTNESS "Use KHR_robustness" OFF)
-option(DISABLE_QML "Disable QML" ${DISABLE_QML_OPTION})
 option(DISABLE_KTX_CACHE "Disable KTX Cache" OFF)
 option(
   DOWNLOAD_SERVERLESS_CONTENT
@@ -222,9 +221,9 @@ message(STATUS "Build installer:       " ${OVERTE_BUILD_INSTALLER})
 message(STATUS "Rendering backend:     " ${OVERTE_RENDERING_BACKEND})
 MESSAGE(STATUS "DL serverless content: " ${DOWNLOAD_SERVERLESS_CONTENT})
 
-if (DISABLE_QML)
-  MESSAGE(STATUS "QML disabled!")
-  add_definitions(-DDISABLE_QML)
+if (OVERTE_DISABLE_QML)
+    message(STATUS "QML disabled!")
+    add_definitions(-DDISABLE_QML)
 endif()
 
 if (DISABLE_KTX_CACHE)