diff --git a/.travis.yml b/.travis.yml
index cc520dc..cd7e0c4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,9 +27,9 @@ jobs:
     services:
     - docker
     script:
-    - docker build -t buckaroobanzay/mapserver:latest .
+    - docker build -t minetesttools/mapserver:latest .
     - docker login -u $DOCKER_USER -p $DOCKER_PASS
-    - docker push buckaroobanzay/mapserver
+    - docker push minetesttools/mapserver
 
   - stage: dockerhub push tag
     if: tag IS present
@@ -37,10 +37,10 @@ jobs:
     services:
     - docker
     script:
-    - docker build -t buckaroobanzay/mapserver:latest .
-    - docker tag buckaroobanzay/mapserver:latest buckaroobanzay/mapserver:$TRAVIS_TAG
+    - docker build -t minetesttools/mapserver:latest .
+    - docker tag minetesttools/mapserver:latest minetesttools/mapserver:$TRAVIS_TAG
     - docker login -u $DOCKER_USER -p $DOCKER_PASS
-    - docker push buckaroobanzay/mapserver
+    - docker push minetesttools/mapserver
 
 env:
   global:
diff --git a/doc/install.md b/doc/install.md
index 5128792..9e1d047 100644
--- a/doc/install.md
+++ b/doc/install.md
@@ -14,10 +14,10 @@ For additional infos (lag,time,players => active mode) on the mapserver interfac
 
 ## Docker image
 
-Simple docker run example:
+Simple docker run example to run in the world-directory:
 
 ```
-docker run --rm --it -p 8080:8080 -v $(pwd):/minetest -w /minetest buckaroobanzay/mapserver
+docker run --rm --it -p 8080:8080 -v $(pwd):/minetest -w /minetest minetesttools/mapserver
 ```
 
 ## Docker compose
@@ -27,7 +27,7 @@ Examplary `docker-compose` config:
 ```yml
 services:
   mapserver:
-   image: buckaroobanzay/mapserver
+   image: minetesttools/mapserver
    restart: always
    networks:
     - default