diff --git a/.VERSION b/.VERSION
index 7bf73df..03b253c 100644
--- a/.VERSION
+++ b/.VERSION
@@ -1 +1 @@
-v3.1.3beta
+v3.1.4beta
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 2ee5804..885322b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -77,15 +77,6 @@ after_success:
       
       #manifest for image: buanet/iobroker:latest
       cat manifest.yaml | sed "s/\$DOCKERTAG/latest/g" > manifestlatest.yaml
-      
-      #manifest for image: buanet/iobroker:VERSION-amd64
-      #cat manifest_amd64.yml | sed "s/\$VERSION/${VERSION}/g" > manifest_amd64.yaml
-      
-      #manifest for image: buanet/iobroker:VERSION-armv7hf
-      #cat manifest_armv7hf.yml | sed "s/\$VERSION/${VERSION}/g" > manifest_armv7hf.yaml
-      
-      #manifest for image: buanet/iobroker:VERSION-aarch64
-      #cat manifest_aarch64.yml | sed "s/\$VERSION/${VERSION}/g" > manifest_aarch64.yaml
 
       #push to hub
       mv manifestversion.yaml iobroker.yaml
@@ -93,15 +84,6 @@ after_success:
       
       mv manifestlatest.yaml iobroker.yaml
       ./manifest-tool --username $HUB_USER --password $HUB_PASS push from-spec iobroker.yaml
-            
-      #mv manifest_amd64.yaml manifest.yaml
-      #./manifest-tool --username $HUB_USER --password $HUB_PASS push from-spec manifest.yaml
-      
-      #mv manifest_armv7hf.yaml manifest.yaml
-      #./manifest-tool --username $HUB_USER --password $HUB_PASS push from-spec manifest.yaml
-      
-      #mv manifest_aarch64.yaml manifest.yaml
-      #./manifest-tool --username $HUB_USER --password $HUB_PASS push from-spec manifest.yaml
     fi
     
     if [ "$TRAVIS_BRANCH" == "beta" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$JOB_NAME" == "Manifest" ]; then
@@ -114,28 +96,10 @@ after_success:
       #manifest for image: buanet/iobroker:beta
       cat manifest.yaml | sed "s/\$DOCKERTAG/beta/g" > manifestbeta.yaml
 
-      #manifest for image: buanet/iobroker:VERSION-amd64
-      #cat manifest_amd64.yml | sed "s/\$VERSION/${VERSION}/g" > manifest_amd64.yaml
-      
-      #manifest for image: buanet/iobroker:VERSION-armv7hf
-      #cat manifest_armv7hf.yml | sed "s/\$VERSION/${VERSION}/g" > manifest_armv7hf.yaml
-      
-      #manifest for image: buanet/iobroker:VERSION-aarch64
-      #cat manifest_aarch64.yml | sed "s/\$VERSION/${VERSION}/g" > manifest_aarch64.yaml
-
       #push to hub
       mv manifestversion.yaml iobroker.yaml
       ./manifest-tool --username $HUB_USER --password $HUB_PASS push from-spec iobroker.yaml
       
       mv manifestbeta.yaml iobroker.yaml
       ./manifest-tool --username $HUB_USER --password $HUB_PASS push from-spec iobroker.yaml
-      
-      #mv manifest_amd64.yaml manifest.yaml
-      #./manifest-tool --username $HUB_USER --password $HUB_PASS push from-spec manifest.yaml
-      
-      #mv manifest_armv7hf.yaml manifest.yaml
-      #./manifest-tool --username $HUB_USER --password $HUB_PASS push from-spec manifest.yaml
-      
-      #mv manifest_aarch64.yaml manifest.yaml
-      #./manifest-tool --username $HUB_USER --password $HUB_PASS push from-spec manifest.yaml
     fi
diff --git a/README.md b/README.md
index a01d7e1..104f628 100644
--- a/README.md
+++ b/README.md
@@ -5,12 +5,12 @@ IoBroker for Docker is an Dockerimage for ioBroker (http://iobroker.net) smartho
 
 It is originally made for, and tested on a Synology Disk Station 1515+ with DSM 6 and Docker-package installed. But it should also work on other systems with Docker installed!
 
-Version 4 now supports running the Image in Docker on the following architectures: amd64, armv7hf, aarch64.
+Version 4 (coming soon, at the moment still as 3.1.4beta) now supports running the Image in Docker on the following architectures: amd64, armv7hf, aarch64.
 Feel free to ask for more architectures by opening an github-issue. 
 
 ## Important
 
-The new v4 comes again with a new major node-version (node10)!
+The new v4 (coming soon, at the moment still as 3.1.4beta) comes again with a new major node-version (node10)!
 If you are updating an existing Installation you have to perform some additional steps inside ioBroker!
 After upgrading your iobroker-container you have to call "reinstall.sh" for recompiling your installation for the use with node10!
 For Details see official ioBroker-documentation (http://www.iobroker.net/docu/?page_id=8323&lang=de). Make backup first!
@@ -39,6 +39,7 @@ Since v3 is possible to set some environment variables to configure a new contai
 |TZ|Europe/Berlin|all valid Linux-timezones|
 |SETUID|1000|for security reasons it might be useful to specify the uid of the containers iobroker user to match an existing user on the docker host|
 |SETGID|1000|for security reasons it might be useful to specify the gid of the containers iobroker user to match an existing group on the docker host|
+|ZWAVE|false|will install openzwave to support zwave-adapter|
 
 ### Mounting Folder/ Volume
 
@@ -54,7 +55,8 @@ After some issues with permissions related to the use of a dedicated user for io
 
 ## Changelog
 
-### v4.0.0 (2019-10-22)
+### v3.1.4beta (2019-10-23)
+  * added env for zwave support
 * v3.1.3beta (2019-10-17)
   * enhanced logging of startup-script
   * multiarch support (amd64, aarch64, armv7hf)
diff --git a/aarch64/Dockerfile b/aarch64/Dockerfile
index 85c5655..69f7db8 100644
--- a/aarch64/Dockerfile
+++ b/aarch64/Dockerfile
@@ -4,9 +4,6 @@ MAINTAINER Andre Germann <https://buanet.de>
 
 ENV DEBIAN_FRONTEND noninteractive
 
-# Debugging for multiarch
-RUN uname -m
-
 # Install prerequisites
 RUN apt-get update && apt-get upgrade -y && apt-get install -y \
         acl \
@@ -44,6 +41,7 @@ WORKDIR /opt/scripts/
 COPY scripts/iobroker_startup.sh iobroker_startup.sh
 COPY scripts/setup_avahi.sh setup_avahi.sh
 COPY scripts/setup_packages.sh setup_packages.sh
+COPY scripts/setup_zwave.sh setup_zwave.sh
 RUN chmod +x iobroker_startup.sh \
 	&& chmod +x setup_avahi.sh \
     && chmod +x setup_packages.sh
@@ -76,7 +74,8 @@ ENV DEBIAN_FRONTEND="teletype" \
 	PACKAGES="nano" \
 	AVAHI="false" \
     SETUID=1000 \
-    SETGID=1000
+    SETGID=1000 \
+	ZWAVE="false"
 
 # Setting up EXPOSE for Admin
 EXPOSE 8081/tcp	
diff --git a/aarch64/scripts/iobroker_startup.sh b/aarch64/scripts/iobroker_startup.sh
index 0c49ca8..e385f09 100644
--- a/aarch64/scripts/iobroker_startup.sh
+++ b/aarch64/scripts/iobroker_startup.sh
@@ -5,6 +5,7 @@ packages=$PACKAGES
 avahi=$AVAHI
 uid=$SETUID
 gid=$SETGID
+zwave=$ZWAVE
 
 # Getting date and time for logging 
 dati=`date '+%Y-%m-%d %H:%M:%S'`
@@ -147,7 +148,17 @@ then
   echo "Initializing Avahi-Daemon..."
   chmod 764 /opt/scripts/setup_avahi.sh
   sh /opt/scripts/setup_avahi.sh
-  echo 'Done.'
+  echo "Done."
+  echo ' '
+fi
+
+if [ "$zwave" = "true" ]
+then
+  echo "ZWave is activated by ENV."
+  echo "Initializing ZWave-support..."
+  chmod 764 /opt/scripts/setup_zwave.sh
+  sh /opt/scripts/setup_avahi.sh
+  echo "Done."
   echo ' '
 fi
 
diff --git a/aarch64/scripts/setup_zwave.sh b/aarch64/scripts/setup_zwave.sh
new file mode 100644
index 0000000..488af79
--- /dev/null
+++ b/aarch64/scripts/setup_zwave.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+echo "Checking openzwave installation state..."
+
+if [ -f /usr/local/lib64 ]
+then
+  echo "Openzwave is NOT installed. Going to install it now..."
+  cd /opt
+  curl -L -O http://old.openzwave.com/downloads/openzwave-1.6.945.tar.gz
+  tar -xf openzwave-1.6.945.tar.gz && rm openzwave-1.6.945.tar.gz
+  cd openzwave-1.6.945 && make 2>&1 /dev/null && make install 2>&1 /dev/null
+  ldconfig /usr/local/lib64
+  cd /opt/iobroker
+  echo "Openzwave is now installed..."
+else
+  echo "Openzwave is already installed..."
+fi
+
+exit 0
\ No newline at end of file
diff --git a/amd64/Dockerfile b/amd64/Dockerfile
index 3c6654a..bc1b165 100644
--- a/amd64/Dockerfile
+++ b/amd64/Dockerfile
@@ -4,9 +4,6 @@ MAINTAINER Andre Germann <https://buanet.de>
 
 ENV DEBIAN_FRONTEND noninteractive
 
-# Debugging for multiarch
-RUN uname -m
-
 # Install prerequisites
 RUN apt-get update && apt-get upgrade -y && apt-get install -y \
         acl \
@@ -44,6 +41,7 @@ WORKDIR /opt/scripts/
 COPY scripts/iobroker_startup.sh iobroker_startup.sh
 COPY scripts/setup_avahi.sh setup_avahi.sh
 COPY scripts/setup_packages.sh setup_packages.sh
+COPY scripts/setup_zwave.sh setup_zwave.sh
 RUN chmod +x iobroker_startup.sh \
 	&& chmod +x setup_avahi.sh \
     && chmod +x setup_packages.sh
@@ -75,7 +73,8 @@ ENV DEBIAN_FRONTEND="teletype" \
 	PACKAGES="nano" \
 	AVAHI="false" \
     SETUID=1000 \
-    SETGID=1000
+    SETGID=1000 \
+	ZWAVE="false"
 
 # Setting up EXPOSE for Admin
 EXPOSE 8081/tcp	
diff --git a/amd64/scripts/iobroker_startup.sh b/amd64/scripts/iobroker_startup.sh
index 0c49ca8..e385f09 100644
--- a/amd64/scripts/iobroker_startup.sh
+++ b/amd64/scripts/iobroker_startup.sh
@@ -5,6 +5,7 @@ packages=$PACKAGES
 avahi=$AVAHI
 uid=$SETUID
 gid=$SETGID
+zwave=$ZWAVE
 
 # Getting date and time for logging 
 dati=`date '+%Y-%m-%d %H:%M:%S'`
@@ -147,7 +148,17 @@ then
   echo "Initializing Avahi-Daemon..."
   chmod 764 /opt/scripts/setup_avahi.sh
   sh /opt/scripts/setup_avahi.sh
-  echo 'Done.'
+  echo "Done."
+  echo ' '
+fi
+
+if [ "$zwave" = "true" ]
+then
+  echo "ZWave is activated by ENV."
+  echo "Initializing ZWave-support..."
+  chmod 764 /opt/scripts/setup_zwave.sh
+  sh /opt/scripts/setup_avahi.sh
+  echo "Done."
   echo ' '
 fi
 
diff --git a/amd64/scripts/setup_zwave.sh b/amd64/scripts/setup_zwave.sh
new file mode 100644
index 0000000..488af79
--- /dev/null
+++ b/amd64/scripts/setup_zwave.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+echo "Checking openzwave installation state..."
+
+if [ -f /usr/local/lib64 ]
+then
+  echo "Openzwave is NOT installed. Going to install it now..."
+  cd /opt
+  curl -L -O http://old.openzwave.com/downloads/openzwave-1.6.945.tar.gz
+  tar -xf openzwave-1.6.945.tar.gz && rm openzwave-1.6.945.tar.gz
+  cd openzwave-1.6.945 && make 2>&1 /dev/null && make install 2>&1 /dev/null
+  ldconfig /usr/local/lib64
+  cd /opt/iobroker
+  echo "Openzwave is now installed..."
+else
+  echo "Openzwave is already installed..."
+fi
+
+exit 0
\ No newline at end of file
diff --git a/armv7hf/Dockerfile b/armv7hf/Dockerfile
index 04cad35..293db80 100644
--- a/armv7hf/Dockerfile
+++ b/armv7hf/Dockerfile
@@ -4,9 +4,6 @@ MAINTAINER Andre Germann <https://buanet.de>
 
 ENV DEBIAN_FRONTEND noninteractive
 
-# Debugging for multiarch
-RUN uname -m
-
 # Install prerequisites
 RUN apt-get update && apt-get upgrade -y && apt-get install -y \
         acl \
@@ -44,6 +41,7 @@ WORKDIR /opt/scripts/
 COPY scripts/iobroker_startup.sh iobroker_startup.sh
 COPY scripts/setup_avahi.sh setup_avahi.sh
 COPY scripts/setup_packages.sh setup_packages.sh
+COPY scripts/setup_zwave.sh setup_zwave.sh
 RUN chmod +x iobroker_startup.sh \
 	&& chmod +x setup_avahi.sh \
     && chmod +x setup_packages.sh
@@ -76,7 +74,8 @@ ENV DEBIAN_FRONTEND="teletype" \
 	PACKAGES="nano" \
 	AVAHI="false" \
     SETUID=1000 \
-    SETGID=1000
+    SETGID=1000 \
+	ZWAVE="false"
 
 # Setting up EXPOSE for Admin
 EXPOSE 8081/tcp	
diff --git a/armv7hf/scripts/iobroker_startup.sh b/armv7hf/scripts/iobroker_startup.sh
index 0c49ca8..e385f09 100644
--- a/armv7hf/scripts/iobroker_startup.sh
+++ b/armv7hf/scripts/iobroker_startup.sh
@@ -5,6 +5,7 @@ packages=$PACKAGES
 avahi=$AVAHI
 uid=$SETUID
 gid=$SETGID
+zwave=$ZWAVE
 
 # Getting date and time for logging 
 dati=`date '+%Y-%m-%d %H:%M:%S'`
@@ -147,7 +148,17 @@ then
   echo "Initializing Avahi-Daemon..."
   chmod 764 /opt/scripts/setup_avahi.sh
   sh /opt/scripts/setup_avahi.sh
-  echo 'Done.'
+  echo "Done."
+  echo ' '
+fi
+
+if [ "$zwave" = "true" ]
+then
+  echo "ZWave is activated by ENV."
+  echo "Initializing ZWave-support..."
+  chmod 764 /opt/scripts/setup_zwave.sh
+  sh /opt/scripts/setup_avahi.sh
+  echo "Done."
   echo ' '
 fi
 
diff --git a/armv7hf/scripts/setup_zwave.sh b/armv7hf/scripts/setup_zwave.sh
new file mode 100644
index 0000000..488af79
--- /dev/null
+++ b/armv7hf/scripts/setup_zwave.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+echo "Checking openzwave installation state..."
+
+if [ -f /usr/local/lib64 ]
+then
+  echo "Openzwave is NOT installed. Going to install it now..."
+  cd /opt
+  curl -L -O http://old.openzwave.com/downloads/openzwave-1.6.945.tar.gz
+  tar -xf openzwave-1.6.945.tar.gz && rm openzwave-1.6.945.tar.gz
+  cd openzwave-1.6.945 && make 2>&1 /dev/null && make install 2>&1 /dev/null
+  ldconfig /usr/local/lib64
+  cd /opt/iobroker
+  echo "Openzwave is now installed..."
+else
+  echo "Openzwave is already installed..."
+fi
+
+exit 0
\ No newline at end of file
diff --git a/manifest_aarch64.yml b/manifest_aarch64.yml
deleted file mode 100644
index 0f98f77..0000000
--- a/manifest_aarch64.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-image: buanet/iobroker-testing:$VERSION-aarch64
-manifests:
-  -
-    image: buanet/iobroker-testing:$VERSION-aarch64
-    platform:
-      architecture: arm64
-      variant: v8
-      os: linux
\ No newline at end of file
diff --git a/manifest_amd64.yml b/manifest_amd64.yml
deleted file mode 100644
index b7dffd5..0000000
--- a/manifest_amd64.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-image: buanet/iobroker-testing:$VERSION-amd64
-manifests:
-  -
-    image: buanet/iobroker-testing:$VERSION-amd64
-    platform:
-      architecture: amd64
-      os: linux
\ No newline at end of file
diff --git a/manifest_armv7hf.yml b/manifest_armv7hf.yml
deleted file mode 100644
index 6b9dc3a..0000000
--- a/manifest_armv7hf.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-image: buanet/iobroker-testing:$VERSION-armv7hf
-manifests:
-  -
-    image: buanet/iobroker-testing:$VERSION-armv7hf
-    platform:
-      architecture: arm
-      variant: v7
-      os: linux
\ No newline at end of file