diff --git a/bitbake-setup/poky-master-config.conf.json b/bitbake-setup/poky-wrynose-config.conf.json
similarity index 96%
copy from bitbake-setup/poky-master-config.conf.json
copy to bitbake-setup/poky-wrynose-config.conf.json
index 4726117..80c5557 100644
--- a/bitbake-setup/poky-master-config.conf.json
+++ b/bitbake-setup/poky-wrynose-config.conf.json
@@ -20,7 +20,7 @@
             "uri": "https://git.openembedded.org/bitbake"
           }
         },
-        "rev": "master"
+        "rev": "2.18"
       },
       "path": "bitbake"
     },
@@ -31,7 +31,7 @@
             "uri": "https://git.yoctoproject.org/meta-yocto"
           }
         },
-        "rev": "master"
+        "rev": "wrynose"
       },
       "path": "meta-yocto"
     },
@@ -42,7 +42,7 @@
             "uri": "https://git.yoctoproject.org/meta-ti"
           }
         },
-        "rev": "master"
+        "rev": "wrynose"
       },
       "path": "meta-ti"
     },
@@ -53,7 +53,7 @@
             "uri": "https://git.yoctoproject.org/meta-arm"
           }
         },
-        "rev": "master"
+        "rev": "wrynose"
       },
       "path": "meta-arm"
     },
@@ -64,7 +64,7 @@
             "uri": "https://git.openembedded.org/openembedded-core"
           }
         },
-        "rev": "master"
+        "rev": "wrynose"
       },
       "path": "oe-core"
     }
diff --git a/bitbake-setup/poky-master-wip-config.conf.json b/bitbake-setup/poky-wrynose-wip-config.conf.json
similarity index 95%
copy from bitbake-setup/poky-master-wip-config.conf.json
copy to bitbake-setup/poky-wrynose-wip-config.conf.json
index b949b3f..6906490 100644
--- a/bitbake-setup/poky-master-wip-config.conf.json
+++ b/bitbake-setup/poky-wrynose-wip-config.conf.json
@@ -20,7 +20,7 @@
             "uri": "https://git.openembedded.org/bitbake"
           }
         },
-        "rev": "master"
+        "rev": "2.18"
       },
       "path": "bitbake"
     },
@@ -31,7 +31,7 @@
             "uri": "https://git.yoctoproject.org/meta-yocto"
           }
         },
-        "rev": "master"
+        "rev": "wrynose"
       },
       "path": "meta-yocto"
     },
@@ -42,7 +42,7 @@
             "uri": "https://git.yoctoproject.org/meta-ti"
           }
         },
-        "rev": "master-wip"
+        "rev": "wrynose-wip"
       },
       "path": "meta-ti"
     },
@@ -53,7 +53,7 @@
             "uri": "https://git.yoctoproject.org/meta-arm"
           }
         },
-        "rev": "master"
+        "rev": "wrynose"
       },
       "path": "meta-arm"
     },
@@ -64,7 +64,7 @@
             "uri": "https://git.openembedded.org/openembedded-core"
           }
         },
-        "rev": "master"
+        "rev": "wrynose"
       },
       "path": "oe-core"
     }
