diff --git a/.workbench/manifest.json b/.workbench/manifest.json
new file mode 100644
index 0000000000..a59c80c3ac
--- /dev/null
+++ b/.workbench/manifest.json
@@ -0,0 +1,177 @@
+{
+    "version": "1.0.0",
+    "toolchains": [
+        {
+            "platforms": [6, 8, 10, 12, 13, 14, 23],
+            "firmware": "deviceOS@source",
+            "compilers": "gcc-arm@5.3.1",
+            "tools": "buildtools@1.1.1",
+            "scripts": "buildscripts@1.7.1",
+            "debuggers": "openocd@0.11.2-adhoc6ea4372.0"
+        }
+    ],
+    "compilers": {
+        "windows": {
+            "x64": [
+                {
+                    "name": "gcc-arm",
+                    "version": "5.3.1",
+                    "main": "./bin",
+                    "url": "https://binaries.particle.io/gcc-arm/windows/x64/gcc-arm-v5.3.1.tar.gz",
+                    "sha256": "9d5106811e6ad8f3fd63ac266fb3e6e31798e14333b50f849130f604e331ba3d"
+                }
+            ],
+            "x86": [
+            ]
+        },
+        "darwin": {
+            "x64": [
+                {
+                    "name": "gcc-arm",
+                    "version": "5.3.1",
+                    "main": "./bin",
+                    "url": "https://binaries.particle.io/gcc-arm/darwin/x64/gcc-arm-v5.3.1.tar.gz",
+                    "sha256": "f41f32436188c3017422635b187378c8bf0938a3ad396506b2d3b8ce1fb402c9"
+                }
+            ],
+            "x86": [
+            ]
+        },
+        "linux": {
+            "x64": [
+                {
+                    "name": "gcc-arm",
+                    "version": "5.3.1",
+                    "main": "./bin",
+                    "url": "https://binaries.particle.io/gcc-arm/linux/x64/gcc-arm-v5.3.1.tar.gz",
+                    "sha256": "99c8dc248a6f39c92268d680fc661b51b38b773db1148204cdf59792d170bfdc"
+                }
+            ],
+            "x86": [
+            ]
+        }
+    },
+    "tools": {
+        "windows": {
+            "x64": [
+                {
+                    "name":  "buildtools",
+                    "version":  "1.1.1",
+                    "main":  "./bin",
+                    "url":  "https://binaries.particle.io/buildtools/windows/x64/buildtools-v1.1.1.tar.gz",
+                    "sha256":  "674c9c0bca32f8f6345199e7f97834476182210c9e15a79eb4942df8988c28fe"
+                }
+            ],
+            "x86": [
+            ]
+        },
+        "darwin": {
+            "x64": [
+                {
+                    "name": "buildtools",
+                    "version":  "1.1.1",
+                    "main": ".",
+                    "url": "https://binaries.particle.io/buildtools/darwin/x64/buildtools-v1.1.1.tar.gz",
+                    "sha256": "789f7b5bdd4213b5bb5e57f3aad4f99ff775fff721bef40c65b8abf59c57c630"
+                }
+            ],
+            "x86": [
+            ]
+        },
+        "linux": {
+            "x64": [
+                {
+                    "name": "buildtools",
+                    "version":  "1.1.1",
+                    "main": ".",
+                    "url": "https://binaries.particle.io/buildtools/linux/x64/buildtools-v1.1.1.tar.gz",
+                    "sha256": "a7c15b28966ed4d77d010001eee19de4385732e765c199051bc3bcdfb1e55846"
+                }
+            ],
+            "x86": [
+            ]
+        }
+    },
+    "scripts": {
+        "windows": {
+            "x64": [
+                {
+                    "name": "buildscripts",
+                    "version": "1.7.1",
+                    "main": ".",
+                    "url": "https://binaries.particle.io/buildscripts/windows/x64/buildscripts-v1.7.1.tar.gz",
+                    "sha256": "62ff21eba93c7d67a0a732499d3af47df1c497be043e715c466ba4004b830ba9"
+                }
+            ],
+            "x86": [
+            ]
+        },
+        "darwin": {
+            "x64": [
+                {
+                    "name": "buildscripts",
+                    "version": "1.7.1",
+                    "main": ".",
+                    "url": "https://binaries.particle.io/buildscripts/darwin/x64/buildscripts-v1.7.1.tar.gz",
+                    "sha256": "62ff21eba93c7d67a0a732499d3af47df1c497be043e715c466ba4004b830ba9"
+                }
+            ],
+            "x86": [
+            ]
+        },
+        "linux": {
+            "x64": [
+                {
+                    "name": "buildscripts",
+                    "version": "1.7.1",
+                    "main": ".",
+                    "url": "https://binaries.particle.io/buildscripts/linux/x64/buildscripts-v1.7.1.tar.gz",
+                    "sha256": "62ff21eba93c7d67a0a732499d3af47df1c497be043e715c466ba4004b830ba9"
+                }
+            ],
+            "x86": [
+            ]
+        }
+    },
+    "debuggers": {
+        "windows": {
+            "x64": [
+                {
+                    "name": "openocd",
+                    "version": "0.11.2-adhoc6ea4372.0",
+                    "main": ".",
+                    "url": "https://binaries.particle.io/openocd/windows/x64/openocd-v0.11.2-adhoc6ea4372.0.tar.gz",
+                    "sha256": "790954533100e5bd6c2e22085c6c7b099176c51d798fde9895779e12562ee134"
+                }
+            ],
+            "x86": [
+            ]
+        },
+        "darwin": {
+            "x64": [
+                {
+                    "name": "openocd",
+                    "version": "0.11.2-adhoc6ea4372.0",
+                    "main": ".",
+                    "url": "https://binaries.particle.io/openocd/darwin/x64/openocd-v0.11.2-adhoc6ea4372.0.tar.gz",
+                    "sha256": "c2b30c3e933d69c7b9608c7814dbc998e775a6c104c144c567f2835e3f0d862c"
+                }
+            ],
+            "x86": [
+            ]
+        },
+        "linux": {
+            "x64": [
+                {
+                    "name": "openocd",
+                    "version": "0.11.2-adhoc6ea4372.0",
+                    "main": ".",
+                    "url": "https://binaries.particle.io/openocd/linux/x64/openocd-v0.11.2-adhoc6ea4372.0.tar.gz",
+                    "sha256": "42272bd1f012af43bb2fd80656e9f08a04e97bc8ffdc2d1e3e5062ea46ce657e"
+                }
+            ],
+            "x86": [
+            ]
+        }
+    }
+}
diff --git a/scripts/fetch-buildpack b/scripts/fetch-buildpack
index fb1cad5437..6cfda40aaa 100755
--- a/scripts/fetch-buildpack
+++ b/scripts/fetch-buildpack
@@ -1,5 +1,4 @@
-BUILDPACK_FILES=$(mkdir buildpack && wget https://api.github.com/repos/particle-iot/firmware-buildpack-builder/tarball/0.0.8 -O - | tar -xvz -C buildpack --strip-components 1)
+BUILDPACK_FILES=$(mkdir buildpack && wget https://api.github.com/repos/particle-iot/firmware-buildpack-builder/tarball/feature/unification -O - | tar -xvz -C buildpack --strip-components 1)
 SHORT_REF=$(echo "$BUILDPACK_FILES" | head -n1 | cut -d '/' -f 1 | rev | cut -d '-' -f 1 | rev)
 mkdir buildpack/.git
 echo "${SHORT_REF}" > buildpack/.git/short_ref
-