diff --git a/hassio/addons/data.py b/hassio/addons/data.py
index 197ad7cb8..e17f68041 100644
--- a/hassio/addons/data.py
+++ b/hassio/addons/data.py
@@ -393,5 +393,7 @@ class AddonsData(Config):
         """Create a schema for addon options."""
         raw_schema = self._system_data[addon][ATTR_SCHEMA]
 
-        schema = vol.Schema(vol.All(dict, validate_options(raw_schema)))
-        return schema
+        if isinstance(raw_schema, bool):
+            return vol.Schema(dict)
+
+        return vol.Schema(vol.All(dict, validate_options(raw_schema)))
diff --git a/hassio/addons/validate.py b/hassio/addons/validate.py
index 62a0e824d..95795c02e 100644
--- a/hassio/addons/validate.py
+++ b/hassio/addons/validate.py
@@ -62,11 +62,11 @@ SCHEMA_ADDON_CONFIG = vol.Schema(vol.All({
     vol.Optional(ATTR_ENVIRONMENT): {vol.Match(r"\w*"): vol.Coerce(str)},
     vol.Optional(ATTR_PRIVILEGED): [vol.In(PRIVILEGE_ALL)],
     vol.Required(ATTR_OPTIONS): dict,
-    vol.Required(ATTR_SCHEMA): {
+    vol.Required(ATTR_SCHEMA): vol.Any({
         vol.Coerce(str): vol.Any(ADDON_ELEMENT, [
             vol.Any(ADDON_ELEMENT, {vol.Coerce(str): ADDON_ELEMENT})
         ])
-    },
+    }, False),
     vol.Optional(ATTR_IMAGE): vol.Match(r"\w*/\w*"),
 }, check_network), extra=vol.ALLOW_EXTRA)
 
diff --git a/hassio/const.py b/hassio/const.py
index cc80513fe..826cbabee 100644
--- a/hassio/const.py
+++ b/hassio/const.py
@@ -1,7 +1,7 @@
 """Const file for HassIO."""
 from pathlib import Path
 
-HASSIO_VERSION = '0.36'
+HASSIO_VERSION = '0.37'
 
 URL_HASSIO_VERSION = ('https://raw.githubusercontent.com/home-assistant/'
                       'hassio/master/version.json')
diff --git a/hassio/dock/__init__.py b/hassio/dock/__init__.py
index 8f149aa83..764edd67c 100644
--- a/hassio/dock/__init__.py
+++ b/hassio/dock/__init__.py
@@ -206,8 +206,8 @@ class DockerBase(object):
 
         Need run inside executor.
         """
-        if self._is_running():
-            self._stop()
+        # cleanup container
+        self._stop()
 
         _LOGGER.info(
             "Remove docker %s with latest and %s", self.image, self.version)
diff --git a/hassio/dock/util.py b/hassio/dock/util.py
index 9aafab437..87cd76020 100644
--- a/hassio/dock/util.py
+++ b/hassio/dock/util.py
@@ -5,10 +5,10 @@ from ..const import ARCH_AARCH64, ARCH_ARMHF, ARCH_I386, ARCH_AMD64
 
 
 RESIN_BASE_IMAGE = {
-    ARCH_ARMHF: "resin/armhf-alpine:3.5",
-    ARCH_AARCH64: "resin/aarch64-alpine:3.5",
-    ARCH_I386: "resin/i386-alpine:3.5",
-    ARCH_AMD64: "resin/amd64-alpine:3.5",
+    ARCH_ARMHF: "homeassistant/armhf-base:latest",
+    ARCH_AARCH64: "homeassistant/aarch64-base:latest",
+    ARCH_I386: "homeassistant/i386-base:latest",
+    ARCH_AMD64: "homeassistant/amd64-base:latest",
 }
 
 TMPL_IMAGE = re.compile(r"%%BASE_IMAGE%%")
diff --git a/version.json b/version.json
index c38d70dc6..a9604432a 100644
--- a/version.json
+++ b/version.json
@@ -1,5 +1,5 @@
 {
-    "hassio": "0.36",
+    "hassio": "0.37",
     "homeassistant": "0.46.1",
     "resinos": "0.8",
     "resinhup": "0.1",