diff --git a/.VERSION b/.VERSION
index 2551808..58d9f45 100644
--- a/.VERSION
+++ b/.VERSION
@@ -1 +1 @@
-v4.2.2beta
+v4.2.3beta
diff --git a/README.md b/README.md
index 71363e5..82adb8a 100644
--- a/README.md
+++ b/README.md
@@ -157,8 +157,10 @@ Thank you!
 
 ## Changelog
 
-### v4.2.2beta (2020-06-03)
-* workaround for renaming issues on startup
+### v4.2.3beta (2020-06-05)
+* updating js-controller to not stable version 3.1.5 to fix renaming issue
+* v4.2.2beta (2020-06-03)
+  * ~~workaround for renaming issues on startup~~ (fixed in js-controller)
 * v4.2.1beta (2020-05-10)
   * using node 12 instead of 10
   * updated documentation in readme.md
diff --git a/aarch64/Dockerfile b/aarch64/Dockerfile
index 3a22f81..d4e3e90 100644
--- a/aarch64/Dockerfile
+++ b/aarch64/Dockerfile
@@ -70,6 +70,9 @@ RUN apt-get update \
 WORKDIR /opt/iobroker/
 RUN npm install -g node-gyp
 
+# Temporary updating js-controller to not stable version
+RUN npm install iobroker.js-controller@3.1.5
+
 # 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/aarch64/scripts/iobroker_startup.sh b/aarch64/scripts/iobroker_startup.sh
index 892b84b..4c2b690 100644
--- a/aarch64/scripts/iobroker_startup.sh
+++ b/aarch64/scripts/iobroker_startup.sh
@@ -166,11 +166,7 @@ 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)
+    bash iobroker host $(cat /opt/iobroker/.install_host)
     rm -f /opt/iobroker/.install_host
   echo "Done."
   echo ' '
@@ -178,11 +174,7 @@ 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": ")[^"]*')
+    bash iobroker host $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
   echo "Done."
   echo ' '
 fi
diff --git a/amd64/Dockerfile b/amd64/Dockerfile
index fc300d5..55f9309 100644
--- a/amd64/Dockerfile
+++ b/amd64/Dockerfile
@@ -70,6 +70,9 @@ RUN apt-get update \
 WORKDIR /opt/iobroker/
 RUN npm install -g node-gyp
 
+# Temporary updating js-controller to not stable version
+RUN npm install iobroker.js-controller@3.1.5
+
 # 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..4c2b690 100644
--- a/amd64/scripts/iobroker_startup.sh
+++ b/amd64/scripts/iobroker_startup.sh
@@ -166,11 +166,7 @@ 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)
+    bash iobroker host $(cat /opt/iobroker/.install_host)
     rm -f /opt/iobroker/.install_host
   echo "Done."
   echo ' '
@@ -178,11 +174,7 @@ 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": ")[^"]*')
+    bash iobroker host $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
   echo "Done."
   echo ' '
 fi
diff --git a/armv7hf/Dockerfile b/armv7hf/Dockerfile
index 73f0434..ce66351 100644
--- a/armv7hf/Dockerfile
+++ b/armv7hf/Dockerfile
@@ -70,6 +70,9 @@ RUN apt-get update \
 WORKDIR /opt/iobroker/
 RUN npm install -g node-gyp
 
+# Temporary updating js-controller to not stable version
+RUN npm install iobroker.js-controller@3.1.5
+
 # 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/armv7hf/scripts/iobroker_startup.sh b/armv7hf/scripts/iobroker_startup.sh
index 892b84b..4c2b690 100644
--- a/armv7hf/scripts/iobroker_startup.sh
+++ b/armv7hf/scripts/iobroker_startup.sh
@@ -166,11 +166,7 @@ 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)
+    bash iobroker host $(cat /opt/iobroker/.install_host)
     rm -f /opt/iobroker/.install_host
   echo "Done."
   echo ' '
@@ -178,11 +174,7 @@ 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": ")[^"]*')
+    bash iobroker host $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
   echo "Done."
   echo ' '
 fi