diff --git a/Dockerfile b/Dockerfile
index 91329f10e..10afdd765 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,24 +1,29 @@
 ARG BUILD_FROM
 FROM $BUILD_FROM
 
+ENV \
+    S6_SERVICES_GRACETIME=10000
+
 # Install base
-RUN apk add --no-cache \
-    eudev \
-    eudev-libs \
-    git \
-    glib \
-    libffi \
-    libpulse \
-    musl \
-    openssl \
-    socat
+RUN \
+    apk add --no-cache \
+        eudev \
+        eudev-libs \
+        git \
+        glib \
+        libffi \
+        libpulse \
+        musl \
+        openssl \
+        socat
 
 ARG BUILD_ARCH
 WORKDIR /usr/src
 
 # Install requirements
 COPY requirements.txt .
-RUN export MAKEFLAGS="-j$(nproc)" \
+RUN \
+    export MAKEFLAGS="-j$(nproc)" \
     && pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links \
         "https://wheels.home-assistant.io/alpine-$(cut -d '.' -f 1-2 < /etc/alpine-release)/${BUILD_ARCH}/" \
         -r ./requirements.txt \
@@ -26,7 +31,8 @@ RUN export MAKEFLAGS="-j$(nproc)" \
 
 # Install Home Assistant Supervisor
 COPY . supervisor
-RUN pip3 install --no-cache-dir -e ./supervisor \
+RUN \
+    pip3 install --no-cache-dir -e ./supervisor \
     && python3 -m compileall ./supervisor/supervisor
 
 
diff --git a/supervisor/const.py b/supervisor/const.py
index 5b92de955..8bdb7b1b1 100644
--- a/supervisor/const.py
+++ b/supervisor/const.py
@@ -3,7 +3,7 @@ from enum import Enum
 from ipaddress import ip_network
 from pathlib import Path
 
-SUPERVISOR_VERSION = "215"
+SUPERVISOR_VERSION = "216"
 
 
 URL_HASSIO_ADDONS = "https://github.com/home-assistant/hassio-addons"
diff --git a/supervisor/plugins/__init__.py b/supervisor/plugins/__init__.py
index 79b91338b..674a3eef9 100644
--- a/supervisor/plugins/__init__.py
+++ b/supervisor/plugins/__init__.py
@@ -16,7 +16,7 @@ class PluginManager(CoreSysAttributes):
     """Manage supported function for plugins."""
 
     required_cli: int = 25
-    required_dns: int = 6
+    required_dns: int = 9
     required_audio: int = 14
     required_multicast: int = 2
 
diff --git a/supervisor/supervisor.py b/supervisor/supervisor.py
index 59f5ca426..02a9667ac 100644
--- a/supervisor/supervisor.py
+++ b/supervisor/supervisor.py
@@ -124,7 +124,7 @@ class Supervisor(CoreSysAttributes):
 
         with suppress(SupervisorError):
             await self.update_apparmor()
-        self.sys_loop.call_later(1, self.sys_loop.stop)
+        self.sys_loop.call_later(5, self.sys_loop.stop)
 
     @property
     def in_progress(self) -> bool: