diff --git a/cec_scan/CHANGELOG.md b/cec_scan/CHANGELOG.md
index 88be367..794b06a 100644
--- a/cec_scan/CHANGELOG.md
+++ b/cec_scan/CHANGELOG.md
@@ -1,8 +1,8 @@
 # Changelog
 
-## 2
+## 2.0
 - Use new native Alpine RPi library for 64bit
 
-## 1
+## 1.0
 - Add support for Raspberry-pi 64bit
 - Update libCEC to 4.0.3
diff --git a/cec_scan/Dockerfile b/cec_scan/Dockerfile
index e04be62..6db5762 100644
--- a/cec_scan/Dockerfile
+++ b/cec_scan/Dockerfile
@@ -37,7 +37,6 @@ ENV LD_LIBRARY_PATH=/opt/vc/lib:${LD_LIBRARY_PATH}
 
 # Copy data
 COPY run.sh /
-RUN chmod a+x /run.sh
 
 WORKDIR /
 CMD [ "/run.sh" ]
diff --git a/cec_scan/run.sh b/cec_scan/run.sh
old mode 100644
new mode 100755
diff --git a/check_config/Dockerfile b/check_config/Dockerfile
index a31ac28..14048ad 100644
--- a/check_config/Dockerfile
+++ b/check_config/Dockerfile
@@ -9,6 +9,5 @@ RUN apk add --no-cache \
 
 # Copy data
 COPY run.sh /
-RUN chmod a+x /run.sh
 
 CMD [ "/run.sh" ]
diff --git a/check_config/run.sh b/check_config/run.sh
old mode 100644
new mode 100755
diff --git a/dhcp_server/Dockerfile b/dhcp_server/Dockerfile
index 924ef43..1105ba0 100644
--- a/dhcp_server/Dockerfile
+++ b/dhcp_server/Dockerfile
@@ -11,6 +11,4 @@ RUN apk add --no-cache tzdata jq dhcp
 COPY run.sh /
 COPY dhcpd.conf /etc/
 
-RUN chmod a+x /run.sh
-
 CMD [ "/run.sh" ]
diff --git a/dhcp_server/run.sh b/dhcp_server/run.sh
old mode 100644
new mode 100755
diff --git a/dnsmasq/Dockerfile b/dnsmasq/Dockerfile
index 0d22369..a69cdf8 100644
--- a/dnsmasq/Dockerfile
+++ b/dnsmasq/Dockerfile
@@ -11,6 +11,4 @@ RUN apk add --no-cache jq dnsmasq
 COPY run.sh /
 COPY dnsmasq.conf /etc/
 
-RUN chmod a+x /run.sh
-
 CMD [ "/run.sh" ]
diff --git a/dnsmasq/run.sh b/dnsmasq/run.sh
old mode 100644
new mode 100755
diff --git a/duckdns/Dockerfile b/duckdns/Dockerfile
index dd010bb..18d1aa1 100644
--- a/duckdns/Dockerfile
+++ b/duckdns/Dockerfile
@@ -12,6 +12,5 @@ RUN apk add --no-cache jq curl libressl \
 
 # Copy data
 COPY *.sh /