diff --git a/configs/poky-wrynose-config.txt b/configs/poky-wrynose-config.txt
new file mode 100644
index 0000000..50d7a79
--- /dev/null
+++ b/configs/poky-wrynose-config.txt
@@ -0,0 +1,12 @@
+# This file takes repo entries in the format
+# repo name,repo uri,repo branch,repo commit[,layers=layer1:layer2...:layern]
+
+bitbake,https://git.openembedded.org/bitbake,2.18,HEAD
+meta-yocto,https://git.yoctoproject.org/meta-yocto,wrynose,HEAD,layers=meta-poky:meta-yocto-bsp
+meta-ti,https://git.yoctoproject.org/meta-ti,wrynose,HEAD,layers=meta-ti-test:meta-ti-extras:meta-beagle:meta-ti-bsp
+meta-arm,https://git.yoctoproject.org/meta-arm,wrynose,HEAD,layers=meta-arm:meta-arm-toolchain
+oe-core,https://git.openembedded.org/openembedded-core,wrynose,HEAD,layers=meta
+
+OECORELAYERCONF=./sample-files/bblayers.conf.sample
+OECORELOCALCONF=./sample-files/local-poky-v3.conf.sample
+BITBAKE_INCLUSIVE_VARS=yes
diff --git a/configs/poky-wrynose-wip-config.txt b/configs/poky-wrynose-wip-config.txt
new file mode 100644
index 0000000..c541fb2
--- /dev/null
+++ b/configs/poky-wrynose-wip-config.txt
@@ -0,0 +1,12 @@
+# This file takes repo entries in the format
+# repo name,repo uri,repo branch,repo commit[,layers=layer1:layer2...:layern]
+
+bitbake,https://git.openembedded.org/bitbake,2.18,HEAD
+meta-yocto,https://git.yoctoproject.org/meta-yocto,wrynose,HEAD,layers=meta-poky:meta-yocto-bsp
+meta-ti,https://git.yoctoproject.org/meta-ti,wrynose-wip,HEAD,layers=meta-ti-test:meta-ti-extras:meta-beagle:meta-ti-bsp
+meta-arm,https://git.yoctoproject.org/meta-arm,wrynose,HEAD,layers=meta-arm:meta-arm-toolchain
+oe-core,https://git.openembedded.org/openembedded-core,wrynose,HEAD,layers=meta
+
+OECORELAYERCONF=./sample-files/bblayers.conf.sample
+OECORELOCALCONF=./sample-files/local-poky-v3.conf.sample
+BITBAKE_INCLUSIVE_VARS=yes
diff --git a/kas/poky-master-config.yml b/kas/poky-wrynose-config.yml
similarity index 89%
copy from kas/poky-master-config.yml
copy to kas/poky-wrynose-config.yml
index 1b8035c..34577f3 100644
--- a/kas/poky-master-config.yml
+++ b/kas/poky-wrynose-config.yml
@@ -10,14 +10,14 @@ target: core_image_minimal
 repos:
   bitbake:
     url: "https://git.openembedded.org/bitbake"
-    branch: "master"
+    branch: "2.18"
     path: "sources/bitbake"
     layers:
       .: disabled
 
   meta-yocto:
     url: "https://git.yoctoproject.org/meta-yocto"
-    branch: "master"
+    branch: "wrynose"
     path: "sources/meta-yocto"
     layers:
       meta-poky:
@@ -25,7 +25,7 @@ repos:
 
   meta-ti:
     url: "https://git.yoctoproject.org/meta-ti"
-    branch: "master"
+    branch: "wrynose"
     path: "sources/meta-ti"
     layers:
       meta-ti-test:
@@ -35,7 +35,7 @@ repos:
 
   meta-arm:
     url: "https://git.yoctoproject.org/meta-arm"
-    branch: "master"
+    branch: "wrynose"
     path: "sources/meta-arm"
     layers:
       meta-arm:
@@ -43,7 +43,7 @@ repos:
 
   oe-core:
     url: "https://git.openembedded.org/openembedded-core"
-    branch: "master"
+    branch: "wrynose"
     path: "sources/oe-core"
     layers:
       meta:
diff --git a/kas/poky-master-config.yml b/kas/poky-wrynose-wip-config.yml
similarity index 88%
copy from kas/poky-master-config.yml
copy to kas/poky-wrynose-wip-config.yml
index 1b8035c..e023e9f 100644
--- a/kas/poky-master-config.yml
+++ b/kas/poky-wrynose-wip-config.yml
@@ -10,14 +10,14 @@ target: core_image_minimal
 repos:
   bitbake:
     url: "https://git.openembedded.org/bitbake"
-    branch: "master"
+    branch: "2.18"
     path: "sources/bitbake"
     layers:
       .: disabled
 
   meta-yocto:
     url: "https://git.yoctoproject.org/meta-yocto"
-    branch: "master"
+    branch: "wrynose"
     path: "sources/meta-yocto"
     layers:
       meta-poky:
@@ -25,7 +25,7 @@ repos:
 
   meta-ti:
     url: "https://git.yoctoproject.org/meta-ti"
-    branch: "master"
+    branch: "wrynose-wip"
     path: "sources/meta-ti"
     layers:
       meta-ti-test:
@@ -35,7 +35,7 @@ repos:
 
   meta-arm:
     url: "https://git.yoctoproject.org/meta-arm"
-    branch: "master"
+    branch: "wrynose"
     path: "sources/meta-arm"
     layers:
       meta-arm:
@@ -43,7 +43,7 @@ repos:
 
   oe-core:
     url: "https://git.openembedded.org/openembedded-core"
-    branch: "master"
+    branch: "wrynose"
     path: "sources/oe-core"
     layers:
       meta:
diff --git a/src/configs/poky-master-config.xml b/src/configs/poky-wrynose-config.xml
similarity index 88%
copy from src/configs/poky-master-config.xml
copy to src/configs/poky-wrynose-config.xml
index 8562f36..3a0a19f 100644
--- a/src/configs/poky-master-config.xml
+++ b/src/configs/poky-wrynose-config.xml
@@ -7,16 +7,16 @@
     <xi:include href='../templates/bblayers.conf.xml' xmlns:xi='http://www.w3.org/2001/XInclude'/>
     <xi:include href='../templates/local-poky-v3.conf.xml' xmlns:xi='http://www.w3.org/2001/XInclude'/>
 
