diff --git a/README.md b/README.md
index 71363e5..4606143 100644
--- a/README.md
+++ b/README.md
@@ -158,7 +158,7 @@ Thank you!
 ## Changelog
 
 ### v4.2.2beta (2020-06-03)
-* workaround for renaming issues on startup
+* ~~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/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 0b02751..92f168b 100644
--- a/amd64/Dockerfile
+++ b/amd64/Dockerfile
@@ -70,7 +70,7 @@ RUN apt-get update \
 WORKDIR /opt/iobroker/
 RUN npm install -g node-gyp
 
-# Testing new js-controller version
+# Temporary testing new js-controller version
 RUN npm install ioBroker/ioBroker.js-controller#3.1.x
 
 # Backup initial ioBroker and userscript folder
diff --git a/amd64/scripts/iobroker_startup.sh b/amd64/scripts/iobroker_startup.sh
index ae30e16..4c2b690 100644
--- a/amd64/scripts/iobroker_startup.sh
+++ b/amd64/scripts/iobroker_startup.sh
@@ -166,10 +166,6 @@ 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)
     rm -f /opt/iobroker/.install_host
   echo "Done."
@@ -178,10 +174,6 @@ 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": ")[^"]*')
   echo "Done."
   echo ' '
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