diff --git a/README.md b/README.md
index 176b394..7e2f9a9 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 
 # TileServer GL
 [![Build Status](https://travis-ci.org/maptiler/tileserver-gl.svg?branch=master)](https://travis-ci.org/maptiler/tileserver-gl)
-[![Docker Hub](https://img.shields.io/badge/docker-hub-blue.svg)](https://hub.docker.com/r/klokantech/tileserver-gl/)
+[![Docker Hub](https://img.shields.io/badge/docker-hub-blue.svg)](https://hub.docker.com/r/maptiler/tileserver-gl/)
 
 Vector and raster maps with GL styles. Server side rendering by Mapbox GL Native. Map tile server for Mapbox GL JS, Android, iOS, Leaflet, OpenLayers, GIS via WMTS, etc.
 
@@ -36,7 +36,7 @@ Alternatively, you can use the `tileserver-gl-light` package instead, which is p
 An alternative to npm to start the packed software easier is to install [Docker](https://www.docker.com/) on your computer and then run in the directory with the downloaded MBTiles the command:
 
 ```bash
-docker run --rm -it -v $(pwd):/data -p 8080:80 klokantech/tileserver-gl
+docker run --rm -it -v $(pwd):/data -p 8080:80 maptiler/tileserver-gl
 ```
 
 This will download and start a ready to use container on your computer and the maps are going to be available in webbrowser on localhost:8080.
diff --git a/README_light.md b/README_light.md
index 42b7fb8..2e019ff 100644
--- a/README_light.md
+++ b/README_light.md
@@ -1,6 +1,6 @@
 # TileServer GL light
 [![Build Status](https://travis-ci.org/maptiler/tileserver-gl.svg?branch=master)](https://travis-ci.org/maptiler/tileserver-gl)
-[![Docker Hub](https://img.shields.io/badge/docker-hub-blue.svg)](https://hub.docker.com/r/klokantech/tileserver-gl/)
+[![Docker Hub](https://img.shields.io/badge/docker-hub-blue.svg)](https://hub.docker.com/r/maptiler/tileserver-gl/)
 
 Vector maps with GL styles. Map tile server for Mapbox Android, iOS, GL JS, Leaflet, OpenLayers, etc. without server side rendering.
 
diff --git a/docs/installation.rst b/docs/installation.rst
index 5e30ead..3741e89 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -7,12 +7,12 @@ Docker
 
 When running docker image, no special installation is needed -- the docker will automatically download the image if not present.
 
-Just run ``docker run --rm -it -v $(pwd):/data -p 8080:80 klokantech/tileserver-gl``.
+Just run ``docker run --rm -it -v $(pwd):/data -p 8080:80 maptiler/tileserver-gl``.
 
 Additional options (see :doc:`/usage`) can be passed to the TileServer GL by appending them to the end of this command. You can, for example, do the following:
 
-* ``docker run ... klokantech/tileserver-gl --mbtiles my-tiles.mbtiles`` -- explicitly specify which mbtiles to use (if you have more in the folder)
-* ``docker run ... klokantech/tileserver-gl --verbose`` -- to see the default config created automatically
+* ``docker run ... maptiler/tileserver-gl --mbtiles my-tiles.mbtiles`` -- explicitly specify which mbtiles to use (if you have more in the folder)
+* ``docker run ... maptiler/tileserver-gl --verbose`` -- to see the default config created automatically
 
 npm
 ===
diff --git a/src/main.js b/src/main.js
index 98c8a86..2fb3723 100644
--- a/src/main.js
+++ b/src/main.js
@@ -194,7 +194,7 @@ fs.stat(path.resolve(opts.config), (err, stats) => {
         console.log(`No MBTiles specified, using ${mbtiles}`);
         return startWithMBTiles(mbtiles);
       } else {
-        const url = 'https://github.com/klokantech/tileserver-gl/releases/download/v1.3.0/zurich_switzerland.mbtiles';
+        const url = 'https://github.com/maptiler/tileserver-gl/releases/download/v1.3.0/zurich_switzerland.mbtiles';
         const filename = 'zurich_switzerland.mbtiles';
         const stream = fs.createWriteStream(filename);
         console.log(`No MBTiles found`);
diff --git a/src/serve_rendered.js b/src/serve_rendered.js
index a0536b4..e94b827 100644
--- a/src/serve_rendered.js
+++ b/src/serve_rendered.js
@@ -278,7 +278,7 @@ module.exports = {
           }
 
           // Fix semi-transparent outlines on raw, premultiplied input
-          // https://github.com/klokantech/tileserver-gl/issues/350#issuecomment-477857040
+          // https://github.com/maptiler/tileserver-gl/issues/350#issuecomment-477857040
           for (var i = 0; i < data.length; i += 4) {
             var alpha = data[i + 3];
             var norm = alpha / 255;