diff --git a/Core/GameEngine/Include/Common/GameCommon.h b/Core/GameEngine/Include/Common/GameCommon.h
index 1e7c224fd5a..62c6c3429f0 100644
--- a/Core/GameEngine/Include/Common/GameCommon.h
+++ b/Core/GameEngine/Include/Common/GameCommon.h
@@ -47,8 +47,6 @@
 
 #pragma once
 
-#define DONT_ALLOW_DEBUG_CHEATS_IN_RELEASE ///< Take of the DONT to get cheats back in to release
-
 //#define _CAMPEA_DEMO
 
 // ----------------------------------------------------------------------------------------------
diff --git a/cmake/config-debug.cmake b/cmake/config-debug.cmake
index e9bb8f3ece9..13eececeeb8 100644
--- a/cmake/config-debug.cmake
+++ b/cmake/config-debug.cmake
@@ -10,6 +10,7 @@ set_property(CACHE RTS_DEBUG_STACKTRACE PROPERTY STRINGS DEFAULT ON OFF)
 set(RTS_DEBUG_PROFILE "DEFAULT" CACHE STRING "Enables debug profiling. When DEFAULT, this option is enabled with DEBUG or INTERNAL")
 set_property(CACHE RTS_DEBUG_PROFILE PROPERTY STRINGS DEFAULT ON OFF)
 
+option(RTS_DEBUG_CHEATS "Enables debug cheats in release builds" OFF)
 option(RTS_DEBUG_INCLUDE_DEBUG_LOG_IN_CRC_LOG "Includes normal debug log in crc log" OFF)
 option(RTS_DEBUG_MULTI_INSTANCE "Enables multi client instance support" OFF)
 
@@ -35,10 +36,15 @@ define_debug_option(RTS_DEBUG_CRASHING   DEBUG_CRASHING   DISABLE_DEBUG_CRASHING
 define_debug_option(RTS_DEBUG_STACKTRACE DEBUG_STACKTRACE DISABLE_DEBUG_STACKTRACE DebugStacktrace "Build with Debug Stacktracing")
 define_debug_option(RTS_DEBUG_PROFILE    DEBUG_PROFILE    DISABLE_DEBUG_PROFILE    DebugProfile    "Build with Debug Profiling")
 
+add_feature_info(DebugCheats RTS_DEBUG_CHEATS "Build with Debug Cheats in release builds")
 add_feature_info(DebugIncludeDebugLogInCrcLog RTS_DEBUG_INCLUDE_DEBUG_LOG_IN_CRC_LOG "Build with Debug Logging in CRC log")
 add_feature_info(DebugMultiInstance RTS_DEBUG_MULTI_INSTANCE "Build with Multi Client Instance support")
 
 
+if(RTS_DEBUG_CHEATS)
+    target_compile_definitions(core_config INTERFACE _ALLOW_DEBUG_CHEATS_IN_RELEASE)
+endif()
+
 if(RTS_DEBUG_INCLUDE_DEBUG_LOG_IN_CRC_LOG)
     target_compile_definitions(core_config INTERFACE INCLUDE_DEBUG_LOG_IN_CRC_LOG)
 endif()