diff --git a/README.md b/README.md
index 6ce3663..7f9b2ce 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,12 @@
-# ioBroker for Docker
+# Official Docker Image for ioBroker
 
-[![Release](https://img.shields.io/github/v/release/buanet/docker-iobroker)](https://github.com/buanet/docker-iobroker/releases)
+[![Release](https://img.shields.io/github/v/release/buanet/ioBroker.docker)](https://github.com/buanet/ioBroker.docker/releases)
 [![Build Status](https://travis-ci.org/buanet/docker-iobroker.svg?branch=master)](https://travis-ci.org/buanet/docker-iobroker)<br>
 [![Image Size](https://img.shields.io/docker/image-size/buanet/iobroker)](https://hub.docker.com/repository/docker/buanet/iobroker)
 [![Docker Pulls](https://img.shields.io/docker/pulls/buanet/iobroker)](https://hub.docker.com/repository/docker/buanet/iobroker)
 [![Docker Stars](https://img.shields.io/docker/stars/buanet/iobroker)](https://hub.docker.com/repository/docker/buanet/iobroker)<br>
-[![Source](https://img.shields.io/badge/source-github-blue)](https://github.com/buanet/docker-iobroker)
-[![License](https://img.shields.io/github/license/buanet/docker-iobroker)](https://github.com/buanet/docker-iobroker/blob/master/LICENSE.md)
+[![Source](https://img.shields.io/badge/source-github-blue)](https://github.com/buanet/ioBroker.docker)
+[![License](https://img.shields.io/github/license/buanet/ioBroker.docker)](https://github.com/buanet/ioBroker.docker/blob/master/LICENSE.md)
 [![Donate](https://img.shields.io/badge/donate-paypal-blue)](https://paypal.me/buanet)
 
 IoBroker for Docker is a ready to use Docker image for ioBroker IoT platform (http://www.iobroker.net).
@@ -172,7 +172,7 @@ After this steps the startup script inside the container will automatically dete
 
 ### Beta testing
 
-If you want to get the newest features and changes feel free to use/ test the beta version of the Docker image. You can find the readme.md file for beta versions [here](https://github.com/buanet/docker-iobroker/blob/beta/README.md). Please make sure to read the changelog before testing beta versions.
+If you want to get the newest features and changes feel free to use/ test the beta version of the Docker image. You can find the readme.md file for beta versions [here](https://github.com/buanet/ioBroker.docker/blob/beta/README.md). Please make sure to read the changelog before testing beta versions.
 
 ### Subscribe to updates
 
@@ -182,7 +182,7 @@ You will find the channel here: https://t.me/buanet_tutorials
 ### Support the project
 
 The easiest way to support this project is to leave me some likes/ stars on Github and Docker hub!<br>
-If you want to give something back, feel free to take a look into the [open issues](https://github.com/buanet/docker-iobroker/issues) or the [ioBroker forum thread](http://forum.iobroker.net/viewtopic.php?f=17&t=5089) and helping me answering questions, fixing bugs or adding new features!<br>
+If you want to give something back, feel free to take a look into the [open issues](https://github.com/buanet/ioBroker.docker/issues) or the [ioBroker forum thread](http://forum.iobroker.net/viewtopic.php?f=17&t=5089) and helping me answering questions, fixing bugs or adding new features!<br>
 And if you want to buy me a beer instead, you can do this here: <a href="https://www.paypal.me/buanet" target="_blank"><img src="https://buanet.de/wp-content/uploads/2017/08/pp128.png" height="20" width="20"></a><br>
 Thank you!
 
diff --git a/aarch64/scripts/iobroker_startup.sh b/aarch64/scripts/iobroker_startup.sh
index ff23abd..e9fa617 100644
--- a/aarch64/scripts/iobroker_startup.sh
+++ b/aarch64/scripts/iobroker_startup.sh
@@ -131,7 +131,7 @@ then
   then
     echo "IoBroker backup file detected in /opt/iobroker. But Multihost is set to \"slave\"."
     echo "Restoring a backup is not supported on Multihost slaves. Please check configuration and start over."
-    echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+    echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)."
     exit 1
   else
     echo "IoBroker backup file detected in /opt/iobroker. Preparing restore..."
@@ -292,7 +292,7 @@ elif [ "$multihost" = "master" ] && [ "$objectsdbhost" = "127.0.0.1" ]
 then
   echo "Multihost is set as \"master\" by ENV. But objects db host is set to \"127.0.0.1\" by ENV too."
   echo "This configuration will not work! Please change or remove ENV \"IOB_OBJECTSDB_HOST\" and start over!"
-  echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+  echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)."
   exit 1
 elif [ "$multihost" = "master" ] &&  [ "$objectsdbtype" != "" ] && [ "$objectsdbhost" != "" ] && [ "$objectsdbport" != "" ]
 then
@@ -305,7 +305,7 @@ then
   echo "Multihost is set as \"slave\" by ENV. But no external objects db is set."
   echo "You have to configure ENVs \"IOB_OBJECTSDB_TYPE\", \"IOB_OBJECTSDB_HOST\" and \"IOB_OBJECTSDB_PORT\" to connect to a maser objects db."
   echo "Please check your settings and start over."
-  echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+  echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)."
   exit 1
 elif [ "$multihost" = "slave" ] && [ "$objectsdbtype" != "" ] && [ "$objectsdbhost" != "" ] && [ "$objectsdbport" != "" ]
 then
@@ -317,7 +317,7 @@ elif [ "$multihost" != "" ]
 then
   echo "Multihost is set but it seems like some configuration is missing."
   echo "Please checke if you have configured the ENVs \"MULTIHOST\", \"IOB_OBJECTSDB_TYPE\", \"IOB_OBJECTSDB_HOST\" and \"IOB_OBJECTSDB_PORT\" correctly and start over."
-  echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+  echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)."
   exit 1
 fi
 #Configuring states db host
@@ -333,7 +333,7 @@ elif [ "$multihost" = "master" ] && [ "$statesdbhost" = "127.0.0.1" ]
 then
   echo "Multihost is set as \"master\" by ENV. But states db host is set to \"127.0.0.1\" by ENV too."
   echo "This configuration will not work! Please change or remove ENV \"IOB_STATESDB_HOST\" and start over!"
-  echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+  echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)."
   exit 1
 elif [ "$multihost" = "master" ] && [ "$statesdbtype" != "" ] && [ "$statesdbhost" != "" ] && [ "$statesdbport" != "" ]
 then
@@ -346,7 +346,7 @@ then
   echo "Multihost is set as \"slave\" by ENV. But no external states db is set."
   echo "You have to configure ENVs \"IOB_STATESDB_TYPE\", \"IOB_STATESDB_HOST\" and \"IOB_STATESDB_PORT\" to connect to a maser states db."
   echo "Please check your settings and start over."
-  echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+  echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)."
   exit 1
 elif [ "$multihost" = "slave" ] && [ "$statesdbtype" != "" ] && [ "$statesdbhost" != "" ] && [ "$statesdbport" != "" ]
 then
@@ -358,7 +358,7 @@ elif [ "$multihost" != "" ]
 then
   echo "Multihost is set but it seems like some configuration is missing."
   echo "Please checke if you have configured the ENVs \"MULTIHOST\", \"IOB_STATESDB_TYPE\", \"IOB_STATESDB_HOST\" and \"IOB_STATESTDB_PORT\" correctly and start over."
-  echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+  echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)."
   exit 1
 fi
 
diff --git a/amd64/scripts/iobroker_startup.sh b/amd64/scripts/iobroker_startup.sh
index ff23abd..e9fa617 100644
--- a/amd64/scripts/iobroker_startup.sh
+++ b/amd64/scripts/iobroker_startup.sh
@@ -131,7 +131,7 @@ then
   then
     echo "IoBroker backup file detected in /opt/iobroker. But Multihost is set to \"slave\"."
     echo "Restoring a backup is not supported on Multihost slaves. Please check configuration and start over."
-    echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+    echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)."
     exit 1
   else
     echo "IoBroker backup file detected in /opt/iobroker. Preparing restore..."
@@ -292,7 +292,7 @@ elif [ "$multihost" = "master" ] && [ "$objectsdbhost" = "127.0.0.1" ]
 then
   echo "Multihost is set as \"master\" by ENV. But objects db host is set to \"127.0.0.1\" by ENV too."
   echo "This configuration will not work! Please change or remove ENV \"IOB_OBJECTSDB_HOST\" and start over!"
-  echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+  echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)."
   exit 1
 elif [ "$multihost" = "master" ] &&  [ "$objectsdbtype" != "" ] && [ "$objectsdbhost" != "" ] && [ "$objectsdbport" != "" ]
 then
@@ -305,7 +305,7 @@ then
   echo "Multihost is set as \"slave\" by ENV. But no external objects db is set."
   echo "You have to configure ENVs \"IOB_OBJECTSDB_TYPE\", \"IOB_OBJECTSDB_HOST\" and \"IOB_OBJECTSDB_PORT\" to connect to a maser objects db."
   echo "Please check your settings and start over."
-  echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+  echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)."
   exit 1
 elif [ "$multihost" = "slave" ] && [ "$objectsdbtype" != "" ] && [ "$objectsdbhost" != "" ] && [ "$objectsdbport" != "" ]
 then
@@ -317,7 +317,7 @@ elif [ "$multihost" != "" ]
 then
   echo "Multihost is set but it seems like some configuration is missing."
   echo "Please checke if you have configured the ENVs \"MULTIHOST\", \"IOB_OBJECTSDB_TYPE\", \"IOB_OBJECTSDB_HOST\" and \"IOB_OBJECTSDB_PORT\" correctly and start over."
-  echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+  echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)."
   exit 1
 fi
 #Configuring states db host
@@ -333,7 +333,7 @@ elif [ "$multihost" = "master" ] && [ "$statesdbhost" = "127.0.0.1" ]
 then
   echo "Multihost is set as \"master\" by ENV. But states db host is set to \"127.0.0.1\" by ENV too."
   echo "This configuration will not work! Please change or remove ENV \"IOB_STATESDB_HOST\" and start over!"
-  echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+  echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)."
   exit 1
 elif [ "$multihost" = "master" ] && [ "$statesdbtype" != "" ] && [ "$statesdbhost" != "" ] && [ "$statesdbport" != "" ]
 then
@@ -346,7 +346,7 @@ then
   echo "Multihost is set as \"slave\" by ENV. But no external states db is set."
   echo "You have to configure ENVs \"IOB_STATESDB_TYPE\", \"IOB_STATESDB_HOST\" and \"IOB_STATESDB_PORT\" to connect to a maser states db."
   echo "Please check your settings and start over."
-  echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+  echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)."
   exit 1
 elif [ "$multihost" = "slave" ] && [ "$statesdbtype" != "" ] && [ "$statesdbhost" != "" ] && [ "$statesdbport" != "" ]
 then
@@ -358,7 +358,7 @@ elif [ "$multihost" != "" ]
 then
   echo "Multihost is set but it seems like some configuration is missing."
   echo "Please checke if you have configured the ENVs \"MULTIHOST\", \"IOB_STATESDB_TYPE\", \"IOB_STATESDB_HOST\" and \"IOB_STATESTDB_PORT\" correctly and start over."
-  echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+  echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)."
   exit 1
 fi
 
diff --git a/armv7hf/scripts/iobroker_startup.sh b/armv7hf/scripts/iobroker_startup.sh
index ff23abd..e9fa617 100644
--- a/armv7hf/scripts/iobroker_startup.sh
+++ b/armv7hf/scripts/iobroker_startup.sh
@@ -131,7 +131,7 @@ then
   then
     echo "IoBroker backup file detected in /opt/iobroker. But Multihost is set to \"slave\"."
     echo "Restoring a backup is not supported on Multihost slaves. Please check configuration and start over."
-    echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+    echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)."
     exit 1
   else
     echo "IoBroker backup file detected in /opt/iobroker. Preparing restore..."
@@ -292,7 +292,7 @@ elif [ "$multihost" = "master" ] && [ "$objectsdbhost" = "127.0.0.1" ]
 then
   echo "Multihost is set as \"master\" by ENV. But objects db host is set to \"127.0.0.1\" by ENV too."
   echo "This configuration will not work! Please change or remove ENV \"IOB_OBJECTSDB_HOST\" and start over!"
-  echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+  echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)."
   exit 1
 elif [ "$multihost" = "master" ] &&  [ "$objectsdbtype" != "" ] && [ "$objectsdbhost" != "" ] && [ "$objectsdbport" != "" ]
 then
@@ -305,7 +305,7 @@ then
   echo "Multihost is set as \"slave\" by ENV. But no external objects db is set."
   echo "You have to configure ENVs \"IOB_OBJECTSDB_TYPE\", \"IOB_OBJECTSDB_HOST\" and \"IOB_OBJECTSDB_PORT\" to connect to a maser objects db."
   echo "Please check your settings and start over."
-  echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+  echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)."
   exit 1
 elif [ "$multihost" = "slave" ] && [ "$objectsdbtype" != "" ] && [ "$objectsdbhost" != "" ] && [ "$objectsdbport" != "" ]
 then
@@ -317,7 +317,7 @@ elif [ "$multihost" != "" ]
 then
   echo "Multihost is set but it seems like some configuration is missing."
   echo "Please checke if you have configured the ENVs \"MULTIHOST\", \"IOB_OBJECTSDB_TYPE\", \"IOB_OBJECTSDB_HOST\" and \"IOB_OBJECTSDB_PORT\" correctly and start over."
-  echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+  echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)."
   exit 1
 fi
 #Configuring states db host
@@ -333,7 +333,7 @@ elif [ "$multihost" = "master" ] && [ "$statesdbhost" = "127.0.0.1" ]
 then
   echo "Multihost is set as \"master\" by ENV. But states db host is set to \"127.0.0.1\" by ENV too."
   echo "This configuration will not work! Please change or remove ENV \"IOB_STATESDB_HOST\" and start over!"
-  echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+  echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)."
   exit 1
 elif [ "$multihost" = "master" ] && [ "$statesdbtype" != "" ] && [ "$statesdbhost" != "" ] && [ "$statesdbport" != "" ]
 then
@@ -346,7 +346,7 @@ then
   echo "Multihost is set as \"slave\" by ENV. But no external states db is set."
   echo "You have to configure ENVs \"IOB_STATESDB_TYPE\", \"IOB_STATESDB_HOST\" and \"IOB_STATESDB_PORT\" to connect to a maser states db."
   echo "Please check your settings and start over."
-  echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+  echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)."
   exit 1
 elif [ "$multihost" = "slave" ] && [ "$statesdbtype" != "" ] && [ "$statesdbhost" != "" ] && [ "$statesdbport" != "" ]
 then
@@ -358,7 +358,7 @@ elif [ "$multihost" != "" ]
 then
   echo "Multihost is set but it seems like some configuration is missing."
   echo "Please checke if you have configured the ENVs \"MULTIHOST\", \"IOB_STATESDB_TYPE\", \"IOB_STATESDB_HOST\" and \"IOB_STATESTDB_PORT\" correctly and start over."
-  echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)."
+  echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)."
   exit 1
 fi