diff --git a/azure-pipelines/templates/release.yml b/azure-pipelines/templates/release.yml
index 8a666ad5a8..f6a00b7cf2 100644
--- a/azure-pipelines/templates/release.yml
+++ b/azure-pipelines/templates/release.yml
@@ -91,7 +91,7 @@ jobs:
       VcpkgTargetTriplet: $(VcpkgTargetTriplet)
       BuildConfiguration: 'RelWithDebInfo'
       ${{ if eq(parameters.IsStableRelease, true) }}:
-        OptionUseNSIS: "YES"
+        OptionUseNSIS: "ON"
   - task: VSBuild@1
     displayName: 'Create bundles'
     inputs:
diff --git a/azure-pipelines/templates/windows-build.yml b/azure-pipelines/templates/windows-build.yml
index 07e42a7cee..ae3b894144 100644
--- a/azure-pipelines/templates/windows-build.yml
+++ b/azure-pipelines/templates/windows-build.yml
@@ -2,7 +2,7 @@ parameters:
   BuildArch: ''
   VcpkgTargetTriplet: ''
   BuildConfiguration: ''
-  OptionUseNSIS: 'NO'
+  OptionUseNSIS: 'OFF'
 
 steps:
 - task: CMake@1
diff --git a/cmake/Options.cmake b/cmake/Options.cmake
index 51c8b78860..0e8063fac0 100644
--- a/cmake/Options.cmake
+++ b/cmake/Options.cmake
@@ -41,16 +41,16 @@ endfunction()
 #
 function(set_options)
     if (UNIX AND NOT APPLE)
-        set(DEFAULT_OPTION_INSTALL_FHS YES)
+        set(DEFAULT_OPTION_INSTALL_FHS ON)
     else (UNIX AND NOT APPLE)
-        set(DEFAULT_OPTION_INSTALL_FHS NO)
+        set(DEFAULT_OPTION_INSTALL_FHS OFF)
     endif (UNIX AND NOT APPLE)
 
-    option(OPTION_DEDICATED "Build dedicated server only (no GUI)" NO)
+    option(OPTION_DEDICATED "Build dedicated server only (no GUI)" OFF)
     option(OPTION_INSTALL_FHS "Install with Filesstem Hierarchy Standard folders" ${DEFAULT_OPTION_INSTALL_FHS})
-    option(OPTION_USE_ASSERTS "Use assertions; leave enabled for nightlies, betas, and RCs" YES)
-    option(OPTION_USE_THREADS "Use threads" YES)
-    option(OPTION_USE_NSIS "Use NSIS to create windows installer; enable only for stable releases" NO)
+    option(OPTION_USE_ASSERTS "Use assertions; leave enabled for nightlies, betas, and RCs" ON)
+    option(OPTION_USE_THREADS "Use threads" ON)
+    option(OPTION_USE_NSIS "Use NSIS to create windows installer; enable only for stable releases" OFF)
 endfunction()
 
 # Show the values of the generic options.