diff --git a/fuzzers/binary_only/frida_executable_libpng/Makefile.toml b/fuzzers/binary_only/frida_executable_libpng/Makefile.toml
index ae798ed011..8cc7ee95f1 100644
--- a/fuzzers/binary_only/frida_executable_libpng/Makefile.toml
+++ b/fuzzers/binary_only/frida_executable_libpng/Makefile.toml
@@ -4,7 +4,7 @@ CARGO_TARGET_DIR = { value = "target", condition = { env_not_set = [
   "CARGO_TARGET_DIR",
 ] } }
 PROFILE = { value = "release", condition = { env_not_set = ["PROFILE"] } }
-PROFILE_DIR = { value = "release", condition = { env_not_set = [
+PROFILE_DIR = { source = "${PROFILE}", default_value = "release", mapping = { "release" = "release", "dev" = "debug" }, condition = { env_not_set = [
   "PROFILE_DIR",
 ] } }
 
diff --git a/fuzzers/binary_only/frida_libpng/Makefile.toml b/fuzzers/binary_only/frida_libpng/Makefile.toml
index 9359fbfe6d..a4ea584847 100644
--- a/fuzzers/binary_only/frida_libpng/Makefile.toml
+++ b/fuzzers/binary_only/frida_libpng/Makefile.toml
@@ -5,7 +5,7 @@ CARGO_TARGET_DIR = { value = "target", condition = { env_not_set = [
 ] } }
 FUZZER_NAME = { source = "${CARGO_MAKE_RUST_TARGET_OS}", default_value = "frida_fuzzer", mapping = { "linux" = "frida_fuzzer", "macos" = "frida_fuzzer", "windows" = "frida_fuzzer.exe" } }
 PROFILE = { value = "release", condition = { env_not_set = ["PROFILE"] } }
-PROFILE_DIR = { value = "release", condition = { env_not_set = [
+PROFILE_DIR = { source = "${PROFILE}", default_value = "release", mapping = { "release" = "release", "dev" = "debug" }, condition = { env_not_set = [
   "PROFILE_DIR",
 ] } }
 
diff --git a/fuzzers/binary_only/frida_windows_gdiplus/Makefile.toml b/fuzzers/binary_only/frida_windows_gdiplus/Makefile.toml
index 86fe3de52c..f8cb981ab3 100644
--- a/fuzzers/binary_only/frida_windows_gdiplus/Makefile.toml
+++ b/fuzzers/binary_only/frida_windows_gdiplus/Makefile.toml
@@ -5,7 +5,7 @@ CARGO_TARGET_DIR = { value = "target", condition = { env_not_set = [
 ] } }
 FUZZER_NAME = { source = "${CARGO_MAKE_RUST_TARGET_OS}", default_value = "frida_windows_gdiplus", mapping = { "linux" = "frida_windows_gdiplus", "macos" = "frida_windows_gdiplus", "windows" = "frida_windows_gdiplus.exe" } }
 PROFILE = { value = "release", condition = { env_not_set = ["PROFILE"] } }
-PROFILE_DIR = { value = "release", condition = { env_not_set = [
+PROFILE_DIR = { source = "${PROFILE}", default_value = "release", mapping = { "release" = "release", "dev" = "debug" }, condition = { env_not_set = [
   "PROFILE_DIR",
 ] } }
 
diff --git a/fuzzers/binary_only/fuzzbench_qemu/Makefile.toml b/fuzzers/binary_only/fuzzbench_qemu/Makefile.toml
index 4a53108b56..1ebe6632bb 100644
--- a/fuzzers/binary_only/fuzzbench_qemu/Makefile.toml
+++ b/fuzzers/binary_only/fuzzbench_qemu/Makefile.toml
@@ -3,7 +3,7 @@
 FUZZER_NAME = 'harness'
 PROJECT_DIR = { script = ["pwd"] }
 PROFILE = { value = "release", condition = { env_not_set = ["PROFILE"] } }
-PROFILE_DIR = { value = "release", condition = { env_not_set = [
+PROFILE_DIR = { source = "${PROFILE}", default_value = "release", mapping = { "release" = "release", "dev" = "debug" }, condition = { env_not_set = [
   "PROFILE_DIR",
 ] } }
 TARGET_DIR = "${CARGO_MAKE_CRATE_TARGET_DIRECTORY}"
diff --git a/fuzzers/binary_only/qemu_cmin/Makefile.toml b/fuzzers/binary_only/qemu_cmin/Makefile.toml
index 8fa6d1fa1a..2b292c0505 100644
--- a/fuzzers/binary_only/qemu_cmin/Makefile.toml
+++ b/fuzzers/binary_only/qemu_cmin/Makefile.toml
@@ -1,6 +1,6 @@
 [env]
 PROFILE = { value = "release", condition = { env_not_set = ["PROFILE"] } }
-PROFILE_DIR = { value = "release", condition = { env_not_set = [
+PROFILE_DIR = { source = "${PROFILE}", default_value = "release", mapping = { "release" = "release", "dev" = "debug" }, condition = { env_not_set = [
   "PROFILE_DIR",
 ] } }
 CROSS_CC = "x86_64-linux-gnu-gcc"
diff --git a/fuzzers/binary_only/qemu_coverage/Makefile.toml b/fuzzers/binary_only/qemu_coverage/Makefile.toml
index 6a37aaa315..97b30e62d0 100644
--- a/fuzzers/binary_only/qemu_coverage/Makefile.toml
+++ b/fuzzers/binary_only/qemu_coverage/Makefile.toml
@@ -1,6 +1,6 @@
 [env]
 PROFILE = { value = "release", condition = { env_not_set = ["PROFILE"] } }
-PROFILE_DIR = { value = "release", condition = { env_not_set = [
+PROFILE_DIR = { source = "${PROFILE}", default_value = "release", mapping = { "release" = "release", "dev" = "debug" }, condition = { env_not_set = [
   "PROFILE_DIR",
 ] } }
 CROSS_CC = "x86_64-linux-gnu-gcc"
diff --git a/fuzzers/binary_only/qemu_launcher/Makefile.toml b/fuzzers/binary_only/qemu_launcher/Makefile.toml
index 7d795cf51b..5abd78d8ec 100644
--- a/fuzzers/binary_only/qemu_launcher/Makefile.toml
+++ b/fuzzers/binary_only/qemu_launcher/Makefile.toml
@@ -1,6 +1,6 @@
 [env]
 PROFILE = { value = "release", condition = { env_not_set = ["PROFILE"] } }
-PROFILE_DIR = { value = "release", condition = { env_not_set = [
+PROFILE_DIR = { source = "${PROFILE}", default_value = "release", mapping = { "release" = "release", "dev" = "debug" }, condition = { env_not_set = [
   "PROFILE_DIR",
 ] } }
 CROSS_CC = "x86_64-linux-gnu-gcc"
diff --git a/fuzzers/binary_only/tinyinst_simple/Makefile.toml b/fuzzers/binary_only/tinyinst_simple/Makefile.toml
index 26a9261c05..68fa085a01 100644
--- a/fuzzers/binary_only/tinyinst_simple/Makefile.toml
+++ b/fuzzers/binary_only/tinyinst_simple/Makefile.toml
@@ -1,6 +1,6 @@
 [env]
 PROFILE = { value = "release", condition = { env_not_set = ["PROFILE"] } }
-PROFILE_DIR = { value = "release", condition = { env_not_set = [
+PROFILE_DIR = { source = "${PROFILE}", default_value = "release", mapping = { "release" = "release", "dev" = "debug" }, condition = { env_not_set = [
   "PROFILE_DIR",
 ] } }
 CARGO_TARGET_DIR = { value = "target", condition = { env_not_set = [
diff --git a/fuzzers/forkserver/forkserver_libafl_cc/Makefile.toml b/fuzzers/forkserver/forkserver_libafl_cc/Makefile.toml
index 3d41c8b342..bb04c5338e 100644
--- a/fuzzers/forkserver/forkserver_libafl_cc/Makefile.toml
+++ b/fuzzers/forkserver/forkserver_libafl_cc/Makefile.toml
@@ -5,7 +5,7 @@ CARGO_TARGET_DIR = { value = "${PROJECT_DIR}/target", condition = { env_not_set
   "CARGO_TARGET_DIR",
 ] } }
 PROFILE = { value = "release", condition = { env_not_set = ["PROFILE"] } }
-PROFILE_DIR = { value = "release", condition = { env_not_set = [
+PROFILE_DIR = { source = "${PROFILE}", default_value = "release", mapping = { "release" = "release", "dev" = "debug" }, condition = { env_not_set = [
   "PROFILE_DIR",
 ] } }
 LIBAFL_CC = '${CARGO_TARGET_DIR}/${PROFILE_DIR}/libafl_cc'
diff --git a/fuzzers/forkserver/libafl-fuzz/Makefile.toml b/fuzzers/forkserver/libafl-fuzz/Makefile.toml
index 21829a21e2..15264bccf3 100644
--- a/fuzzers/forkserver/libafl-fuzz/Makefile.toml
+++ b/fuzzers/forkserver/libafl-fuzz/Makefile.toml
@@ -4,7 +4,7 @@ CARGO_TARGET_DIR = { value = "${PROJECT_DIR}/target", condition = { env_not_set
   "CARGO_TARGET_DIR",
 ] } }
 PROFILE = { value = "release", condition = { env_not_set = ["PROFILE"] } }
-PROFILE_DIR = { value = "release", condition = { env_not_set = [
+PROFILE_DIR = { source = "${PROFILE}", default_value = "release", mapping = { "release" = "release", "dev" = "debug" }, condition = { env_not_set = [
   "PROFILE_DIR",
 ] } }
 FUZZER_NAME = 'libafl-fuzz'
diff --git a/fuzzers/fuzz_anything/baby_no_std/Makefile.toml b/fuzzers/fuzz_anything/baby_no_std/Makefile.toml
index 28c9951b7a..2c31821d18 100644
--- a/fuzzers/fuzz_anything/baby_no_std/Makefile.toml
+++ b/fuzzers/fuzz_anything/baby_no_std/Makefile.toml
@@ -2,7 +2,7 @@
 FUZZER_NAME = "fuzzer"
 PROJECT_DIR = { script = ["pwd"] }
 PROFILE = { value = "release", condition = { env_not_set = ["PROFILE"] } }
-PROFILE_DIR = { value = "release", condition = { env_not_set = [
+PROFILE_DIR = { source = "${PROFILE}", default_value = "release", mapping = { "release" = "release", "dev" = "debug" }, condition = { env_not_set = [
   "PROFILE_DIR",
 ] } }
 
diff --git a/fuzzers/inprocess/dynamic_analysis/Makefile.toml b/fuzzers/inprocess/dynamic_analysis/Makefile.toml
index 6c6a7568c8..ec5d74e0e4 100644
--- a/fuzzers/inprocess/dynamic_analysis/Makefile.toml
+++ b/fuzzers/inprocess/dynamic_analysis/Makefile.toml
@@ -5,7 +5,7 @@ CARGO_TARGET_DIR = { value = "${PROJECT_DIR}/target", condition = { env_not_set
 ] } }
 FUZZER_NAME = "fuzzer"
 PROFILE = { value = "release", condition = { env_not_set = ["PROFILE"] } }
-PROFILE_DIR = { value = "release", condition = { env_not_set = [
+PROFILE_DIR = { source = "${PROFILE}", default_value = "release", mapping = { "release" = "release", "dev" = "debug" }, condition = { env_not_set = [
   "PROFILE_DIR",
 ] } }
 
diff --git a/fuzzers/inprocess/fuzzbench/Makefile.toml b/fuzzers/inprocess/fuzzbench/Makefile.toml
index 7e668a1e39..47b59c49b0 100644
--- a/fuzzers/inprocess/fuzzbench/Makefile.toml
+++ b/fuzzers/inprocess/fuzzbench/Makefile.toml
@@ -5,7 +5,7 @@ CARGO_TARGET_DIR = { value = "${PROJECT_DIR}/target", condition = { env_not_set
 ] } }
 FUZZER_NAME = "fuzzer"
 PROFILE = { value = "release", condition = { env_not_set = ["PROFILE"] } }
-PROFILE_DIR = { value = "release", condition = { env_not_set = [
+PROFILE_DIR = { source = "${PROFILE}", default_value = "release", mapping = { "release" = "release", "dev" = "debug" }, condition = { env_not_set = [
   "PROFILE_DIR",
 ] } }
 
diff --git a/fuzzers/inprocess/fuzzbench_ctx/Makefile.toml b/fuzzers/inprocess/fuzzbench_ctx/Makefile.toml
index 7e668a1e39..47b59c49b0 100644
--- a/fuzzers/inprocess/fuzzbench_ctx/Makefile.toml
+++ b/fuzzers/inprocess/fuzzbench_ctx/Makefile.toml
@@ -5,7 +5,7 @@ CARGO_TARGET_DIR = { value = "${PROJECT_DIR}/target", condition = { env_not_set
 ] } }
 FUZZER_NAME = "fuzzer"
 PROFILE = { value = "release", condition = { env_not_set = ["PROFILE"] } }
-PROFILE_DIR = { value = "release", condition = { env_not_set = [
+PROFILE_DIR = { source = "${PROFILE}", default_value = "release", mapping = { "release" = "release", "dev" = "debug" }, condition = { env_not_set = [
   "PROFILE_DIR",
 ] } }
 
diff --git a/fuzzers/inprocess/fuzzbench_text/Makefile.toml b/fuzzers/inprocess/fuzzbench_text/Makefile.toml
index 8b9008ab79..aa9757af28 100644
--- a/fuzzers/inprocess/fuzzbench_text/Makefile.toml
+++ b/fuzzers/inprocess/fuzzbench_text/Makefile.toml
@@ -5,7 +5,7 @@ CARGO_TARGET_DIR = { value = "${PROJECT_DIR}/target", condition = { env_not_set
 ] } }
 FUZZER_NAME = "fuzzer"
 PROFILE = { value = "release", condition = { env_not_set = ["PROFILE"] } }
-PROFILE_DIR = { value = "release", condition = { env_not_set = [
+PROFILE_DIR = { source = "${PROFILE}", default_value = "release", mapping = { "release" = "release", "dev" = "debug" }, condition = { env_not_set = [
   "PROFILE_DIR",
 ] } }
 
diff --git a/fuzzers/inprocess/libfuzzer_libmozjpeg/Makefile.toml b/fuzzers/inprocess/libfuzzer_libmozjpeg/Makefile.toml
index 2da143627f..d74d288058 100644
--- a/fuzzers/inprocess/libfuzzer_libmozjpeg/Makefile.toml
+++ b/fuzzers/inprocess/libfuzzer_libmozjpeg/Makefile.toml
@@ -5,7 +5,7 @@ CARGO_TARGET_DIR = { value = "${PROJECT_DIR}/target", condition = { env_not_set
   "CARGO_TARGET_DIR",
 ] } }
 PROFILE = { value = "release", condition = { env_not_set = ["PROFILE"] } }
-PROFILE_DIR = { value = "release", condition = { env_not_set = [
+PROFILE_DIR = { source = "${PROFILE}", default_value = "release", mapping = { "release" = "release", "dev" = "debug" }, condition = { env_not_set = [
   "PROFILE_DIR",
 ] } }
 LIBAFL_CC = '${CARGO_TARGET_DIR}/${PROFILE_DIR}/libafl_cc'
diff --git a/fuzzers/inprocess/libfuzzer_libpng/Makefile.toml b/fuzzers/inprocess/libfuzzer_libpng/Makefile.toml
index 9b7c61978e..7b0c8d0213 100644
--- a/fuzzers/inprocess/libfuzzer_libpng/Makefile.toml
+++ b/fuzzers/inprocess/libfuzzer_libpng/Makefile.toml
@@ -6,7 +6,7 @@ CARGO_TARGET_DIR = { value = "${PROJECT_DIR}/target", condition = { env_not_set
   "CARGO_TARGET_DIR",
 ] } }
 PROFILE = { value = "release", condition = { env_not_set = ["PROFILE"] } }
-PROFILE_DIR = { value = "release", condition = { env_not_set = [
+PROFILE_DIR = { source = "${PROFILE}", default_value = "release", mapping = { "release" = "release", "dev" = "debug" }, condition = { env_not_set = [
   "PROFILE_DIR",
 ] } }
 LIBAFL_CC = '${CARGO_TARGET_DIR}/${PROFILE_DIR}/libafl_cc'
diff --git a/fuzzers/inprocess/libfuzzer_libpng_accounting/Makefile.toml b/fuzzers/inprocess/libfuzzer_libpng_accounting/Makefile.toml
index 20e0642934..d928de5bbc 100644
--- a/fuzzers/inprocess/libfuzzer_libpng_accounting/Makefile.toml
+++ b/fuzzers/inprocess/libfuzzer_libpng_accounting/Makefile.toml
@@ -4,7 +4,7 @@ CARGO_TARGET_DIR = { value = "${PROJECT_DIR}/target", condition = { env_not_set
   "CARGO_TARGET_DIR",
 ] } }
 PROFILE = { value = "release", condition = { env_not_set = ["PROFILE"] } }
-PROFILE_DIR = { value = "release", condition = { env_not_set = [
+PROFILE_DIR = { source = "${PROFILE}", default_value = "release", mapping = { "release" = "release", "dev" = "debug" }, condition = { env_not_set = [
   "PROFILE_DIR",
 ] } }
 FUZZER_NAME = 'fuzzer_libpng_accounting'
diff --git a/fuzzers/inprocess/libfuzzer_libpng_centralized/Makefile.toml b/fuzzers/inprocess/libfuzzer_libpng_centralized/Makefile.toml
index a7092a97a3..12434f52c0 100644
--- a/fuzzers/inprocess/libfuzzer_libpng_centralized/Makefile.toml
+++ b/fuzzers/inprocess/libfuzzer_libpng_centralized/Makefile.toml
@@ -5,7 +5,7 @@ CARGO_TARGET_DIR = { value = "${PROJECT_DIR}/target", condition = { env_not_set
   "CARGO_TARGET_DIR",
 ] } }
 PROFILE = { value = "release", condition = { env_not_set = ["PROFILE"] } }
-PROFILE_DIR = { value = "release", condition = { env_not_set = [
+PROFILE_DIR = { source = "${PROFILE}", default_value = "release", mapping = { "release" = "release", "dev" = "debug" }, condition = { env_not_set = [
   "PROFILE_DIR",
 ] } }
 LIBAFL_CC = '${CARGO_TARGET_DIR}/${PROFILE_DIR}/libafl_cc'
diff --git a/fuzzers/inprocess/libfuzzer_libpng_cmin/Makefile.toml b/fuzzers/inprocess/libfuzzer_libpng_cmin/Makefile.toml
index a1e83768e0..d1bf2aaec3 100644
--- a/fuzzers/inprocess/libfuzzer_libpng_cmin/Makefile.toml
+++ b/fuzzers/inprocess/libfuzzer_libpng_cmin/Makefile.toml
@@ -6,7 +6,7 @@ CARGO_TARGET_DIR = { value = "${PROJECT_DIR}/target", condition = { env_not_set
   "CARGO_TARGET_DIR",
 ] } }
 PROFILE = { value = "release", condition = { env_not_set = ["PROFILE"] } }
-PROFILE_DIR = { value = "release", condition = { env_not_set = [
+PROFILE_DIR = { source = "${PROFILE}", default_value = "release", mapping = { "release" = "release", "dev" = "debug" }, condition = { env_not_set = [
   "PROFILE_DIR",
 ] } }
 LIBAFL_CC = '${CARGO_TARGET_DIR}/${PROFILE_DIR}/libafl_cc'
diff --git a/fuzzers/inprocess/libfuzzer_libpng_launcher/Makefile.toml b/fuzzers/inprocess/libfuzzer_libpng_launcher/Makefile.toml
index 437a9cf7dc..081b755f10 100644
--- a/fuzzers/inprocess/libfuzzer_libpng_launcher/Makefile.toml
+++ b/fuzzers/inprocess/libfuzzer_libpng_launcher/Makefile.toml
@@ -5,7 +5,7 @@ CARGO_TARGET_DIR = { value = "${PROJECT_DIR}/target", condition = { env_not_set
   "CARGO_TARGET_DIR",
 ] } }
 PROFILE = { value = "release", condition = { env_not_set = ["PROFILE"] } }
-PROFILE_DIR = { value = "release", condition = { env_not_set = [
+PROFILE_DIR = { source = "${PROFILE}", default_value = "release", mapping = { "release" = "release", "dev" = "debug" }, condition = { env_not_set = [
   "PROFILE_DIR",
 ] } }
 LIBAFL_CC = '${CARGO_TARGET_DIR}/${PROFILE_DIR}/libafl_cc'
diff --git a/fuzzers/inprocess/libfuzzer_libpng_norestart/Makefile.toml b/fuzzers/inprocess/libfuzzer_libpng_norestart/Makefile.toml
index dbb1e2c7a8..5769da2f63 100644
--- a/fuzzers/inprocess/libfuzzer_libpng_norestart/Makefile.toml
+++ b/fuzzers/inprocess/libfuzzer_libpng_norestart/Makefile.toml
@@ -5,7 +5,7 @@ CARGO_TARGET_DIR = { value = "${PROJECT_DIR}/target", condition = { env_not_set
   "CARGO_TARGET_DIR",
 ] } }
 PROFILE = { value = "release", condition = { env_not_set = ["PROFILE"] } }
-PROFILE_DIR = { value = "release", condition = { env_not_set = [
+PROFILE_DIR = { source = "${PROFILE}", default_value = "release", mapping = { "release" = "release", "dev" = "debug" }, condition = { env_not_set = [
   "PROFILE_DIR",
 ] } }
 LIBAFL_CC = '${CARGO_TARGET_DIR}/${PROFILE_DIR}/libafl_cc'
diff --git a/fuzzers/inprocess/libfuzzer_libpng_tcp_manager/Makefile.toml b/fuzzers/inprocess/libfuzzer_libpng_tcp_manager/Makefile.toml
index 9b7c61978e..7b0c8d0213 100644
--- a/fuzzers/inprocess/libfuzzer_libpng_tcp_manager/Makefile.toml
+++ b/fuzzers/inprocess/libfuzzer_libpng_tcp_manager/Makefile.toml
@@ -6,7 +6,7 @@ CARGO_TARGET_DIR = { value = "${PROJECT_DIR}/target", condition = { env_not_set
   "CARGO_TARGET_DIR",
 ] } }
 PROFILE = { value = "release", condition = { env_not_set = ["PROFILE"] } }
-PROFILE_DIR = { value = "release", condition = { env_not_set = [
+PROFILE_DIR = { source = "${PROFILE}", default_value = "release", mapping = { "release" = "release", "dev" = "debug" }, condition = { env_not_set = [
   "PROFILE_DIR",
 ] } }
 LIBAFL_CC = '${CARGO_TARGET_DIR}/${PROFILE_DIR}/libafl_cc'
diff --git a/fuzzers/inprocess/libfuzzer_windows_asan/Makefile.toml b/fuzzers/inprocess/libfuzzer_windows_asan/Makefile.toml
index b84eaf88d0..1c330a0bd2 100644
--- a/fuzzers/inprocess/libfuzzer_windows_asan/Makefile.toml
+++ b/fuzzers/inprocess/libfuzzer_windows_asan/Makefile.toml
@@ -5,7 +5,7 @@ CARGO_TARGET_DIR = { value = "./target", condition = { env_not_set = [
   "CARGO_TARGET_DIR",
 ] } }
 PROFILE = { value = "release", condition = { env_not_set = ["PROFILE"] } }
-PROFILE_DIR = { value = "release", condition = { env_not_set = [
+PROFILE_DIR = { source = "${PROFILE}", default_value = "release", mapping = { "release" = "release", "dev" = "debug" }, condition = { env_not_set = [
   "PROFILE_DIR",
 ] } }
 
diff --git a/fuzzers/structure_aware/nautilus_sync/Makefile.toml b/fuzzers/structure_aware/nautilus_sync/Makefile.toml
index 4e821c4c80..430268092d 100644
--- a/fuzzers/structure_aware/nautilus_sync/Makefile.toml
+++ b/fuzzers/structure_aware/nautilus_sync/Makefile.toml
@@ -5,7 +5,7 @@ CARGO_TARGET_DIR = { value = "${PROJECT_DIR}/target", condition = { env_not_set
   "CARGO_TARGET_DIR",
 ] } }
 PROFILE = { value = "release", condition = { env_not_set = ["PROFILE"] } }
-PROFILE_DIR = { value = "release", condition = { env_not_set = [
+PROFILE_DIR = { source = "${PROFILE}", default_value = "release", mapping = { "release" = "release", "dev" = "debug" }, condition = { env_not_set = [
   "PROFILE_DIR",
 ] } }
 LIBAFL_CC = '${CARGO_TARGET_DIR}/${PROFILE_DIR}/libafl_cc'