diff --git a/ssh/CHANGELOG.md b/ssh/CHANGELOG.md
index 1276d01..5897706 100644
--- a/ssh/CHANGELOG.md
+++ b/ssh/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 3.7
+- Add YAML highlighting for nano
+
 ## 3.6
 - Update Hass.io CLI to 1.3.1
 
diff --git a/ssh/Dockerfile b/ssh/Dockerfile
index c231ccf..5102735 100644
--- a/ssh/Dockerfile
+++ b/ssh/Dockerfile
@@ -12,6 +12,10 @@ RUN apk add --no-cache \
 # Replace bash as default shell
 RUN sed -i "s/ash/bash/" /etc/passwd
 
+# Add YAML highlighting for nano
+ADD https://raw.githubusercontent.com/scopatz/nanorc/master/yaml.nanorc /usr/share/nano/yaml.nanorc
+RUN sed -i 's/^#[[:space:]]*\(include "\/usr\/share\/nano\/\*\.nanorc".*\)/\1/' /etc/nanorc
+
 # Hass.io CLI
 ARG BUILD_ARCH
 ARG CLI_VERSION
diff --git a/ssh/config.json b/ssh/config.json
index 5fb0c48..ec819d4 100644
--- a/ssh/config.json
+++ b/ssh/config.json
@@ -1,6 +1,6 @@
 {
   "name": "SSH server",
-  "version": "3.6",
+  "version": "3.7",
   "slug": "ssh",
   "description": "Allows connections over SSH",
   "url": "https://home-assistant.io/addons/ssh/",