diff --git a/default-registry/configurations/oe-nodistro-master.conf.json b/default-registry/configurations/oe-nodistro-master.conf.json
deleted file mode 100644
index 5aa148d4217e..000000000000
--- a/default-registry/configurations/oe-nodistro-master.conf.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-    "description": "OpenEmbedded - 'nodistro' basic configuration",
-    "sources": {
-        "bitbake": {
-            "git-remote": {
-                "uri": "https://git.openembedded.org/bitbake",
-                "branch": "master",
-                "rev": "master"
-            }
-        },
-        "openembedded-core": {
-            "git-remote": {
-                "uri": "https://git.openembedded.org/openembedded-core",
-                "branch": "master",
-                "rev": "master"
-            }
-        },
-        "yocto-docs": {
-            "git-remote": {
-                "uri": "https://git.yoctoproject.org/yocto-docs",
-                "branch": "master",
-                "rev": "master"
-            }
-        }
-    },
-    "bitbake-setup": {
-        "configurations": [
-        {
-            "name": "nodistro",
-            "description": "OpenEmbedded 'nodistro'",
-            "setup-dir-name": "oe-nodistro-master",
-            "bb-layers": ["openembedded-core/meta"],
-            "oe-fragments-one-of": {
-                "machine": {
-                    "description": "Target machines",
-                    "options" : [
-                        { "name": "machine/qemux86-64", "description": "x86-64 system on QEMU" },
-                        { "name": "machine/qemuarm64", "description": "ARMv8 system on QEMU" },
-                        { "name": "machine/qemuriscv64", "description": "RISC-V system on QEMU" }
-                    ]
-                }
-            }
-        }
-        ]
-    },
-    "version": "1.0"
-}
diff --git a/default-registry/configurations/oe-nodistro-whinlatter.conf.json b/default-registry/configurations/oe-nodistro-whinlatter.conf.json
deleted file mode 100644
index 7b183ae1c438..000000000000
--- a/default-registry/configurations/oe-nodistro-whinlatter.conf.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-    "description": "OpenEmbedded - 'nodistro' basic configuration, release 5.3 'whinlatter'",
-    "expires": "2026-05-31",
-    "sources": {
-        "bitbake": {
-            "git-remote": {
-                "remotes": {
-                    "origin": {
-                        "uri": "https://git.openembedded.org/bitbake"
-                    }
-                },
-                "branch": "2.16",
-                "rev": "2.16"
-            }
-        },
-        "openembedded-core": {
-            "git-remote": {
-                "remotes": {
-                    "origin": {
-                        "uri": "https://git.openembedded.org/openembedded-core"
-                    }
-                },
-                "branch": "whinlatter",
-                "rev": "whinlatter"
-            }
-        },
-        "yocto-docs": {
-            "git-remote": {
-                "remotes": {
-                    "origin": {
-                        "uri": "https://git.yoctoproject.org/yocto-docs"
-                    }
-                },
-                "branch": "whinlatter",
-                "rev": "whinlatter"
-            }
-        }
-    },
-    "bitbake-setup": {
-        "configurations": [
-        {
-            "name": "nodistro",
-            "description": "OpenEmbedded 'nodistro'",
-            "setup-dir-name": "oe-nodistro-whinlatter",
-            "bb-layers": ["openembedded-core/meta"],
-            "oe-fragments-one-of": {
-                "machine": {
-                    "description": "Target machines",
-                    "options" : ["machine/qemux86-64", "machine/qemuarm64", "machine/qemuriscv64"]
-                }
-            }
-        }
-        ]
-    },
-    "version": "1.0"
-}
diff --git a/default-registry/configurations/oe-nodistro-wrynose.conf.json b/default-registry/configurations/oe-nodistro-wrynose.conf.json
deleted file mode 100644
index 278ce4dd0296..000000000000
--- a/default-registry/configurations/oe-nodistro-wrynose.conf.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    "description": "OpenEmbedded - 'nodistro' basic configuration, release 6.0 'wrynose'",
-    "expires": "2030-05-31",
-    "sources": {
-        "bitbake": {
-            "git-remote": {
-                "uri": "https://git.openembedded.org/bitbake",
-                "branch": "2.18",
-                "rev": "2.18"
-            }
-        },
-        "openembedded-core": {
-            "git-remote": {
-                "uri": "https://git.openembedded.org/openembedded-core",
-                "branch": "wrynose",
-                "rev": "wrynose"
-            }
-        },
-        "yocto-docs": {
-            "git-remote": {
-                "uri": "https://git.yoctoproject.org/yocto-docs",
-                "branch": "wrynose",
-                "rev": "wrynose"
-            }
-        }
-    },
-    "bitbake-setup": {
-        "configurations": [
-        {
-            "name": "nodistro",
-            "description": "OpenEmbedded 'nodistro'",
-            "setup-dir-name": "oe-nodistro-wrynose",
-            "bb-layers": ["openembedded-core/meta"],
-            "oe-fragments-one-of": {
-                "machine": {
-                    "description": "Target machines",
-                    "options" : [
-                        { "name": "machine/qemux86-64", "description": "x86-64 system on QEMU" },
-                        { "name": "machine/qemuarm64", "description": "ARMv8 system on QEMU" },
-                        { "name": "machine/qemuriscv64", "description": "RISC-V system on QEMU" }
-                    ]
-                }
-            }
-        }
-        ]
-    },
-    "version": "1.0"
-}
diff --git a/default-registry/configurations/oe-nodistro.conf.json b/default-registry/configurations/oe-nodistro.conf.json
new file mode 100644
index 000000000000..02554cbf10aa
--- /dev/null
+++ b/default-registry/configurations/oe-nodistro.conf.json
@@ -0,0 +1,117 @@
+{
+    "description": "OpenEmbedded - 'nodistro' basic configuration",
+    "source-choices": {
+        "master": {
+            "description": "OpenEmbedded 'nodistro' development branch",
+            "sources": {
+                "bitbake": {
+                    "git-remote": {
+                        "uri": "https://git.openembedded.org/bitbake",
+                        "branch": "master",
+                        "rev": "master"
+                    }
+                },
+                "openembedded-core": {
+                    "git-remote": {
+                        "uri": "https://git.openembedded.org/openembedded-core",
+                        "branch": "master",
+                        "rev": "master"
+                    }
+                },
+                "yocto-docs": {
+                    "git-remote": {
+                        "uri": "https://git.yoctoproject.org/yocto-docs",
+                        "branch": "master",
+                        "rev": "master"
+                    }
+                }
+            }
+        },
+        "whinlatter": {
+            "description": "OpenEmbedded 'nodistro', release 5.3 'whinlatter'",
+            "expires": "2026-05-31",
+            "sources": {
+                "bitbake": {
+                    "git-remote": {
+                        "remotes": {
+                            "origin": {
+                                "uri": "https://git.openembedded.org/bitbake"
+                            }
+                        },
+                        "branch": "2.16",
+                        "rev": "2.16"
+                    }
+                },
+                "openembedded-core": {
+                    "git-remote": {
+                        "remotes": {
+                            "origin": {
+                                "uri": "https://git.openembedded.org/openembedded-core"
+                            }
+                        },
+                        "branch": "whinlatter",
+                        "rev": "whinlatter"
+                    }
+                },
+                "yocto-docs": {
+                    "git-remote": {
+                        "remotes": {
+                            "origin": {
+                                "uri": "https://git.yoctoproject.org/yocto-docs"
+                            }
+                        },
+                        "branch": "whinlatter",
+                        "rev": "whinlatter"
+                    }
+                }
+            }
+        },
+        "wrynose": {
+            "description": "OpenEmbedded 'nodistro', release 6.0 'wrynose'",
+            "expires": "2030-05-31",
+            "sources": {
+                "bitbake": {
+                    "git-remote": {
+                        "uri": "https://git.openembedded.org/bitbake",
+                        "branch": "2.18",
+                        "rev": "2.18"
+                    }
+                },
+                "openembedded-core": {
+                    "git-remote": {
+                        "uri": "https://git.openembedded.org/openembedded-core",
+                        "branch": "wrynose",
+                        "rev": "wrynose"
+                    }
+                },
+                "yocto-docs": {
+                    "git-remote": {
+                        "uri": "https://git.yoctoproject.org/yocto-docs",
+                        "branch": "wrynose",
+                        "rev": "wrynose"
+                    }
+                }
+            }
+        }
+    },
+    "bitbake-setup": {
+        "configurations": [
+        {
+            "name": "nodistro",
+            "description": "OpenEmbedded 'nodistro'",
+            "bb-layers": ["openembedded-core/meta"],
+            "oe-fragments-one-of": {
+                "machine": {
+                    "description": "Target machines",
+                    "options" : [
+                        { "name": "machine/qemux86-64", "description": "x86-64 system on QEMU" },
+                        { "name": "machine/qemuarm64", "description": "ARMv8 system on QEMU" },
+                        { "name": "machine/qemuriscv64", "description": "RISC-V system on QEMU" }
+                    ]
+                }
+            }
+        }
+        ]
+    },
+    "version": "1.0"
+}
diff --git a/default-registry/configurations/poky-master.conf.json b/default-registry/configurations/poky-master.conf.json
deleted file mode 100644
index 58d379648a31..000000000000
--- a/default-registry/configurations/poky-master.conf.json
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-    "description": "Poky - The Yocto Project testing distribution configurations and hardware test platforms",
-    "sources": {
-        "bitbake": {
-            "git-remote": {
-                "uri": "https://git.openembedded.org/bitbake",
-                "branch": "master",
-                "rev": "master"
-            }
-        },
-        "openembedded-core": {
-            "git-remote": {
-                "uri": "https://git.openembedded.org/openembedded-core",
-                "branch": "master",
-                "rev": "master"
-            }
-        },
-        "meta-yocto": {
-            "git-remote": {
-                "uri": "https://git.yoctoproject.org/meta-yocto",
-                "branch": "master",
-                "rev": "master"
-            }
-        },
-        "yocto-docs": {
-            "git-remote": {
-                "uri": "https://git.yoctoproject.org/yocto-docs",
-                "branch": "master",
-                "rev": "master"
-            }
-        }
-    },
-    "bitbake-setup": {
-        "configurations": [
-        {
-            "bb-layers": ["openembedded-core/meta","meta-yocto/meta-yocto-bsp","meta-yocto/meta-poky"],
-            "setup-dir-name": "$distro-master",
-            "oe-fragments-one-of": {
-                "machine": {
-                    "description": "Target machines",
-                    "options" : [
-                        { "name": "machine/qemux86-64", "description": "x86-64 system on QEMU" },
-                        { "name": "machine/qemuarm64", "description": "ARMv8 system on QEMU" },
-                        { "name": "machine/qemuriscv64", "description": "RISC-V system on QEMU" },
-                        { "name": "machine/genericarm64", "description": "Arm64 SystemReady IR/ES platforms" },
-                        { "name": "machine/genericx86-64", "description": "x86_64 (64-bit) PCs and servers" }
-                    ]
-                },
-                "distro": {
-                    "description": "Target distributions",
-                    "options" : [
-                        { "name": "distro/poky", "description": "Yocto Project Reference Distro" },
-                        { "name": "distro/poky-altcfg", "description": "Poky alternative with systemd as init manager" },
-                        { "name": "distro/poky-tiny", "description": "Poky alternative optimized for size" }
-                    ]
-                }
-            },
-            "configurations": [
-            {
-                "name": "poky",
-                "description": "Poky - The Yocto Project testing distribution"
-            },
-            {
-                "name": "poky-with-sstate",
-                "description": "Poky - The Yocto Project testing distribution with internet sstate acceleration. Use with caution as it requires a completely robust local network with sufficient bandwidth.",
-                "oe-fragments": ["core/yocto/sstate-mirror-cdn"]
-            }
-            ]
-        }
-        ]
-    },
-    "version": "1.0"
-}
diff --git a/default-registry/configurations/poky-whinlatter.conf.json b/default-registry/configurations/poky-whinlatter.conf.json
deleted file mode 100644
index 4827ebe11483..000000000000
--- a/default-registry/configurations/poky-whinlatter.conf.json
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-    "description": "Poky - The Yocto Project testing distribution configurations and hardware test platforms, release 5.3 'whinlatter'",
-    "expires": "2026-05-31",
-    "sources": {
-        "bitbake": {
-            "git-remote": {
-                "remotes": {
-                    "origin": {
-                        "uri": "https://git.openembedded.org/bitbake"
-                    }
-                },
-                "branch": "2.16",
-                "rev": "2.16"
-            }
-        },
-        "openembedded-core": {
-            "git-remote": {
-                "remotes": {
-                    "origin": {
-                        "uri": "https://git.openembedded.org/openembedded-core"
-                    }
-                },
-                "branch": "whinlatter",
-                "rev": "whinlatter"
-            }
-        },
-        "meta-yocto": {
-            "git-remote": {
-                "remotes": {
-                    "origin": {
-                        "uri": "https://git.yoctoproject.org/meta-yocto"
-                    }
-                },
-                "branch": "whinlatter",
-                "rev": "whinlatter"
-            }
-        },
-        "yocto-docs": {
-            "git-remote": {
-                "remotes": {
-                    "origin": {
-                        "uri": "https://git.yoctoproject.org/yocto-docs"
-                    }
-                },
-                "branch": "whinlatter",
-                "rev": "whinlatter"
-            }
-        }
-    },
-    "bitbake-setup": {
-        "configurations": [
-        {
-            "bb-layers": ["openembedded-core/meta","meta-yocto/meta-yocto-bsp","meta-yocto/meta-poky"],
-            "setup-dir-name": "$distro-whinlatter",
-            "oe-fragments-one-of": {
-                "machine": {
-                    "description": "Target machines",
-                    "options" : ["machine/qemux86-64", "machine/qemuarm64", "machine/qemuriscv64", "machine/genericarm64", "machine/genericx86-64"]
-                },
-                "distro": {
-                    "description": "Target Distributions",
-                    "options" : ["distro/poky", "distro/poky-altcfg", "distro/poky-tiny"]
-                }
-            },
-            "configurations": [
-            {
-                "name": "poky",
-                "description": "Poky - The Yocto Project testing distribution"
-            },
-            {
-                "name": "poky-with-sstate",
-                "description": "Poky - The Yocto Project testing distribution with internet sstate acceleration. Use with caution as it requires a completely robust local network with sufficient bandwidth.",
-                "oe-fragments": ["core/yocto/sstate-mirror-cdn"]
-            }
-            ]
-        }
-        ]
-    },
-    "version": "1.0"
-}
diff --git a/default-registry/configurations/poky-wrynose.conf.json b/default-registry/configurations/poky-wrynose.conf.json
deleted file mode 100644
index d27928437735..000000000000
--- a/default-registry/configurations/poky-wrynose.conf.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-    "description": "Poky - The Yocto Project testing distribution configurations and hardware test platforms, release 6.0 'wrynose'",
-    "expires": "2030-05-31",
-    "sources": {
-        "bitbake": {
-            "git-remote": {
-                "uri": "https://git.openembedded.org/bitbake",
-                "branch": "2.18",
-                "rev": "2.18"
-            }
-        },
-        "openembedded-core": {
-            "git-remote": {
-                "uri": "https://git.openembedded.org/openembedded-core",
-                "branch": "wrynose",
-                "rev": "wrynose"
-            }
-        },
-        "meta-yocto": {
-            "git-remote": {
-                "uri": "https://git.yoctoproject.org/meta-yocto",
-                "branch": "wrynose",
-                "rev": "wrynose"
-            }
-        },
-        "yocto-docs": {
-            "git-remote": {
-                "uri": "https://git.yoctoproject.org/yocto-docs",
-                "branch": "wrynose",
-                "rev": "wrynose"
-            }
-        }
-    },
-    "bitbake-setup": {
-        "configurations": [
-        {
-            "bb-layers": ["openembedded-core/meta","meta-yocto/meta-yocto-bsp","meta-yocto/meta-poky"],
-            "setup-dir-name": "$distro-wrynose",
-            "oe-fragments-one-of": {
-                "machine": {
-                    "description": "Target machines",
-                    "options" : [
-                        { "name": "machine/qemux86-64", "description": "x86-64 system on QEMU" },
-                        { "name": "machine/qemuarm64", "description": "ARMv8 system on QEMU" },
-                        { "name": "machine/qemuriscv64", "description": "RISC-V system on QEMU" },
-                        { "name": "machine/genericarm64", "description": "Arm64 SystemReady IR/ES platforms" },
-                        { "name": "machine/genericx86-64", "description": "x86_64 (64-bit) PCs and servers" }
-                    ]
-                },
-                "distro": {
-                    "description": "Target distributions",
-                    "options" : [
-                        { "name": "distro/poky", "description": "Yocto Project Reference Distro" },
-                        { "name": "distro/poky-altcfg", "description": "Poky alternative with systemd as init manager" },
-                        { "name": "distro/poky-tiny", "description": "Poky alternative optimized for size" }
-                    ]
-                }
-            },
-            "configurations": [
-            {
-                "name": "poky",
-                "description": "Poky - The Yocto Project testing distribution"
-            },
-            {
-                "name": "poky-with-sstate",
-                "description": "Poky - The Yocto Project testing distribution with internet sstate acceleration. Use with caution as it requires a completely robust local network with sufficient bandwidth.",
-                "oe-fragments": ["core/yocto/sstate-mirror-cdn"]
-            }
-            ]
-        }
-        ]
-    },
-    "version": "1.0"
-}
diff --git a/default-registry/configurations/poky.conf.json b/default-registry/configurations/poky.conf.json
new file mode 100644
index 000000000000..ea4c7a0660e7
--- /dev/null
+++ b/default-registry/configurations/poky.conf.json
@@ -0,0 +1,161 @@
+{
+    "description": "Poky - The Yocto Project testing distribution configurations and hardware test platforms",
+    "source-choices": {
+        "master": {
+            "description": "Poky development branch",
+            "sources": {
+                "bitbake": {
+                    "git-remote": {
+                        "uri": "https://git.openembedded.org/bitbake",
+                        "branch": "master",
+                        "rev": "master"
+                    }
+                },
+                "openembedded-core": {
+                    "git-remote": {
+                        "uri": "https://git.openembedded.org/openembedded-core",
+                        "branch": "master",
+                        "rev": "master"
+                    }
+                },
+                "meta-yocto": {
+                    "git-remote": {
+                        "uri": "https://git.yoctoproject.org/meta-yocto",
+                        "branch": "master",
+                        "rev": "master"
+                    }
+                },
+                "yocto-docs": {
+                    "git-remote": {
+                        "uri": "https://git.yoctoproject.org/yocto-docs",
+                        "branch": "master",
+                        "rev": "master"
+                    }
+                }
+            }
+        },
+        "whinlatter": {
+            "description": "Poky, release 5.3 'whinlatter'",
+            "expires": "2026-05-31",
+            "sources": {
+                "bitbake": {
+                    "git-remote": {
+                        "remotes": {
+                            "origin": {
+                                "uri": "https://git.openembedded.org/bitbake"
+                            }
+                        },
+                        "branch": "2.16",
+                        "rev": "2.16"
+                    }
+                },
+                "openembedded-core": {
+                    "git-remote": {
+                        "remotes": {
+                            "origin": {
+                                "uri": "https://git.openembedded.org/openembedded-core"
+                            }
+                        },
+                        "branch": "whinlatter",
+                        "rev": "whinlatter"
+                    }
+                },
+                "meta-yocto": {
+                    "git-remote": {
+                        "remotes": {
+                            "origin": {
+                                "uri": "https://git.yoctoproject.org/meta-yocto"
+                            }
+                        },
+                        "branch": "whinlatter",
+                        "rev": "whinlatter"
+                    }
+                },
+                "yocto-docs": {
+                    "git-remote": {
+                        "remotes": {
+                            "origin": {
+                                "uri": "https://git.yoctoproject.org/yocto-docs"
+                            }
+                        },
+                        "branch": "whinlatter",
+                        "rev": "whinlatter"
+                    }
+                }
+            }
+        },
+        "wrynose": {
+            "description": "Poky, release 6.0 'wrynose'",
+            "expires": "2030-05-31",
+            "sources": {
+                "bitbake": {
+                    "git-remote": {
+                        "uri": "https://git.openembedded.org/bitbake",
+                        "branch": "2.18",
+                        "rev": "2.18"
+                    }
+                },
+                "openembedded-core": {
+                    "git-remote": {
+                        "uri": "https://git.openembedded.org/openembedded-core",
+                        "branch": "wrynose",
+                        "rev": "wrynose"
+                    }
+                },
+                "meta-yocto": {
+                    "git-remote": {
+                        "uri": "https://git.yoctoproject.org/meta-yocto",
+                        "branch": "wrynose",
+                        "rev": "wrynose"
+                    }
+                },
+                "yocto-docs": {
+                    "git-remote": {
+                        "uri": "https://git.yoctoproject.org/yocto-docs",
+                        "branch": "wrynose",
+                        "rev": "wrynose"
+                    }
+                }
+            }
+        }
+    },
+    "bitbake-setup": {
+        "configurations": [
+        {
+            "bb-layers": ["openembedded-core/meta","meta-yocto/meta-yocto-bsp","meta-yocto/meta-poky"],
+            "oe-fragments-one-of": {
+                "machine": {
+                    "description": "Target machines",
+                    "options" : [
+                        { "name": "machine/qemux86-64", "description": "x86-64 system on QEMU" },
+                        { "name": "machine/qemuarm64", "description": "ARMv8 system on QEMU" },
+                        { "name": "machine/qemuriscv64", "description": "RISC-V system on QEMU" },
+                        { "name": "machine/genericarm64", "description": "Arm64 SystemReady IR/ES platforms" },
+                        { "name": "machine/genericx86-64", "description": "x86_64 (64-bit) PCs and servers" }
+                    ]
+                },
+                "distro": {
+                    "description": "Target distributions",
+                    "options" : [
+                        { "name": "distro/poky", "description": "Yocto Project Reference Distro" },
+                        { "name": "distro/poky-altcfg", "description": "Poky alternative with systemd as init manager" },
+                        { "name": "distro/poky-tiny", "description": "Poky alternative optimized for size" }
+                    ]
+                }
+            },
+            "configurations": [
+            {
+                "name": "poky",
+                "description": "Poky - The Yocto Project testing distribution"
+            },
+            {
+                "name": "poky-with-sstate",
+                "description": "Poky - The Yocto Project testing distribution with internet sstate acceleration. Use with caution as it requires a completely robust local network with sufficient bandwidth.",
+                "oe-fragments": ["core/yocto/sstate-mirror-cdn"]
+            }
+            ]
+        }
+        ]
+    },
+    "version": "1.0"
+}