diff --git a/ci-cd_config.sh b/ci-cd_config.sh
index 5e0cc32664c5..f5d1240ebc4f 100644
--- a/ci-cd_config.sh
+++ b/ci-cd_config.sh
@@ -19,6 +19,8 @@ function cmsbuild_args()
       case $x in
         upload_store ) ;;
         estats ) ;;
+        debug:* )      arg="${arg} --define cms_debug_packages=$(echo $x    | sed 's|^debug:||')" ;;
+        stdcxx:* )     arg="${arg} --define cms_override_standard=$(echo $x | sed 's|^stdcxx:||;s|:|,|g')" ;;
         without:* )    arg="${arg} --build-without=$(echo $x    | sed 's|^without:||;s|:|,|g')" ;;
         system:* )     arg="${arg} --use-system-tools=$(echo $x | sed 's|^system:||;s|:|,|g')" ;;
         microarchs:* ) arg="${arg} --vectorization=$(echo $x    | sed 's|^microarchs:||;s|:|,|g')" ;;
diff --git a/tests/test_config-map.py b/tests/test_config-map.py
index 41d365966ca7..35db361714d1 100755
--- a/tests/test_config-map.py
+++ b/tests/test_config-map.py
@@ -32,7 +32,9 @@ def check_value(key, value):
                 continue
             elif re.match(r"^(microarchs):x86-64-v\d$", item):
                 continue
-            elif re.match(r"^(system|without):[a-zA-Z0-9_-]+(:[a-zA-Z0-9_-]+)*$", item):
+            elif re.match(r"^(system|without|debug):[a-zA-Z0-9_-]+(:[a-zA-Z0-9_-]+)*$", item):
+                continue
+            elif re.match(r"^(stdcxx):[a-zA-Z0-9_-]+@\d+(:[a-zA-Z0-9_-]+@\d+)*$", item):
                 continue
             else:
                 errors.append("Invalid item '%s' in '%s=%s'" % (item, key, value))