-    <bitbake url='https://git.openembedded.org/bitbake' branch='master' commit='HEAD'/>
+    <bitbake url='https://git.openembedded.org/bitbake' branch='2.18' commit='HEAD'/>
 
     <repos>
-        <repo name='meta-yocto' url='https://git.yoctoproject.org/meta-yocto' branch='master' commit='HEAD'>
+        <repo name='meta-yocto' url='https://git.yoctoproject.org/meta-yocto' branch='wrynose' commit='HEAD'>
             <layers>
                 <layer>meta-poky</layer>
                 <layer>meta-yocto-bsp</layer>
             </layers>
         </repo>
-        <repo name='meta-ti' url='https://git.yoctoproject.org/meta-ti' branch='master' commit='HEAD'>
+        <repo name='meta-ti' url='https://git.yoctoproject.org/meta-ti' branch='wrynose' commit='HEAD'>
             <layers>
                 <layer>meta-ti-test</layer>
                 <layer>meta-ti-extras</layer>
@@ -24,13 +24,13 @@
                 <layer>meta-ti-bsp</layer>
             </layers>
         </repo>
-        <repo name='meta-arm' url='https://git.yoctoproject.org/meta-arm' branch='master' commit='HEAD'>
+        <repo name='meta-arm' url='https://git.yoctoproject.org/meta-arm' branch='wrynose' commit='HEAD'>
             <layers>
                 <layer>meta-arm</layer>
                 <layer>meta-arm-toolchain</layer>
             </layers>
         </repo>
-        <repo name='oe-core' url='https://git.openembedded.org/openembedded-core' branch='master' commit='HEAD'>
+        <repo name='oe-core' url='https://git.openembedded.org/openembedded-core' branch='wrynose' commit='HEAD'>
             <layers>
                 <layer>meta</layer>
             </layers>
diff --git a/src/configs/poky-master-wip-config.xml b/src/configs/poky-wrynose-wip-config.xml
similarity index 88%
copy from src/configs/poky-master-wip-config.xml
copy to src/configs/poky-wrynose-wip-config.xml
index 9e4d6c0..4e2d9f1 100644
--- a/src/configs/poky-master-wip-config.xml
+++ b/src/configs/poky-wrynose-wip-config.xml
@@ -7,16 +7,16 @@
     <xi:include href='../templates/bblayers.conf.xml' xmlns:xi='http://www.w3.org/2001/XInclude'/>
     <xi:include href='../templates/local-poky-v3.conf.xml' xmlns:xi='http://www.w3.org/2001/XInclude'/>
 
-    <bitbake url='https://git.openembedded.org/bitbake' branch='master' commit='HEAD'/>
+    <bitbake url='https://git.openembedded.org/bitbake' branch='2.18' commit='HEAD'/>
 
     <repos>
-        <repo name='meta-yocto' url='https://git.yoctoproject.org/meta-yocto' branch='master' commit='HEAD'>
+        <repo name='meta-yocto' url='https://git.yoctoproject.org/meta-yocto' branch='wrynose' commit='HEAD'>
             <layers>
                 <layer>meta-poky</layer>
                 <layer>meta-yocto-bsp</layer>
             </layers>
         </repo>
-        <repo name='meta-ti' url='https://git.yoctoproject.org/meta-ti' branch='master-wip' commit='HEAD'>
+        <repo name='meta-ti' url='https://git.yoctoproject.org/meta-ti' branch='wrynose-wip' commit='HEAD'>
             <layers>
                 <layer>meta-ti-test</layer>
                 <layer>meta-ti-extras</layer>
@@ -24,13 +24,13 @@
                 <layer>meta-ti-bsp</layer>
             </layers>
         </repo>
-        <repo name='meta-arm' url='https://git.yoctoproject.org/meta-arm' branch='master' commit='HEAD'>
+        <repo name='meta-arm' url='https://git.yoctoproject.org/meta-arm' branch='wrynose' commit='HEAD'>
             <layers>
                 <layer>meta-arm</layer>
                 <layer>meta-arm-toolchain</layer>
             </layers>
         </repo>
-        <repo name='oe-core' url='https://git.openembedded.org/openembedded-core' branch='master' commit='HEAD'>
+        <repo name='oe-core' url='https://git.openembedded.org/openembedded-core' branch='wrynose' commit='HEAD'>
             <layers>
                 <layer>meta</layer>
             </layers>