diff --git a/esphome-dev/build.json b/esphome-dev/build.json
index 485d502..5f37fcc 100644
--- a/esphome-dev/build.json
+++ b/esphome-dev/build.json
@@ -1,10 +1,10 @@
 {
   "args": {},
   "build_from": {
-    "aarch64": "esphome/esphome-hassio-base-aarch64:1.7.0",
-    "amd64": "esphome/esphome-hassio-base-amd64:1.7.0",
-    "armv7": "esphome/esphome-hassio-base-armv7:1.7.0",
-    "i386": "esphome/esphome-hassio-base-i386:1.7.0"
+    "aarch64": "esphome/esphome-hassio-base-aarch64:1.8.0",
+    "amd64": "esphome/esphome-hassio-base-amd64:1.8.0",
+    "armv7": "esphome/esphome-hassio-base-armv7:1.8.0",
+    "i386": "esphome/esphome-hassio-base-i386:1.8.0"
   },
   "squash": false
 }
\ No newline at end of file
diff --git a/esphome-dev/rootfs/etc/nginx/servers/direct-ssl.disabled b/esphome-dev/rootfs/etc/nginx/servers/direct-ssl.disabled
index 10c7534..c2b8d65 100644
--- a/esphome-dev/rootfs/etc/nginx/servers/direct-ssl.disabled
+++ b/esphome-dev/rootfs/etc/nginx/servers/direct-ssl.disabled
@@ -4,6 +4,11 @@ server {
     include /etc/nginx/includes/server_params.conf;
     include /etc/nginx/includes/proxy_params.conf;
     include /etc/nginx/includes/ssl_params.conf;
+
+    ssl on;
+    ssl_certificate /ssl/%%certfile%%;
+    ssl_certificate_key /ssl/%%keyfile%%;
+
     # Clear Hass.io Ingress header
     proxy_set_header X-Hassio-Ingress "";
 
diff --git a/template/config.yaml b/template/config.yaml
index 38f0cfe..72f7023 100644
--- a/template/config.yaml
+++ b/template/config.yaml
@@ -39,7 +39,7 @@ base: &base
     streamer_mode: bool?
     relative_url: str?
     status_use_ping: bool?
-  base_image: esphome/esphome-hassio-base-{arch}:1.7.0
+  base_image: esphome/esphome-hassio-base-{arch}:1.8.0
 
 esphome-dev:
   <<: *base