diff --git a/default-registry/configurations/oe-nodistro-whinlatter.conf.json b/default-registry/configurations/oe-nodistro-wrynose.conf.json
similarity index 82%
rename from default-registry/configurations/oe-nodistro-whinlatter.conf.json
rename to default-registry/configurations/oe-nodistro-wrynose.conf.json
index 7b183ae1c43..45fe24a85fa 100644
--- a/default-registry/configurations/oe-nodistro-whinlatter.conf.json
+++ b/default-registry/configurations/oe-nodistro-wrynose.conf.json
@@ -1,5 +1,5 @@
 {
-    "description": "OpenEmbedded - 'nodistro' basic configuration, release 5.3 'whinlatter'",
+    "description": "OpenEmbedded - 'nodistro' basic configuration, release 6.0 'wrynose'",
     "expires": "2026-05-31",
     "sources": {
         "bitbake": {
@@ -9,8 +9,8 @@
                         "uri": "https://git.openembedded.org/bitbake"
                     }
                 },
-                "branch": "2.16",
-                "rev": "2.16"
+                "branch": "2.18",
+                "rev": "2.18"
             }
         },
         "openembedded-core": {
@@ -20,8 +20,8 @@
                         "uri": "https://git.openembedded.org/openembedded-core"
                     }
                 },
-                "branch": "whinlatter",
-                "rev": "whinlatter"
+                "branch": "wrynose",
+                "rev": "wrynose"
             }
         },
         "yocto-docs": {
@@ -31,8 +31,8 @@
                         "uri": "https://git.yoctoproject.org/yocto-docs"
                     }
                 },
-                "branch": "whinlatter",
-                "rev": "whinlatter"
+                "branch": "wrynose",
+                "rev": "wrynose"
             }
         }
     },
@@ -41,7 +41,7 @@
         {
             "name": "nodistro",
             "description": "OpenEmbedded 'nodistro'",
-            "setup-dir-name": "oe-nodistro-whinlatter",
+            "setup-dir-name": "oe-nodistro-wrynose",
             "bb-layers": ["openembedded-core/meta"],
             "oe-fragments-one-of": {
                 "machine": {
diff --git a/default-registry/configurations/poky-whinlatter.conf.json b/default-registry/configurations/poky-wrynose.conf.json
similarity index 84%
rename from default-registry/configurations/poky-whinlatter.conf.json
rename to default-registry/configurations/poky-wrynose.conf.json
index 4827ebe1148..c3a72a99fd7 100644
--- a/default-registry/configurations/poky-whinlatter.conf.json
+++ b/default-registry/configurations/poky-wrynose.conf.json
@@ -1,6 +1,6 @@
 {
-    "description": "Poky - The Yocto Project testing distribution configurations and hardware test platforms, release 5.3 'whinlatter'",
-    "expires": "2026-05-31",
+    "description": "Poky - The Yocto Project testing distribution configurations and hardware test platforms, release 6.0 'wrynose'",
+    "expires": "2030-05-31",
     "sources": {
         "bitbake": {
             "git-remote": {
@@ -9,8 +9,8 @@
                         "uri": "https://git.openembedded.org/bitbake"
                     }
                 },
-                "branch": "2.16",
-                "rev": "2.16"
+                "branch": "2.18",
+                "rev": "2.18"
             }
         },
         "openembedded-core": {
@@ -20,8 +20,8 @@
                         "uri": "https://git.openembedded.org/openembedded-core"
                     }
                 },
-                "branch": "whinlatter",
-                "rev": "whinlatter"
+                "branch": "wrynose",
+                "rev": "wrynose"
             }
         },
         "meta-yocto": {
@@ -31,8 +31,8 @@
                         "uri": "https://git.yoctoproject.org/meta-yocto"
                     }
                 },
-                "branch": "whinlatter",
-                "rev": "whinlatter"
+                "branch": "wrynose",
+                "rev": "wrynose"
             }
         },
         "yocto-docs": {
@@ -42,8 +42,8 @@
                         "uri": "https://git.yoctoproject.org/yocto-docs"
                     }
                 },
-                "branch": "whinlatter",
-                "rev": "whinlatter"
+                "branch": "wrynose",
+                "rev": "wrynose"
             }
         }
     },
@@ -51,7 +51,7 @@
         "configurations": [
         {
             "bb-layers": ["openembedded-core/meta","meta-yocto/meta-yocto-bsp","meta-yocto/meta-poky"],
-            "setup-dir-name": "$distro-whinlatter",
+            "setup-dir-name": "$distro-wrynose",
             "oe-fragments-one-of": {
                 "machine": {
                     "description": "Target machines",