-RUN chmod a+x /*.sh
 
 CMD [ "/run.sh" ]
diff --git a/duckdns/hooks.sh b/duckdns/hooks.sh
old mode 100644
new mode 100755
diff --git a/duckdns/run.sh b/duckdns/run.sh
old mode 100644
new mode 100755
diff --git a/git_pull/CHANGELOG.md b/git_pull/CHANGELOG.md
index c8084c6..356f52e 100644
--- a/git_pull/CHANGELOG.md
+++ b/git_pull/CHANGELOG.md
@@ -1,12 +1,15 @@
 # Changelog
 
+## 7.0
+- Update Hass.io CLI to 2.0.1
+
 ## 6.1
 - Bugfix in git diff command while comparing commits
 
-## 6
+## 6.0
 - Allow to disable Home Assistant restart for specific file changes
 
-## 5
+## 5.0
 - Update Hass.io CLI to 1.4.0
 - Add new API role profile
 
diff --git a/git_pull/Dockerfile b/git_pull/Dockerfile
index 91009d8..9b7d74f 100644
--- a/git_pull/Dockerfile
+++ b/git_pull/Dockerfile
@@ -16,6 +16,5 @@ RUN apk add --no-cache curl \
 
 # Copy data
 COPY run.sh /
-RUN chmod a+x /run.sh
 
 CMD [ "/run.sh" ]
diff --git a/git_pull/build.json b/git_pull/build.json
index 76c4e26..0f9e72e 100644
--- a/git_pull/build.json
+++ b/git_pull/build.json
@@ -1,5 +1,5 @@
 {
   "args": {
-    "CLI_VERSION": "1.4.0"
+    "CLI_VERSION": "2.0.1"
   }
 }
diff --git a/git_pull/config.json b/git_pull/config.json
index d743b38..0247cf7 100644
--- a/git_pull/config.json
+++ b/git_pull/config.json
@@ -1,6 +1,6 @@
 {
   "name": "Git pull",
-  "version": "6.1",
+  "version": "7.0",
   "slug": "git_pull",
   "description": "Simple git pull to update the local configuration",
   "url": "https://home-assistant.io/addons/git_pull/",
diff --git a/git_pull/run.sh b/git_pull/run.sh
old mode 100644
new mode 100755
diff --git a/google_assistant/Dockerfile b/google_assistant/Dockerfile
index 6edca67..5005fbe 100644
--- a/google_assistant/Dockerfile
+++ b/google_assistant/Dockerfile
@@ -19,6 +19,4 @@ RUN apt-get update \
 COPY run.sh /
 COPY *.py /
 
-RUN chmod a+x /run.sh
-
 ENTRYPOINT [ "/run.sh" ]
diff --git a/google_assistant/run.sh b/google_assistant/run.sh
old mode 100644
new mode 100755
diff --git a/homematic/Dockerfile b/homematic/Dockerfile
index 5fc1bdb..239f865 100644
--- a/homematic/Dockerfile
+++ b/homematic/Dockerfile
@@ -55,7 +55,6 @@ COPY rfd.conf hs485d.conf crRFD.conf log4j.xml /etc/config/
 # Setup start script
 COPY run.sh /
 COPY hm-firmware.sh /usr/lib/
-RUN chmod a+x /run.sh
 
 WORKDIR /data
 CMD [ "/run.sh" ]
diff --git a/homematic/run.sh b/homematic/run.sh
old mode 100644
new mode 100755
diff --git a/letsencrypt/Dockerfile b/letsencrypt/Dockerfile
index 989fe1f..e9e514a 100644
--- a/letsencrypt/Dockerfile
+++ b/letsencrypt/Dockerfile
@@ -9,6 +9,5 @@ RUN apk add --no-cache jq certbot py2-future
 
 # Copy data
 COPY run.sh /
-RUN chmod a+x /run.sh
 
 CMD [ "/run.sh" ]
diff --git a/letsencrypt/run.sh b/letsencrypt/run.sh
old mode 100644
new mode 100755
diff --git a/mariadb/Dockerfile b/mariadb/Dockerfile
index a9f7307..7543f65 100644
--- a/mariadb/Dockerfile
+++ b/mariadb/Dockerfile
@@ -9,6 +9,5 @@ RUN apk add --no-cache jq mariadb mariadb-client
 
 # Copy data
 COPY run.sh /
-RUN chmod a+x /run.sh
 
 CMD [ "/run.sh" ]
diff --git a/mariadb/run.sh b/mariadb/run.sh
old mode 100644
new mode 100755
diff --git a/mosquitto/CHANGELOG.md b/mosquitto/CHANGELOG.md
index f915de4..f4f3717 100644
--- a/mosquitto/CHANGELOG.md
+++ b/mosquitto/CHANGELOG.md
@@ -1,9 +1,9 @@
 # Changelog
 
-## 4
+## 4.0
 - Use Alpine 3.7 because libwebsocket 3.0.0 is broken on Alpine 3.8
 
-## 3
+## 3.0
 - Use auto setup (discovery) on Home Assistant
 - Publish his service to Hass.io
 - Attach to Home Assistant user system
diff --git a/mosquitto/Dockerfile b/mosquitto/Dockerfile
index 64aadaa..424116a 100644
--- a/mosquitto/Dockerfile
+++ b/mosquitto/Dockerfile
@@ -27,7 +27,5 @@ COPY run.sh /
 COPY auth_srv.sh /bin/
 COPY mosquitto.conf /etc/
 
-RUN chmod a+x /run.sh /bin/auth_srv.sh
-
 WORKDIR /
 CMD [ "/run.sh" ]
diff --git a/mosquitto/auth_srv.sh b/mosquitto/auth_srv.sh
old mode 100644
new mode 100755
index 437ea34..2d61f1c
--- a/mosquitto/auth_srv.sh
+++ b/mosquitto/auth_srv.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# shellcheck disable=SC2244
 set -e
 
 CONFIG_PATH=/data/options.json
diff --git a/mosquitto/run.sh b/mosquitto/run.sh
old mode 100644
new mode 100755
diff --git a/nginx_proxy/CHANGELOG.md b/nginx_proxy/CHANGELOG.md
index 77f249a..eaea45a 100644
--- a/nginx_proxy/CHANGELOG.md
+++ b/nginx_proxy/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 2
+## 2.0
 - Update nginx to version 1.14.0
 
 ## 1.2
diff --git a/nginx_proxy/Dockerfile b/nginx_proxy/Dockerfile
index 018ea06..fd51076 100644
--- a/nginx_proxy/Dockerfile
+++ b/nginx_proxy/Dockerfile
@@ -11,6 +11,4 @@ RUN apk add --no-cache nginx libressl
 COPY run.sh /
 COPY nginx.conf /etc/
 
-RUN chmod a+x /run.sh
-
 CMD [ "/run.sh" ]
diff --git a/nginx_proxy/run.sh b/nginx_proxy/run.sh
old mode 100644
new mode 100755
diff --git a/rpc_shutdown/Dockerfile b/rpc_shutdown/Dockerfile
index 2a6f1b8..87c841b 100644
--- a/rpc_shutdown/Dockerfile
+++ b/rpc_shutdown/Dockerfile
@@ -9,6 +9,5 @@ RUN apk add --no-cache jq samba-common-tools samba-common
 
 # Copy data
 COPY run.sh /
-RUN chmod a+x /run.sh
 
 CMD [ "/run.sh" ]
diff --git a/rpc_shutdown/run.sh b/rpc_shutdown/run.sh
old mode 100644
new mode 100755
diff --git a/samba/CHANGELOG.md b/samba/CHANGELOG.md
index a0fc973..23754fc 100644
--- a/samba/CHANGELOG.md
+++ b/samba/CHANGELOG.md
@@ -1,17 +1,17 @@
 # Changelog
 
-## 8
+## 8.0
 - Fix access to /backup
 
-## 7
+## 7.0
 - Remove guest access
 - Cleanup structure
 - Use hostname for samba device name
 
-## 6
+## 6.0
 - Enable ntlm auth for Windows10
 
-## 5
+## 5.0
 - Update Samba to version 4.8.4
 
 ## 4.1
diff --git a/samba/Dockerfile b/samba/Dockerfile
index 68b00f9..c4eceb6 100644
--- a/samba/Dockerfile
+++ b/samba/Dockerfile
@@ -12,6 +12,4 @@ RUN apk add --no-cache \
 COPY run.sh /
 COPY smb.conf /etc/
 
-RUN chmod a+x /run.sh
-
 CMD [ "/run.sh" ]
diff --git a/samba/run.sh b/samba/run.sh
old mode 100644
new mode 100755
diff --git a/snips/Dockerfile b/snips/Dockerfile
index c99ef0f..1ba6699 100644
--- a/snips/Dockerfile
+++ b/snips/Dockerfile
@@ -23,9 +23,6 @@ RUN apt-get update \
 
 RUN apt-get update \
     && apt-get install -y snips-platform-voice snips-asr snips-watch \
-    && chmod a+x /run.sh \
-    && chmod a+x /usr/bin/customtts.sh \
-    && chmod a+x /snips-entrypoint.sh \
     && rm -rf /var/lib/apt/lists/* \
     && curl -L -o /assistant_Hass_de.zip https://s3.amazonaws.com/hassio-addons-data/assistant_Hass_de.zip \
     && curl -L -o /assistant_Hass_en.zip https://s3.amazonaws.com/hassio-addons-data/assistant_Hass_en.zip \
diff --git a/snips/customtts.sh b/snips/customtts.sh
old mode 100644
new mode 100755
diff --git a/snips/run.sh b/snips/run.sh
old mode 100644
new mode 100755
diff --git a/ssh/CHANGELOG.md b/ssh/CHANGELOG.md
index 6815c0b..4ac08f6 100644
--- a/ssh/CHANGELOG.md
+++ b/ssh/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Changelog
 
-## 4
+## 5.0
+- Update Hass.io CLI to 2.0.1, include bash completion
+
+## 4.0
 - Update Hass.io CLI to 1.4.0
 - Add new API role profile
 - Update OpenSSH to 7.7
diff --git a/ssh/Dockerfile b/ssh/Dockerfile
index 5102735..ab238ef 100644
--- a/ssh/Dockerfile
+++ b/ssh/Dockerfile
@@ -21,12 +21,11 @@ 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} \
-    && chmod a+x /usr/bin/hassio
+    && chmod a+x /usr/bin/hassio \
+    && /usr/bin/hassio completion | sed "s/hassio-cli/hassio/g" > /usr/share/bash-completion/completions/hassio
 
 # Copy data
 COPY run.sh /
 COPY motd /etc/
 
-RUN chmod a+x /run.sh
-
 CMD [ "/run.sh" ]
diff --git a/ssh/build.json b/ssh/build.json
index 76c4e26..0f9e72e 100644
--- a/ssh/build.json
+++ b/ssh/build.json
@@ -1,5 +1,5 @@
 {
   "args": {
-    "CLI_VERSION": "1.4.0"
+    "CLI_VERSION": "2.0.1"
   }
 }
diff --git a/ssh/config.json b/ssh/config.json
index c8f7c3c..82c8684 100644
--- a/ssh/config.json
+++ b/ssh/config.json
@@ -1,6 +1,6 @@
 {
   "name": "SSH server",
-  "version": "4",
+  "version": "5.0",
   "slug": "ssh",
   "description": "Allows connections over SSH",
   "url": "https://home-assistant.io/addons/ssh/",
diff --git a/ssh/run.sh b/ssh/run.sh
old mode 100644
new mode 100755
diff --git a/tellstick/Dockerfile b/tellstick/Dockerfile
index 310e607..646fcde 100644
--- a/tellstick/Dockerfile
+++ b/tellstick/Dockerfile
@@ -22,6 +22,5 @@ RUN apk add --no-cache \
 
 # Copy data for add-on
 COPY run.sh /
-RUN chmod a+x /run.sh
 
 CMD [ "/run.sh" ]
diff --git a/tellstick/run.sh b/tellstick/run.sh
old mode 100644
new mode 100755