diff --git a/ssh/CHANGELOG.md b/ssh/CHANGELOG.md
index 8882786..5a60f39 100644
--- a/ssh/CHANGELOG.md
+++ b/ssh/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 6.0
+
+- Update and pin base image to Alpine 3.10
+
 ## 5.6
 
 - Fixes crash when using authorized keys
diff --git a/ssh/Dockerfile b/ssh/Dockerfile
index 1ddbd59..4fcf0e1 100644
--- a/ssh/Dockerfile
+++ b/ssh/Dockerfile
@@ -1,9 +1,6 @@
 ARG BUILD_FROM
 FROM $BUILD_FROM
 
-# Add env
-ENV LANG C.UTF-8
-
 # Setup base
 RUN apk add --no-cache \
     bash-completion \
@@ -22,8 +19,8 @@ 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
 
+# Hass.io CLI
 ARG BUILD_ARCH
 ARG CLI_VERSION
 RUN apk add --no-cache curl \
@@ -32,8 +29,8 @@ RUN apk add --no-cache curl \
     && /usr/bin/hassio completion > /usr/share/bash-completion/completions/hassio
 
 # Copy data
-COPY run.sh /
-COPY motd /etc/
-COPY sshd_config /etc/ssh/
+COPY data/run.sh /
+COPY data/motd /etc/
+COPY data/sshd_config /etc/ssh/
 
 CMD [ "/run.sh" ]
diff --git a/ssh/build.json b/ssh/build.json
index ee9c196..adf34aa 100644
--- a/ssh/build.json
+++ b/ssh/build.json
@@ -1,4 +1,11 @@
 {
+  "build_from": {
+    "amd64": "homeassistant/amd64-base:3.10",
+    "i386": "homeassistant/i386-base:3.10",
+    "armhf": "homeassistant/armhf-base:3.10",
+    "armv7": "homeassistant/armv7-base:3.10",
+    "aarch64": "homeassistant/aarch64-base:3.10"
+  },
   "args": {
     "CLI_VERSION": "2.2.0"
   }
diff --git a/ssh/config.json b/ssh/config.json
index 7ee0e95..7078a4d 100644
--- a/ssh/config.json
+++ b/ssh/config.json
@@ -1,6 +1,6 @@
 {
   "name": "SSH server",
-  "version": "5.6",
+  "version": "6.0",
   "slug": "ssh",
   "description": "Allows connections over SSH",
   "url": "https://github.com/home-assistant/hassio-addons/tree/master/ssh",
diff --git a/ssh/motd b/ssh/data/motd
similarity index 100%
rename from ssh/motd
rename to ssh/data/motd
diff --git a/ssh/run.sh b/ssh/data/run.sh
similarity index 100%
rename from ssh/run.sh
rename to ssh/data/run.sh
diff --git a/ssh/sshd_config b/ssh/data/sshd_config
similarity index 100%
rename from ssh/sshd_config
rename to ssh/data/sshd_config