diff --git a/resources/data/core-project/re.yml b/resources/data/core-project/re.yml
index 8bdfc04..b17af38 100644
--- a/resources/data/core-project/re.yml
+++ b/resources/data/core-project/re.yml
@@ -150,13 +150,10 @@ cxxenv.msvc|clang-cl:
 
             msvc.whole-program-optimization: true
 
-    config.release.debinfo:
-        cxx-build-options:
             build-debug-info: true
 
     config.debug:
         cxx-build-options:
-            build-debug-info: true
             msvc.runtime-library: multithreaded-dll-debug
 
     cxx-build-options:
diff --git a/resources/data/environments/cxx/clang-cl.yml b/resources/data/environments/cxx/clang-cl.yml
index f8adf75..9d81d99 100644
--- a/resources/data/environments/cxx/clang-cl.yml
+++ b/resources/data/environments/cxx/clang-cl.yml
@@ -120,6 +120,10 @@ build-options:
 
     build-debug-info:
         true:
+            compiler: [/Z7]
+        embedded:
+            compiler: [/Z7]
+        separate:
             compiler: [/Zi]
 
     build-link-debug-info:
diff --git a/resources/data/environments/cxx/msvc.yml b/resources/data/environments/cxx/msvc.yml
index 131be51..b820333 100644
--- a/resources/data/environments/cxx/msvc.yml
+++ b/resources/data/environments/cxx/msvc.yml
@@ -120,6 +120,10 @@ build-options:
 
     build-debug-info:
         true:
+            compiler: [/Z7]
+        embedded:
+            compiler: [/Z7]
+        separate:
             compiler: [/Zi]
 
     build-link-debug-info: