diff --git a/.hadolint.yaml b/.hadolint.yaml
new file mode 100644
index 0000000..c814558
--- /dev/null
+++ b/.hadolint.yaml
@@ -0,0 +1,6 @@
+ignored:
+  - DL3003
+  - DL3006
+  - DL3007
+  - DL3008
+  - DL3018
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d944ad5..4043d7a 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -44,3 +44,14 @@ jobs:
         -v $(pwd):/mnt:ro koalaman/shellcheck:$(versionShellCheck) **/*.sh
     displayName: 'Run ShellCheck'
 
+- job: 'JQ'
+  pool:
+    vmImage: 'ubuntu-16.04'
+  steps:
+  - script: sudo apt-get install -y jq
+    displayName: 'Install JQ'
+  - bash: |
+      shopt -s globstar
+      cat **/*.json | jq '.'
+    displayName: 'Run JQ'
+
diff --git a/cec_scan/Dockerfile b/cec_scan/Dockerfile
index 6db5762..f1b0375 100644
--- a/cec_scan/Dockerfile
+++ b/cec_scan/Dockerfile
@@ -1,12 +1,12 @@
 ARG BUILD_FROM
 FROM $BUILD_FROM
 
-# Add env
-ENV LANG C.UTF-8
-
 WORKDIR /usr/src
 ARG BUILD_ARCH
 
+# Set shell
+SHELL ["/bin/ash", "-o", "pipefail", "-c"]
+
 ##
 # RPi support for HDMI-CEC on armhf/aarch64
 RUN if [ "$BUILD_ARCH" == "armhf" ] || [ "$BUILD_ARCH" == "aarch64" ]; then \
diff --git a/deconz/data/run.sh b/deconz/data/run.sh
index 431b468..46df176 100755
--- a/deconz/data/run.sh
+++ b/deconz/data/run.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bashio
 set -e
 
+# shellcheck disable=SC1091
 . /discovery.sh
 
 WAIT_PIDS=()
@@ -9,8 +10,6 @@ WAIT_PIDS=()
 DECONZ_DEVICE=$(bashio::config 'device')
 API_PORT=$(bashio::addon.port 80)
 WEBSOCKET_PORT=$(bashio::addon.port 8080)
-INGRESS_PORT=$(bashio::addon.ingress_port)
-INGRESS_INTERFACE=$(bashio::addon.ip_address)
 
 # Check if port is available
 if [ -z "${API_PORT}" ] || [ -z "${WEBSOCKET_PORT}" ]; then
@@ -27,8 +26,8 @@ deCONZ \
     --dbg-zcl=0 \
     --dbg-zdp=0 \
     --dbg-otau=0 \
-    --http-port=${API_PORT} \
-    --ws-port=${WEBSOCKET_PORT} \
+    --http-port="${API_PORT}" \
+    --ws-port="${WEBSOCKET_PORT}" \
     --upnp=0 \
     --dev="${DECONZ_DEVICE}" &
 WAIT_PIDS+=($!)