diff --git a/smb_config/Dockerfile b/samba/Dockerfile
similarity index 100%
rename from smb_config/Dockerfile
rename to samba/Dockerfile
diff --git a/smb_config/README.md b/samba/README.md
similarity index 76%
rename from smb_config/README.md
rename to samba/README.md
index f69a0b7..0b7d7da 100644
--- a/smb_config/README.md
+++ b/samba/README.md
@@ -1,5 +1,5 @@
-# Samba Config
-Expose HomeAssistant config to samba share.
+# Samba
+Expose HassIO folders to samba share.
 
 ## Options
 
diff --git a/smb_config/config.json b/samba/config.json
similarity index 66%
rename from smb_config/config.json
rename to samba/config.json
index 00e8e3f..b78af6e 100644
--- a/smb_config/config.json
+++ b/samba/config.json
@@ -1,14 +1,14 @@
 {
-  "name": "Samba Config",
-  "version": "0.7",
-  "slug": "smb_config",
-  "description": "Expose config with samba",
+  "name": "Samba share",
+  "version": "0.1",
+  "slug": "samba",
+  "description": "Expose HassIO folders with samba",
   "startup": "after",
   "boot": "auto",
   "ports": {
     "445/tcp": 445
    },
-  "map": ["config"],
+  "map": ["config", "ssl", "addons"],
   "options": {
       "workgroup": "WORKGROUP",
       "guest": true,
diff --git a/smb_config/run.sh b/samba/run.sh
similarity index 100%
rename from smb_config/run.sh
rename to samba/run.sh
diff --git a/smb_config/smb.conf b/samba/smb.conf
similarity index 100%
rename from smb_config/smb.conf
rename to samba/smb.conf
diff --git a/ssh/README.md b/ssh/README.md
index ecf7fba..bbcbfe9 100644
--- a/ssh/README.md
+++ b/ssh/README.md
@@ -4,6 +4,8 @@ Provide a openssh server. You can access to:
 - /addons: Custom addon folder
 - /ssl: Store ssh key files for HassIO
 
+Installed editor is vim
+
 ## Options
 
 - `authorized_keys`: A array that ever element is a authorized key
diff --git a/ssh/config.json b/ssh/config.json
index 083d755..71ccffe 100644
--- a/ssh/config.json
+++ b/ssh/config.json
@@ -1,6 +1,6 @@
 {
   "name": "SSH server",
-  "version": "0.1",
+  "version": "0.2",
   "slug": "ssh",
   "description": "OpenSSH is the premier connectivity tool for remote login with the SSH protocol.",
   "startup": "before",
diff --git a/ssh/run.sh b/ssh/run.sh
index 80ae62b..b495391 100644
--- a/ssh/run.sh
+++ b/ssh/run.sh
@@ -8,6 +8,7 @@ AUTHORIZED_KEYS=$(jq --raw-output ".authorized_keys[]" $CONFIG_PATH)
 
 # Init defaults config
 sed -i s/#PermitRootLogin.*/PermitRootLogin\ yes/ /etc/ssh/sshd_config
+sed -i s/#PasswordAuthentication.*/PasswordAuthentication\ no/ /etc/ssh/sshd_config
 
 # Generate authorized_keys file
 mkdir -p ~/.ssh
@@ -26,4 +27,4 @@ else
 fi
 
 # start server
-exec sshd -D -f /etc/sshd_config < /dev/null
+exec /usr/bin/sshd -D -f /etc/sshd_config < /dev/null