diff --git a/amd64/Dockerfile b/amd64/Dockerfile
index fc300d5..0b02751 100644
--- a/amd64/Dockerfile
+++ b/amd64/Dockerfile
@@ -70,6 +70,9 @@ RUN apt-get update \
 WORKDIR /opt/iobroker/
 RUN npm install -g node-gyp
 
+# Testing new js-controller version
+RUN npm install ioBroker/ioBroker.js-controller#3.1.x
+
 # Backup initial ioBroker and userscript folder
 RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker \
     && tar -cf /opt/initial_userscripts.tar /opt/userscripts
diff --git a/amd64/scripts/iobroker_startup.sh b/amd64/scripts/iobroker_startup.sh
index 892b84b..ae30e16 100644
--- a/amd64/scripts/iobroker_startup.sh
+++ b/amd64/scripts/iobroker_startup.sh
@@ -166,11 +166,11 @@ if [ -f /opt/iobroker/.install_host ]
 then
   echo "Looks like this is a new and empty installation of ioBroker."
   echo "Hostname needs to be updated to " $(hostname)"..."
-    oldhostname=$(cat /opt/iobroker/.install_host)
-    newhostname=$(hostname)
-    sed -i "s/$oldhostname/$newhostname/g" /opt/iobroker/iobroker-data/states.json
-    sed -i "s/$oldhostname/$newhostname/g" /opt/iobroker/iobroker-data/objects.json
-    # bash iobroker host $(cat /opt/iobroker/.install_host)
+    # oldhostname=$(cat /opt/iobroker/.install_host)
+    # newhostname=$(hostname)
+    # sed -i "s/$oldhostname/$newhostname/g" /opt/iobroker/iobroker-data/states.json
+    # sed -i "s/$oldhostname/$newhostname/g" /opt/iobroker/iobroker-data/objects.json
+    bash iobroker host $(cat /opt/iobroker/.install_host)
     rm -f /opt/iobroker/.install_host
   echo "Done."
   echo ' '
@@ -178,11 +178,11 @@ elif [ $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?
 then
   echo "Hostname in ioBroker does not match the hostname of this container."
   echo "Updating hostname to " $(hostname)"..."
-    oldhostname=$(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
-    newhostname=$(hostname)
-    sed -i "s/$oldhostname/$newhostname/g" /opt/iobroker/iobroker-data/states.json
-    sed -i "s/$oldhostname/$newhostname/g" /opt/iobroker/iobroker-data/objects.json
-    # bash iobroker host $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
+    # oldhostname=$(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
+    # newhostname=$(hostname)
+    # sed -i "s/$oldhostname/$newhostname/g" /opt/iobroker/iobroker-data/states.json
+    # sed -i "s/$oldhostname/$newhostname/g" /opt/iobroker/iobroker-data/objects.json
+    bash iobroker host $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
   echo "Done."
   echo ' '
 fi