diff --git a/package-lock.json b/package-lock.json
index ed846a2b8..cd9f72644 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1632,18 +1632,23 @@
       }
     },
     "cloudron-manifestformat": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/cloudron-manifestformat/-/cloudron-manifestformat-2.11.0.tgz",
-      "integrity": "sha512-t4KR2KmK1JDtxw1n6IVNg0+xxspk/Cpb6m1WimE9hJ0KJYsIgZNnkce47uYiG9/nWrgUSV4xcdzsS91OOvWgig==",
+      "version": "2.12.0",
+      "resolved": "https://registry.npmjs.org/cloudron-manifestformat/-/cloudron-manifestformat-2.12.0.tgz",
+      "integrity": "sha512-OJ2S0eVekEE+D3UOjVH3FEYdxIASNiS+qSwz0UmtzU8XnOMSBSJe3F6qdmKvQMoYW8OE2Y9S+R9eEYQAwS60Aw==",
       "requires": {
         "cron": "1.3.0",
-        "java-packagename-regex": "https://registry.npmjs.org/java-packagename-regex/-/java-packagename-regex-1.0.0.tgz",
+        "java-packagename-regex": "1.0.0",
         "safetydance": "0.0.15",
         "semver": "4.3.6",
-        "tv4": "https://registry.npmjs.org/tv4/-/tv4-1.3.0.tgz",
+        "tv4": "1.3.0",
         "validator": "3.43.0"
       },
       "dependencies": {
+        "java-packagename-regex": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/java-packagename-regex/-/java-packagename-regex-1.0.0.tgz",
+          "integrity": "sha1-lR9he9WhlCIO0GcLm4KowOxcYiQ="
+        },
         "safetydance": {
           "version": "0.0.15",
           "resolved": "https://registry.npmjs.org/safetydance/-/safetydance-0.0.15.tgz",
@@ -1654,6 +1659,11 @@
           "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
           "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto="
         },
+        "tv4": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/tv4/-/tv4-1.3.0.tgz",
+          "integrity": "sha1-0CDIRvrdUMhVq7JeuuzGj8EPeWM="
+        },
         "validator": {
           "version": "3.43.0",
           "resolved": "https://registry.npmjs.org/validator/-/validator-3.43.0.tgz",
@@ -3178,32 +3188,6 @@
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
       "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
     },
-    "fs-extra": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz",
-      "integrity": "sha1-9G8MdbeEH40gCzNIzU1pHVoJnRU=",
-      "dev": true,
-      "requires": {
-        "jsonfile": "1.0.1",
-        "mkdirp": "0.3.5",
-        "ncp": "0.4.2",
-        "rimraf": "2.2.8"
-      },
-      "dependencies": {
-        "mkdirp": {
-          "version": "0.3.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
-          "integrity": "sha1-3j5fiWHIjHh+4TaN+EmsRBPsqNc=",
-          "dev": true
-        },
-        "rimraf": {
-          "version": "2.2.8",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
-          "integrity": "sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI=",
-          "dev": true
-        }
-      }
-    },
     "fs.realpath": {
       "version": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
@@ -4489,10 +4473,6 @@
         }
       }
     },
-    "java-packagename-regex": {
-      "version": "https://registry.npmjs.org/java-packagename-regex/-/java-packagename-regex-1.0.0.tgz",
-      "integrity": "sha1-lR9he9WhlCIO0GcLm4KowOxcYiQ="
-    },
     "js-base64": {
       "version": "2.4.5",
       "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.5.tgz",
@@ -4549,12 +4529,6 @@
       "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
       "dev": true
     },
-    "jsonfile": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz",
-      "integrity": "sha1-6l7+QLg2kLmGZ2FKc5L8YOhCwN0=",
-      "dev": true
-    },
     "jsonparse": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
@@ -5158,22 +5132,6 @@
         }
       }
     },
-    "mock-aws-s3": {
-      "version": "git+https://github.com/cloudron-io/mock-aws-s3.git#1306f1722b82897382a2339d52a94ded15003d8c",
-      "dev": true,
-      "requires": {
-        "fs-extra": "0.6.4",
-        "underscore": "1.8.3"
-      },
-      "dependencies": {
-        "underscore": {
-          "version": "1.8.3",
-          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
-          "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=",
-          "dev": true
-        }
-      }
-    },
     "modelo": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/modelo/-/modelo-4.2.3.tgz",
@@ -5401,12 +5359,6 @@
       "integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo=",
       "optional": true
     },
-    "ncp": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz",
-      "integrity": "sha1-q8xsvT7C7Spyn/bnwfqPAXhKhXQ=",
-      "dev": true
-    },
     "negotiator": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
@@ -8478,10 +8430,6 @@
       "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
       "dev": true
     },
-    "tv4": {
-      "version": "https://registry.npmjs.org/tv4/-/tv4-1.3.0.tgz",
-      "integrity": "sha1-0CDIRvrdUMhVq7JeuuzGj8EPeWM="
-    },
     "tweetnacl": {
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
diff --git a/package.json b/package.json
index 6b82ff0b6..a261ef9e8 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "async": "^2.6.1",
     "aws-sdk": "^2.253.1",
     "body-parser": "^1.18.3",
-    "cloudron-manifestformat": "^2.11.0",
+    "cloudron-manifestformat": "^2.12.0",
     "connect-ensure-login": "^0.1.1",
     "connect-lastmile": "^1.0.2",
     "connect-timeout": "^1.9.0",
diff --git a/src/addons.js b/src/addons.js
index 566e83b06..572706da8 100644
--- a/src/addons.js
+++ b/src/addons.js
@@ -110,7 +110,7 @@ var KNOWN_ADDONS = {
         backup: NOOP,
         restore: NOOP
     },
-    _docker: {
+    docker: {
         setup: NOOP,
         teardown: NOOP,
         backup: NOOP,
@@ -219,7 +219,7 @@ function getBindsSync(app, addons) {
 
     for (let addon in addons) {
         switch (addon) {
-        case '_docker': binds.push('/var/run/docker.sock:/var/run/docker.sock:rw'); break;
+        case 'docker': binds.push('/var/run/docker.sock:/var/run/docker.sock:rw'); break;
         case 'localstorage':
             binds.push(path.join(paths.APPS_DATA_DIR, app.id, 'data') + ':/app/data:rw');
             if (!Array.isArray(addons[addon].bindMounts)) break;