diff --git a/docs/generate/custom-vector-from-postgis.md b/docs/generate/custom-vector-from-postgis.md
index ea103d0..76ed9c1 100644
--- a/docs/generate/custom-vector-from-postgis.md
+++ b/docs/generate/custom-vector-from-postgis.md
@@ -153,7 +153,7 @@ docker-compose -f docker-compose.yml -f ./data/docker-compose-config.yml  run --
 
 Your MBTiles file is now in `data/tiles.mbtiles`. You can preview it using [TileServer-GL](/docs/host/tileserver-gl/):
 ```bash
-docker run -it -v $(pwd):/data -p 8080:80 klokantech/tileserver-gl data/tiles.mbtiles
+docker run -it -v $(pwd):/data -p 8080:80 maptiler/tileserver-gl data/tiles.mbtiles
 ```
 <img src='/img/custom-vector-tileserver-gl2.png' alt='Data preview with TileServer-GL' />
 
diff --git a/docs/generate/custom-vector-from-shapefile-geojson.md b/docs/generate/custom-vector-from-shapefile-geojson.md
index 6d91816..0f6dcb5 100644
--- a/docs/generate/custom-vector-from-shapefile-geojson.md
+++ b/docs/generate/custom-vector-from-shapefile-geojson.md
@@ -27,7 +27,7 @@ It will convert your data into MBTiles for zoom levels 0 to 14. Tippecanoe enabl
 
 You can visually check the generated MBTiles file using [TileServer-GL](/docs/host/tileserver-gl/):
 ```bash
-docker run -it -v $(pwd):/data -p 8080:80 klokantech/tileserver-gl your_data.mbtiles
+docker run -it -v $(pwd):/data -p 8080:80 maptiler/tileserver-gl your_data.mbtiles
 ```
 
 Data preview with TileServer-GL:
diff --git a/docs/index.html b/docs/index.html
index 8d51f64..86d9b98 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -73,7 +73,7 @@ <h4 class="padt-4">More articles</h4>
         <div class="tabs-tab" id="tab-2">
           <h2>Docker with TileServer GL</h2>
           If you need Docker microservice and advanced configuration, you can use the rendering core of our server directly. To install a tileserver serving both vector and raster tiles, we recommend using the official Docker image <b>tileserver-gl</b>. By launching the Docker with the command below, you mount the active directory with the previously downloaded MBTiles file with vector tiles and run the tile server at a local port 8080.
-          <pre class="highlight"><code>docker run -it -v $(pwd):/data -p 8080:80 klokantech/tileserver-gl</code></pre>
+          <pre class="highlight"><code>docker run -it -v $(pwd):/data -p 8080:80 maptiler/tileserver-gl</code></pre>
           <p>
             Read the <a href="/docs/host/tileserver-gl">Tileserver GL</a> tutorial for more in-depth information.
           </p>
@@ -93,7 +93,7 @@ <h3>2. Run a TileServer</h3>
           </p>
 
           <p>
-            Using <a href="https://github.com/klokantech/tileserver-gl">tileserver-gl</a> gl you can immediately serve vector tiles including a web viewer and sample styles.<br/>
+            Using <a href="https://github.com/maptiler/tileserver-gl">tileserver-gl</a> you can immediately serve vector tiles including a web viewer and sample styles.<br/>
             The light version <b>tileserver-gl-light</b> can be easily installed using npm.
           </p>
           <pre class="highlight"><code>npm install -g tileserver-gl-light</code></pre>