diff --git a/configs/machines/09.02.00.010.yaml b/configs/machines/09.02.00.010.toml
similarity index 100%
rename from configs/machines/09.02.00.010.yaml
rename to configs/machines/09.02.00.010.toml
diff --git a/configs/machines/10.00.05.yaml b/configs/machines/10.00.05.toml
similarity index 100%
rename from configs/machines/10.00.05.yaml
rename to configs/machines/10.00.05.toml
diff --git a/scripts/common.sh b/scripts/common.sh
index 7efb386..c45d253 100755
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -20,7 +20,7 @@ machine=$1
 config=$2
 bsp_version=${3}
 
-    read_config ${topdir}/configs/machines/${bsp_version}.yaml $machine $config
+    read_config ${topdir}/configs/machines/${bsp_version}.toml $machine $config
 }
 
 function read_bsp_config() {
@@ -54,7 +54,7 @@ bsp_version=$2
 distro_file=$3
 
     validate_section "BSP Version" ${bsp_version} "${topdir}/configs/bsp_sources.toml"
-    validate_section "Machine" ${machine} "${topdir}/configs/machines/${bsp_version}.yaml"
+    validate_section "Machine" ${machine} "${topdir}/configs/machines/${bsp_version}.toml"
 
     if [ ! -f "${topdir}/configs/bdebstrap_configs/${distro_file}" ] ; then
         log "Distro Variant \"${distro_file}\" does not exist. Exiting."