diff --git a/configs/baremetal.h b/configs/baremetal.h
index e61538459..7c09051ac 100644
--- a/configs/baremetal.h
+++ b/configs/baremetal.h
@@ -84,7 +84,7 @@
 #define MBEDTLS_SSL_CONF_READ_TIMEOUT 0
 #define MBEDTLS_SSL_CONF_HS_TIMEOUT_MIN 1000
 #define MBEDTLS_SSL_CONF_HS_TIMEOUT_MAX 16000
-#define MBEDTLS_SSL_CONF_CID_LEN 0
+#define MBEDTLS_SSL_CONF_CID_LEN 2
 #define MBEDTLS_SSL_CONF_IGNORE_UNEXPECTED_CID MBEDTLS_SSL_UNEXPECTED_CID_IGNORE
 #define MBEDTLS_SSL_CONF_ALLOW_LEGACY_RENEGOTIATION \
     MBEDTLS_SSL_SECURE_RENEGOTIATION
diff --git a/scripts/baremetal.sh b/scripts/baremetal.sh
index be5fd0488..7cd1e7005 100755
--- a/scripts/baremetal.sh
+++ b/scripts/baremetal.sh
@@ -213,7 +213,8 @@ baremetal_ram_heap() {
     : ${CLI:=./programs/ssl/ssl_client2}
     : ${CLI_PARAMS:="dtls=1 cid=1 cid_val=beef"}
     : ${SRV:=./programs/ssl/ssl_server2}
-    : ${SRV_PARAMS:="dtls=1 renegotiation=1 auth_mode=required cid=1 cid_val=dead"}
+    : ${SRV_PARAMS:="dtls=1 cid=1 cid_val=dead"} # renegotiation=1 auth_mode=required implicit
+                                                 # compile-time hardcoding of configuration
     : ${VALGRIND:=valgrind}
     : ${VALGRIND_MASSIF_PARAMS="--time-unit=B --threshold=0.01 --detailed-freq=1"}
 
@@ -271,7 +272,8 @@ baremetal_ram_stack() {
     : ${CLI:=./programs/ssl/ssl_client2}
     : ${CLI_PARAMS:="dtls=1"}
     : ${SRV:=./programs/ssl/ssl_server2}
-    : ${SRV_PARAMS:="dtls=1 renegotiation=1 auth_mode=required"}
+    : ${SRV_PARAMS:="dtls=1"} # renegotiation=1 auth_mode=required implicit
+                              # compile-time hardcoding of configuration
     : ${VALGRIND:=valgrind}
     : ${VALGRIND_CALLGRIND_PARAMS:="--separate-callers=100"}