diff --git a/contracts/sw.image-writer+hw.device-type/etcher/flash.tpl b/contracts/sw.blob.image-writer+hw.device-type/etcher/flash.tpl
similarity index 100%
rename from contracts/sw.image-writer+hw.device-type/etcher/flash.tpl
rename to contracts/sw.blob.image-writer+hw.device-type/etcher/flash.tpl
diff --git a/contracts/sw.blob/image-writer/download.tpl b/contracts/sw.blob/image-writer/download.tpl
new file mode 100644
index 00000000..f0c8d6c9
--- /dev/null
+++ b/contracts/sw.blob/image-writer/download.tpl
@@ -0,0 +1 @@
+[Download {{sw.blob.image-writer.name}} v{{sw.blob.image-writer.version}}]({{sw.blob.image-writer.assets.bin.url}})
diff --git a/contracts/sw.image-writer/etcher/contract.json b/contracts/sw.blob/image-writer/etcher/contract.json
similarity index 67%
rename from contracts/sw.image-writer/etcher/contract.json
rename to contracts/sw.blob/image-writer/etcher/contract.json
index ccfa4d9e..f4711bac 100644
--- a/contracts/sw.image-writer/etcher/contract.json
+++ b/contracts/sw.blob/image-writer/etcher/contract.json
@@ -1,11 +1,12 @@
 {
   "slug": "etcher",
-  "type": "sw.image-writer",
+  "type": "sw.blob.image-writer",
   "name": "Etcher for macOS",
-  "version": "1.1.2",
+  "version": "1",
+  "componentVersion": "1.1.2",
   "assets": {
     "bin": {
-      "url": "https://github.com/resin-io/etcher/releases/download/v{{version}}/Etcher-{{version}}.dmg",
+      "url": "https://github.com/resin-io/etcher/releases/download/v{{componentVersion}}/Etcher-{{version}}.dmg",
       "checksum": "b562c7ff89e0de86003ee1cc14a1ee08ab5988a543b6e22235fe3773a48074a4",
       "checksumType": "sha256"
     }
diff --git a/contracts/sw.blob/os-supervisor/supervisor/contract.json b/contracts/sw.blob/os-supervisor/supervisor/contract.json
new file mode 100644
index 00000000..88135ada
--- /dev/null
+++ b/contracts/sw.blob/os-supervisor/supervisor/contract.json
@@ -0,0 +1,14 @@
+{
+  "slug": "supervisor",
+  "type": "sw.supervisor",
+  "name": "resin supervisor",
+  "version": "1",
+  "componentVersion": "7.5.6",
+  "assets": {
+    "bin": {
+      "url": "https://github.com/resin-io/resin-supervisor/archive/v{{componentVersion}}.tar.gz",
+      "checksum": "b562c7ff89e0de86003ee1cc14a1ee08ab5988a543b6e22235fe3773a48074a4",
+      "checksumType": "sha256"
+    }
+  }
+}
diff --git a/contracts/sw.image-writer/download.tpl b/contracts/sw.image-writer/download.tpl
deleted file mode 100644
index 5a25755d..00000000
--- a/contracts/sw.image-writer/download.tpl
+++ /dev/null
@@ -1 +0,0 @@
-[Download {{sw.image-writer.name}} v{{sw.image-writer.version}}]({{sw.image-writer.assets.bin.url}})