diff --git a/ssh/CHANGELOG.md b/ssh/CHANGELOG.md
index fe80706..4f96e8b 100644
--- a/ssh/CHANGELOG.md
+++ b/ssh/CHANGELOG.md
@@ -6,7 +6,7 @@
 
 ## 7.0
 
-- Added bash_profile as a persistent file 
+- Added bash_profile as a persistent file
 
 ## 6.4
 
diff --git a/ssh/Dockerfile b/ssh/Dockerfile
index 4fcf0e1..d5ffb4a 100644
--- a/ssh/Dockerfile
+++ b/ssh/Dockerfile
@@ -4,7 +4,6 @@ FROM $BUILD_FROM
 # Setup base
 RUN apk add --no-cache \
     bash-completion \
-    curl \
     git \
     mosquitto-clients \
     nano \
@@ -23,8 +22,8 @@ RUN sed -i 's/^#[[:space:]]*\(include "\/usr\/share\/nano\/\*\.nanorc".*\)/\1/'
 # Hass.io CLI
 ARG BUILD_ARCH
 ARG CLI_VERSION
-RUN apk add --no-cache curl \
-    && curl -Lso /usr/bin/hassio https://github.com/home-assistant/hassio-cli/releases/download/${CLI_VERSION}/hassio_${BUILD_ARCH} \
+RUN curl -Lso /usr/bin/hassio \
+        "https://github.com/home-assistant/hassio-cli/releases/download/${CLI_VERSION}/hassio_${BUILD_ARCH}" \
     && chmod a+x /usr/bin/hassio \
     && /usr/bin/hassio completion > /usr/share/bash-completion/completions/hassio
 
diff --git a/ssh/README.md b/ssh/README.md
index ede5554..6df6133 100644
--- a/ssh/README.md
+++ b/ssh/README.md
@@ -17,7 +17,7 @@ hassio help
 
 ## Installation
 
-The installation of this add-on is straightforward and easy to do.
+Follow these steps to get the add-on installed on your system:
 
 1. Navigate in your Home Assistant frontend to **Hass.io** -> **Add-on Store**.
 2. Find the "SSH server" add-on and click it.
@@ -31,7 +31,7 @@ and [these for other platforms][keygen]. It is possible to set a password for
 login since version 2.0 but for high security use private/public keys.
 
 You can not run both variants at the same time. Enabling login via keys, will
-simply disable password login.
+disable password login.
 
 1. Add a ssh key to  `authorized_keys` or set a `password` in the add-on configuration.
 2. Start the add-on.
diff --git a/ssh/azure-pipelines.yml b/ssh/azure-pipelines.yml
index 14051ab..089e9a2 100644
--- a/ssh/azure-pipelines.yml
+++ b/ssh/azure-pipelines.yml
@@ -3,20 +3,19 @@
 trigger:
   branches:
     include:
-    - master
+      - master
   paths:
     include:
-    - ssh/*
+      - ssh/*
 pr: none
 
 variables:
   - name: versionBuilder
-    value: '2.0'
+    value: "2.0"
   - group: docker
 
-
 jobs:
-- template: /.azure/azp-template-addon.yml
-  parameters:
-    addon: 'ssh'
-    arch: '--all'
+  - template: /.azure/azp-template-addon.yml
+    parameters:
+      addon: "ssh"
+      arch: "--all"
diff --git a/ssh/build.json b/ssh/build.json
index ea5f83c..e6b706b 100644
--- a/ssh/build.json
+++ b/ssh/build.json
@@ -1,10 +1,10 @@
 {
   "build_from": {
+    "aarch64": "homeassistant/aarch64-base:3.10",
     "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"
+    "i386": "homeassistant/i386-base:3.10"
   },
   "args": {
     "CLI_VERSION": "3.1.1"