diff --git a/hassio/docker/__init__.py b/hassio/docker/__init__.py
index c214e7dc2..11afaa3b7 100644
--- a/hassio/docker/__init__.py
+++ b/hassio/docker/__init__.py
@@ -47,8 +47,10 @@ class DockerAPI(object):
         hostname = kwargs.get('hostname')
 
         # setup network
+        kwargs['dns_search'] = ["."]
         if network_mode:
             kwargs['dns'] = [str(self.network.supervisor)]
+            kwargs['dns_opt'] = ["ndots:0"]
         else:
             kwargs['network'] = None
 
diff --git a/hassio/docker/network.py b/hassio/docker/network.py
index b6f55feda..b4a57c79f 100644
--- a/hassio/docker/network.py
+++ b/hassio/docker/network.py
@@ -52,7 +52,8 @@ class DockerNetwork(object):
         ipam_config = docker.types.IPAMConfig(pool_configs=[ipam_pool])
 
         return self.docker.networks.create(
-            DOCKER_NETWORK, driver='bridge', ipam=ipam_config, options={
+            DOCKER_NETWORK, driver='bridge', ipam=ipam_config,
+            enable_ipv6=False, options={
                 "com.docker.network.bridge.name": DOCKER_NETWORK,
             })