diff --git a/.buildkite/common.py b/.buildkite/common.py
index a8913d5d6ef..342bd671ddc 100644
--- a/.buildkite/common.py
+++ b/.buildkite/common.py
@@ -6,6 +6,7 @@
 """
 
 import argparse
+import ast
 import json
 import os
 import random
@@ -138,7 +139,7 @@ def __call__(self, parser, namespace, value, option_string=None):
         res = getattr(namespace, self.dest, {})
         key_str, val = value.split("=", maxsplit=1)
         keys = key_str.split("/")
-        update = {keys[-1]: val}
+        update = {keys[-1]: ast.literal_eval(val)}
         for key in list(reversed(keys))[1:]:
             update = {key: update}
         res = overlay_dict(res, update)
diff --git a/tools/devtool b/tools/devtool
index 7d41229b2e7..a55fda81269 100755
--- a/tools/devtool
+++ b/tools/devtool
@@ -742,7 +742,7 @@ cmd_test() {
     # If we got to here, we've got all we need to continue.
     say "Kernel version: $(uname -r)"
     say "$(sed '/^processor.*: 0$/,/^processor.*: 1$/!d; /^processor.*: 1$/d' /proc/cpuinfo)"
-    say "RPM microcode_ctl version: $(rpm -q microcode_ctl)"
+    say "RPM firmware versions: $(rpm -q microcode_ctl amd-ucode-firmware linux-firmware)"
 
     env |grep -P "^(AWS_EMF_|BUILDKITE|CODECOV_)" > env.list
     if [[ $performance_tweaks -eq 1 ]]; then