diff --git a/CODEOWNERS b/CODEOWNERS
index 0f249f0dc5d..af6929b2870 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -9,6 +9,12 @@ homeassistant/*.py @home-assistant/core
 homeassistant/helpers/* @home-assistant/core
 homeassistant/util/* @home-assistant/core
 
+# Home Assistant Supervisor
+build.json @home-assistant/supervisor
+machine/* @home-assistant/supervisor
+rootfs/* @home-assistant/supervisor
+Dockerfile @home-assistant/supervisor
+
 # Other code
 homeassistant/scripts/check_config.py @kellerza
 
@@ -170,7 +176,7 @@ homeassistant/components/group/* @home-assistant/core
 homeassistant/components/growatt_server/* @indykoning
 homeassistant/components/guardian/* @bachya
 homeassistant/components/harmony/* @ehendrix23 @bramkragten @bdraco
-homeassistant/components/hassio/* @home-assistant/hass-io
+homeassistant/components/hassio/* @home-assistant/supervisor
 homeassistant/components/hdmi_cec/* @newAM
 homeassistant/components/heatmiser/* @andylockran
 homeassistant/components/heos/* @andrewsayre
diff --git a/azure-pipelines-release.yml b/azure-pipelines-release.yml
index 2420c2e44a0..d95a22e111b 100644
--- a/azure-pipelines-release.yml
+++ b/azure-pipelines-release.yml
@@ -14,7 +14,7 @@ schedules:
     always: true
 variables:
   - name: versionBuilder
-    value: '7.2.0'
+    value: '2020.11.0'
   - group: docker
   - group: github
   - group: twine
diff --git a/build.json b/build.json
index f48c5e217aa..43e23d32094 100644
--- a/build.json
+++ b/build.json
@@ -1,11 +1,11 @@
 {
   "image": "homeassistant/{arch}-homeassistant",
   "build_from": {
-    "aarch64": "homeassistant/aarch64-homeassistant-base:2020.10.0",
-    "armhf": "homeassistant/armhf-homeassistant-base:2020.10.0",
-    "armv7": "homeassistant/armv7-homeassistant-base:2020.10.0",
-    "amd64": "homeassistant/amd64-homeassistant-base:2020.10.0",
-    "i386": "homeassistant/i386-homeassistant-base:2020.10.0"
+    "aarch64": "homeassistant/aarch64-homeassistant-base:2020.10.1",
+    "armhf": "homeassistant/armhf-homeassistant-base:2020.10.1",
+    "armv7": "homeassistant/armv7-homeassistant-base:2020.10.1",
+    "amd64": "homeassistant/amd64-homeassistant-base:2020.10.1",
+    "i386": "homeassistant/i386-homeassistant-base:2020.10.1"
   },
   "labels": {
     "io.hass.type": "core"
diff --git a/homeassistant/components/hassio/manifest.json b/homeassistant/components/hassio/manifest.json
index bc215932aa8..193c9640cd5 100644
--- a/homeassistant/components/hassio/manifest.json
+++ b/homeassistant/components/hassio/manifest.json
@@ -4,5 +4,5 @@
   "documentation": "https://www.home-assistant.io/hassio",
   "dependencies": ["http"],
   "after_dependencies": ["panel_custom"],
-  "codeowners": ["@home-assistant/hass-io"]
+  "codeowners": ["@home-assistant/supervisor"]
 }
diff --git a/script/hassfest/codeowners.py b/script/hassfest/codeowners.py
index 6d312bf8610..eba657f64cf 100644
--- a/script/hassfest/codeowners.py
+++ b/script/hassfest/codeowners.py
@@ -15,6 +15,12 @@ homeassistant/*.py @home-assistant/core
 homeassistant/helpers/* @home-assistant/core
 homeassistant/util/* @home-assistant/core
 
+# Home Assistant Supervisor
+build.json @home-assistant/supervisor
+machine/* @home-assistant/supervisor
+rootfs/* @home-assistant/supervisor
+Dockerfile @home-assistant/supervisor
+
 # Other code
 homeassistant/scripts/check_config.py @kellerza