diff --git a/README.md b/README.md
index 899494b7..456410a2 100644
--- a/README.md
+++ b/README.md
@@ -155,6 +155,19 @@ Network-wide ad blocking using your Hass.io instance
 
 [:books: Pi-hole add-on documentation][addon-doc-pi-hole]
 
+### ✓ [SSH - Secure Shell][addon-ssh]
+
+![Latest Version][ssh-version-shield]
+![Supports armhf Architecture][ssh-armhf-shield]
+![Supports aarch64 Architecture][ssh-aarch64-shield]
+![Supports amd64 Architecture][ssh-amd64-shield]
+![Supports i386 Architecture][ssh-i386-shield]
+![Docker Pulls][ssh-pulls-shield]
+
+Allows SSH connections to your Home Assistant instance
+
+[:books: SSH - Secure Shell add-on documentation][addon-doc-ssh]
+
 ### ✓ [Shinobi Pro][addon-shinobi]
 
 ![Latest Version][shinobi-version-shield]
@@ -205,6 +218,7 @@ on the correct GitHub repository matching the add-on.
 - [Open an issue for the add-on: Homebridge][homebridge-issue]
 - [Open an issue for the add-on: IDE][ide-issue]
 - [Open an issue for the add-on: Pi-hole][pi-hole-issue]
+- [Open an issue for the add-on: SSH - Secure Shell][ssh-issue]
 - [Open an issue for the add-on: Shinobi Pro][shinobi-issue]
 
 For a general repository issue or add-on ideas [open an issue here][issue]
@@ -336,6 +350,15 @@ SOFTWARE.
 [pi-hole-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [pi-hole-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
 [pi-hole-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
+[addon-ssh]: https://github.com/hassio-addons/addon-ssh/tree/v2.3.0
+[addon-doc-ssh]: https://github.com/hassio-addons/addon-ssh/blob/v2.3.0/README.md
+[ssh-issue]: https://github.com/hassio-addons/addon-ssh/issues
+[ssh-version-shield]: https://img.shields.io/badge/version-v2.3.0-blue.svg
+[ssh-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/ssh-armhf.svg
+[ssh-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
+[ssh-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
+[ssh-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
+[ssh-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
 [addon-shinobi]: https://github.com/hassio-addons/addon-shinobi/tree/v0.1.0
 [addon-doc-shinobi]: https://github.com/hassio-addons/addon-shinobi/blob/v0.1.0/README.md
 [shinobi-issue]: https://github.com/hassio-addons/addon-shinobi/issues
diff --git a/ssh/CHANGELOG.md b/ssh/CHANGELOG.md
new file mode 100644
index 00000000..bf34e07f
--- /dev/null
+++ b/ssh/CHANGELOG.md
@@ -0,0 +1,20 @@
+[Full Changelog][v2.2.1-v2.3.0]
+
+### Fixed
+
+- Adds HASSIO_TOKEN to user environment
+
+### Added
+
+- Adds add-on icon
+- Adds zip package
+- Adds allow_remote_port_forwarding option
+- Adds documentation for allow_remote_port_forwarding option
+
+### Changed
+
+- Updates base image to v1.3.3
+- Updates hassio-cli to v1.2.1
+- Optimizes images in this repository
+
+[v2.2.1-v2.3.0]: https://github.com/hassio-addons/addon-ssh/compare/v2.2.1...v2.3.0
\ No newline at end of file
diff --git a/ssh/config.json b/ssh/config.json
new file mode 100644
index 00000000..f31a0803
--- /dev/null
+++ b/ssh/config.json
@@ -0,0 +1,58 @@
+{
+  "name": "SSH - Secure Shell",
+  "version": "2.3.0",
+  "slug": "ssh",
+  "description": "Allows SSH connections to your Home Assistant instance",
+  "url": "https://community.home-assistant.io/t/community-hass-io-add-on-ssh/33820?u=frenck",
+  "startup": "services",
+  "boot": "auto",
+  "hassio_api": true,
+  "homeassistant_api": true,
+  "host_network": true,
+  "map": [
+    "config:rw",
+    "ssl:rw",
+    "addons:rw",
+    "share:rw",
+    "backup:rw"
+  ],
+  "options": {
+    "log_level": "info",
+    "port": 22,
+    "username": "hassio",
+    "password": "",
+    "authorized_keys": [],
+    "sftp": false,
+    "compatibility_mode": false,
+    "allow_agent_forwarding": false,
+    "allow_remote_port_forwarding": false,
+    "allow_tcp_forwarding": false,
+    "packages": [],
+    "init_commands": []
+  },
+  "schema": {
+    "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)",
+    "port": "port",
+    "username": "str",
+    "password": "str",
+    "authorized_keys": [
+      "str"
+    ],
+    "sftp": "bool",
+    "compatibility_mode": "bool",
+    "allow_agent_forwarding": "bool",
+    "allow_remote_port_forwarding": "bool",
+    "allow_tcp_forwarding": "bool",
+    "packages": [
+      "str"
+    ],
+    "init_commands": [
+      "str"
+    ]
+  },
+  "environment": {
+    "LOG_FORMAT": "{LEVEL}: {MESSAGE}",
+    "SUPERVISOR_VERSION": ">=0.94.0"
+  },
+  "image": "hassioaddons/ssh-{arch}"
+}
\ No newline at end of file
diff --git a/ssh/icon.png b/ssh/icon.png
new file mode 100644
index 00000000..de3621f1
Binary files /dev/null and b/ssh/icon.png differ
diff --git a/ssh/logo.png b/ssh/logo.png
new file mode 100644
index 00000000..24b4e2d5
Binary files /dev/null and b/ssh/logo.png differ