diff --git a/workshop/content/docs/advanced/arcgis.md b/workshop/content/docs/advanced/arcgis.md
index ebeae88..192a076 100644
--- a/workshop/content/docs/advanced/arcgis.md
+++ b/workshop/content/docs/advanced/arcgis.md
@@ -173,9 +173,9 @@ labelsCheckbox.addEventListener('change', (event) => {
 
 !!! example
 
-    - Direct MapServer request: <http://localhost:7000/?map=/etc/mapserver/arcgis.map&REQUEST=GetMap&SERVICE=WMS&VERSION=1.3.0&FORMAT=image%2Fpng&STYLES=&TRANSPARENT=TRUE&LAYERS=PoolPermits&WIDTH=3840&HEIGHT=1907&CRS=EPSG%3A3857&BBOX=-13076703%2C4014686%2C-13072117.389151445%2C4016958>
-    - Direct MapServer request with labels: <http://localhost:7000/?map=/etc/mapserver/arcgis.map&REQUEST=GetMap&SERVICE=WMS&VERSION=1.3.0&FORMAT=image%2Fpng&STYLES=&TRANSPARENT=TRUE&LAYERS=PoolPermits&LABELS=visible&WIDTH=3840&HEIGHT=1907&CRS=EPSG%3A3857&BBOX=-13076703%2C4014686%2C-13072117.389151445%2C4016958>
-    - Local OpenLayers example: <http://localhost:7001/arcgis.html>
+    - Direct MapServer request: <http://localhost:9090/?map=/etc/mapserver/arcgis.map&REQUEST=GetMap&SERVICE=WMS&VERSION=1.3.0&FORMAT=image%2Fpng&STYLES=&TRANSPARENT=TRUE&LAYERS=PoolPermits&WIDTH=3840&HEIGHT=1907&CRS=EPSG%3A3857&BBOX=-13076703%2C4014686%2C-13072117.389151445%2C4016958>
+    - Direct MapServer request with labels: <http://localhost:9090/?map=/etc/mapserver/arcgis.map&REQUEST=GetMap&SERVICE=WMS&VERSION=1.3.0&FORMAT=image%2Fpng&STYLES=&TRANSPARENT=TRUE&LAYERS=PoolPermits&LABELS=visible&WIDTH=3840&HEIGHT=1907&CRS=EPSG%3A3857&BBOX=-13076703%2C4014686%2C-13072117.389151445%2C4016958>
+    - Local OpenLayers example: <http://localhost:9091/arcgis.html>
 
 ??? JavaScript "arcgis.js"
 
diff --git a/workshop/content/docs/advanced/clusters.md b/workshop/content/docs/advanced/clusters.md
index aa070eb..f49ae86 100644
--- a/workshop/content/docs/advanced/clusters.md
+++ b/workshop/content/docs/advanced/clusters.md
@@ -31,8 +31,8 @@ CLASS
 
 !!! example
 
-    - MapServer request: <http://localhost:7000/?map=/etc/mapserver/clusters.map&mode=map&layer=trees>
-    - OpenLayers example: <http://localhost:7001/clusters.html>
+    - MapServer request: <http://localhost:9090/?map=/etc/mapserver/clusters.map&mode=map&layer=trees>
+    - OpenLayers example: <http://localhost:9091/clusters.html>
 
 ??? JavaScript "clusters.js"
 
diff --git a/workshop/content/docs/advanced/gdalg.md b/workshop/content/docs/advanced/gdalg.md
index 7e1452d..65d1230 100644
--- a/workshop/content/docs/advanced/gdalg.md
+++ b/workshop/content/docs/advanced/gdalg.md
@@ -125,8 +125,8 @@ LAYER
 
 !!! example
 
-    - Direct MapServer request: <http://localhost:7000/?map=/etc/mapserver/gdalg.map&REQUEST=GetMap&SERVICE=WMS&VERSION=1.3.0&FORMAT=image%2Fpng&STYLES=&TRANSPARENT=TRUE&LAYERS=buffered_roads%2Croads&WIDTH=1707&HEIGHT=848&CRS=EPSG%3A3857&BBOX=2974643.6269619283%2C8046226.818245997%2C2976682.478528896%2C8047239.608870775>
-    - Local OpenLayers example: <http://localhost:7001/gdalg.html>
+    - Direct MapServer request: <http://localhost:9090/?map=/etc/mapserver/gdalg.map&REQUEST=GetMap&SERVICE=WMS&VERSION=1.3.0&FORMAT=image%2Fpng&STYLES=&TRANSPARENT=TRUE&LAYERS=buffered_roads%2Croads&WIDTH=1707&HEIGHT=848&CRS=EPSG%3A3857&BBOX=2974643.6269619283%2C8046226.818245997%2C2976682.478528896%2C8047239.608870775>
+    - Local OpenLayers example: <http://localhost:9091/gdalg.html>
 
 ??? JavaScript "gdalg.js"
 
diff --git a/workshop/content/docs/advanced/other-projections.md b/workshop/content/docs/advanced/other-projections.md
index 9f7b252..3ef2f50 100644
--- a/workshop/content/docs/advanced/other-projections.md
+++ b/workshop/content/docs/advanced/other-projections.md
@@ -82,7 +82,7 @@ if we were to use the service-specific metadata items.
 !!! note
 
     The order of the layers in the Mapfile is important when requesting a map directly using the MapServer CGI interface 
-    (for example <http://localhost:7000/?map=/etc/mapserver/other-projections.map&mode=map&layer=countries&layer=cities&layer=raster>).
+    (for example <http://localhost:9090/?map=/etc/mapserver/other-projections.map&mode=map&layer=countries&layer=cities&layer=raster>).
     The raster layer must be first in the Mapfile, otherwise the raster will be drawn on top of the vector layers and obscure them. The order of the layers in the request
     itself does not affect the rendering order, only the order in the Mapfile.
 
@@ -235,8 +235,8 @@ const wcsSource = new ImageWMS({
 
 !!! example
 
-    - MapServer request: <http://localhost:7000/?map=/etc/mapserver/other-projections.map&mode=map&layer=countries&layer=cities&layer=raster>
-    - OpenLayers example: <http://localhost:7001/other-projections.html>
+    - MapServer request: <http://localhost:9090/?map=/etc/mapserver/other-projections.map&mode=map&layer=countries&layer=cities&layer=raster>
+    - OpenLayers example: <http://localhost:9091/other-projections.html>
 
 ??? JavaScript "other-projections.js"
 
@@ -270,7 +270,7 @@ const wcsSource = new ImageWMS({
 2. Update the Mapfile to use another non-EPSG projection, for example `ESRI:54030` (the [Robinson projection](https://en.wikipedia.org/wiki/Robinson_projection)).
 
     Test everything is configured correctly by making a direct request to the MapServer CGI interface 
-    using <http://localhost:7000/?map=/etc/mapserver/other-projections.map&mode=map&layer=countries&layer=cities&layer=raster>.
+    using <http://localhost:9090/?map=/etc/mapserver/other-projections.map&mode=map&layer=countries&layer=cities&layer=raster>.
 
 
 ## Further Reading
diff --git a/workshop/content/docs/advanced/sld.md b/workshop/content/docs/advanced/sld.md
index ed33d9a..fdc8668 100644
--- a/workshop/content/docs/advanced/sld.md
+++ b/workshop/content/docs/advanced/sld.md
@@ -24,10 +24,10 @@ This exercise will focus on the first use case.
 
 !!! example
 
-    - Direct MapServer request: <http://localhost:7000/?map=/etc/mapserver/lines.map&mode=map&layer=roads>
-    - Local OpenLayers example: <http://localhost:7001/sld.html>
-    - GetCapabilities request: <http://localhost:7000/?map=/etc/mapserver/sld.map&REQUEST=GetCapabilities&SERVICE=WMS&VERSION=1.3.0>
-    - Request to generate SLD from a Mapfile: <http://localhost:7000/?map=/etc/mapserver/sld.map&REQUEST=GetStyles&SERVICE=WMS&LAYERS=countries&VERSION=1.3.0&sld=http://node:7001/data/sld.xml>
+    - Direct MapServer request: <http://localhost:9090/?map=/etc/mapserver/lines.map&mode=map&layer=roads>
+    - Local OpenLayers example: <http://localhost:9091/sld.html>
+    - GetCapabilities request: <http://localhost:9090/?map=/etc/mapserver/sld.map&REQUEST=GetCapabilities&SERVICE=WMS&VERSION=1.3.0>
+    - Request to generate SLD from a Mapfile: <http://localhost:9090/?map=/etc/mapserver/sld.map&REQUEST=GetStyles&SERVICE=WMS&LAYERS=countries&VERSION=1.3.0&sld=http://node:9091/data/sld.xml>
 
 ???+ SLD
 
diff --git a/workshop/content/docs/advanced/stac.md b/workshop/content/docs/advanced/stac.md
index 763cde4..8023d1d 100644
--- a/workshop/content/docs/advanced/stac.md
+++ b/workshop/content/docs/advanced/stac.md
@@ -135,7 +135,7 @@ new ImageLayer({
 
 !!! example
 
-    - Local OpenLayers example: <http://localhost:7001/stac.html>
+    - Local OpenLayers example: <http://localhost:9091/stac.html>
 
 ??? JavaScript "stac.js"
 
diff --git a/workshop/content/docs/advanced/symbols.md b/workshop/content/docs/advanced/symbols.md
index 883d2ed..204b0ce 100644
--- a/workshop/content/docs/advanced/symbols.md
+++ b/workshop/content/docs/advanced/symbols.md
@@ -81,8 +81,8 @@ END
 
 !!! example
 
-    - Direct MapServer request: <http://localhost:7000/?map=/etc/mapserver/railways.map&mode=map&layer=roads>
-    - Local OpenLayers example: <http://localhost:7001/railways.html>
+    - Direct MapServer request: <http://localhost:9090/?map=/etc/mapserver/railways.map&mode=map&layer=roads>
+    - Local OpenLayers example: <http://localhost:9091/railways.html>
 
 ??? JavaScript "railways.js"
 
diff --git a/workshop/content/docs/inputs/databases.md b/workshop/content/docs/inputs/databases.md
index 37cf5ca..58b20b6 100644
--- a/workshop/content/docs/inputs/databases.md
+++ b/workshop/content/docs/inputs/databases.md
@@ -79,8 +79,8 @@ Online example not available as no PostGIS installation on the server
 
 !!! example "Exercise Links"
 
-    - MapServer request: <http://localhost:7000/?map=/etc/mapserver/postgis.map&mode=map&layer=water>
-    - OpenLayers example: <http://localhost:7001/postgis.html>
+    - MapServer request: <http://localhost:9090/?map=/etc/mapserver/postgis.map&mode=map&layer=water>
+    - OpenLayers example: <http://localhost:9091/postgis.html>
 
 ??? JavaScript "postgis.js"
 
@@ -98,7 +98,7 @@ Online example not available as no PostGIS installation on the server
 
 1. Try to load another dataset into the database using the `gdal vector convert` approach above.
 2. Now add a new layer to the Mapfile to display the layer. You can make a direct request to MapServer in the form:
-  <http://localhost:7000/?map=/etc/mapserver/postgis.map&mode=map&layers=water%20NEWLAYERNAME>.
+  <http://localhost:9090/?map=/etc/mapserver/postgis.map&mode=map&layers=water%20NEWLAYERNAME>.
 3. Now update the JS file so the layer is visible in the interactive map via WMS:
 
     ```js
diff --git a/workshop/content/docs/inputs/raster.md b/workshop/content/docs/inputs/raster.md
index 40dde4d..c75b805 100644
--- a/workshop/content/docs/inputs/raster.md
+++ b/workshop/content/docs/inputs/raster.md
@@ -85,8 +85,8 @@ A [COMPOSITE](https://mapserver.org/mapfile/composite.html) block is used to mak
 
 !!! example
 
-    - MapServer request: <http://localhost:7000/?map=/etc/mapserver/raster.map&mode=map&layer=dtm>
-    - OpenLayers example: <http://localhost:7001/raster.html>
+    - MapServer request: <http://localhost:9090/?map=/etc/mapserver/raster.map&mode=map&layer=dtm>
+    - OpenLayers example: <http://localhost:9091/raster.html>
 
 ??? JavaScript "raster.js"
 
diff --git a/workshop/content/docs/inputs/vector.md b/workshop/content/docs/inputs/vector.md
index 82daeaf..31d2da7 100644
--- a/workshop/content/docs/inputs/vector.md
+++ b/workshop/content/docs/inputs/vector.md
@@ -38,8 +38,8 @@ than a huge GeoTIFF file.
 
 !!! example
 
-    - MapServer request: <http://localhost:7000/?map=/etc/mapserver/stars.map&mode=map&layer=constellations>
-    - OpenLayers example: <http://localhost:7001/stars.html>
+    - MapServer request: <http://localhost:9090/?map=/etc/mapserver/stars.map&mode=map&layer=constellations>
+    - OpenLayers example: <http://localhost:9091/stars.html>
 
 ??? JavaScript "stars.js"
 
diff --git a/workshop/content/docs/introduction/commandline.md b/workshop/content/docs/introduction/commandline.md
index b4b4e3d..e3b4b6f 100644
--- a/workshop/content/docs/introduction/commandline.md
+++ b/workshop/content/docs/introduction/commandline.md
@@ -21,7 +21,7 @@ INPUT=OGR INPUT=GDAL INPUT=SHAPEFILE INPUT=FLATGEOBUF
 When run through a web server, data is passed to the `mapserv` application, which generates output that is then sent back through the web server.
 All web requests can be recreated and tested on the command line, making it a handy debugging tool.
 
-To test a URL such as <http://localhost:7000/?map=/etc/mapserver/countries.map&mode=map> run the following command:
+To test a URL such as <http://localhost:9090/?map=/etc/mapserver/countries.map&mode=map> run the following command:
 
 ```bash
 mapserv "QUERY_STRING=map=/etc/mapserver/countries.map&mode=map"
diff --git a/workshop/content/docs/introduction/docker.md b/workshop/content/docs/introduction/docker.md
index 1284cb8..afc6965 100644
--- a/workshop/content/docs/introduction/docker.md
+++ b/workshop/content/docs/introduction/docker.md
@@ -10,7 +10,7 @@ MapServer runs on the Apache web server - see the [Apache page](../advanced/apac
 
 It uses the Apache [mod_fcgid module](https://httpd.apache.org/mod_fcgid/), a module that provides FastCGI support.
 
-MapServer runs on port `8080` on the Docker container, which is mapped to port `7000` on the local machine, as can be seen in the Docker compose file
+MapServer runs on port `8080` on the Docker container, which is mapped to port `9090` on the local machine, as can be seen in the Docker compose file
 located at `workshop/exercises/docker-compose.yml`:
 
 ```yaml
@@ -18,7 +18,7 @@ located at `workshop/exercises/docker-compose.yml`:
     image: geographika/mapserver-workshop:latest
     container_name: mapserver
     ports:
-      - 7000:8080
+      - 9090:8080
     environment:
       MAPSERVER_CONFIG_FILE: "/etc/mapserver/mapserver.conf"
     volumes:
@@ -37,7 +37,7 @@ A second Docker container serves the JavaScript example pages. This uses Node an
     image: node:lts-slim
     container_name: node
     ports:
-      - 7001:7001
+      - 9091:9091
     working_dir: /home/node/app
     volumes:
       - ./app:/home/node/app
@@ -55,8 +55,8 @@ A second Docker container serves the JavaScript example pages. This uses Node an
   # start docker in detached mode
   docker compose up -d
   # the following URLs should now be available
-  # http://localhost:7000
-  # http://localhost:7001
+  # http://localhost:9090
+  # http://localhost:9091
 
   # stop docker
   docker compose down
diff --git a/workshop/content/docs/introduction/introduction.md b/workshop/content/docs/introduction/introduction.md
index ba1e785..27adb8c 100644
--- a/workshop/content/docs/introduction/introduction.md
+++ b/workshop/content/docs/introduction/introduction.md
@@ -56,13 +56,13 @@ setup provided to you is actually working. The Docker Compose configuration file
     docker compose up
     ```
 
-    2. Open <http://localhost:7000> in your browser, you should see an error message!
+    2. Open <http://localhost:9090> in your browser, you should see an error message!
     3. Close by pressing `CTRL-C`
 
 # Displaying Your First Map
 
-- Ensure that you have MapServer set up and running at <http://localhost:7000>.
-- Now try opening the following MapServer URL in your browser - <http://localhost:7000/?map=/etc/mapserver/countries.map&mode=map>
+- Ensure that you have MapServer set up and running at <http://localhost:9090>.
+- Now try opening the following MapServer URL in your browser - <http://localhost:9090/?map=/etc/mapserver/countries.map&mode=map>
 
 
 !!! note
@@ -72,7 +72,7 @@ setup provided to you is actually working. The Docker Compose configuration file
     ```bash
     docker compose up -d
     docker container ls  # verify that the mapserver container is running
-    # visit http://localhost:7000 in your browser
+    # visit http://localhost:9090 in your browser
     docker logs --follow mapserver  # view logs
     docker compose stop
     ```
diff --git a/workshop/content/docs/introduction/openlayers.md b/workshop/content/docs/introduction/openlayers.md
index 63b949c..8a75d26 100644
--- a/workshop/content/docs/introduction/openlayers.md
+++ b/workshop/content/docs/introduction/openlayers.md
@@ -15,7 +15,7 @@ A useful introduction to OpenLayers can be found [here](https://openlayers.org/w
 ## HTML example pages
 
 The HTML pages are served using a Docker container, and when the containers are
-running an index page for all workshop exercises is available at <http://localhost:7001/>. 
+running an index page for all workshop exercises is available at <http://localhost:9091/>. 
 
 The HTML files used in the workshop are located in `exercises/app`.
 The JavaScript files can be found in `exercises/app/js`. These files can be edited and changes viewed in the browser. 
diff --git a/workshop/content/docs/mapfile/config.md b/workshop/content/docs/mapfile/config.md
index c8ab113..05d849a 100644
--- a/workshop/content/docs/mapfile/config.md
+++ b/workshop/content/docs/mapfile/config.md
@@ -58,7 +58,7 @@ In the workshop configuration file, the following variables are set:
   on the incoming request host and path.
 - `OGCAPI_HTML_TEMPLATE_DIRECTORY "/usr/local/share/mapserver/ogcapi/templates/html-bootstrap/"`
   this setting points MapServer to the folder containing the Bootstrap HTML templates used when generating
-  the OGC API interface, for example at <http://localhost:7000/timisoara/ogcapi/?f=html>.
+  the OGC API interface, for example at <http://localhost:9090/timisoara/ogcapi/?f=html>.
 - `MS_INDEX_TEMPLATE_DIRECTORY "/usr/local/share/mapserver/ogcapi/templates/html-index-bootstrap/"`
   a similar setting, but used to point to the Bootstrap templates used when generating the MapServer
   [Index Pages](https://mapserver.org/output/index-page.html).
@@ -104,17 +104,17 @@ The keys allow us to access the Mapfile using the URL in the form `http://server
     `?map=/etc/mapserver/lines.map`
 
 If we have set the `MS_INDEX_TEMPLATE_DIRECTORY` path in the `ENV` section above, then MapServer
-will return an "Index Page", listing all these maps at the root of the MapServer URL: <http://localhost:7000/>.
+will return an "Index Page", listing all these maps at the root of the MapServer URL: <http://localhost:9090/>.
 
 Clicking on one of these links takes you to an individual Mapfile Landing Page, which lists the
-services available for that Mapfile, such as WMS, WFS, WCS, and OGC APIs. For example <http://localhost:7000/timisoara/>.
+services available for that Mapfile, such as WMS, WFS, WCS, and OGC APIs. For example <http://localhost:9090/timisoara/>.
 
 ## Code
 
 !!! example
 
-    - MapServer Index Page request: <http://localhost:7000/>
-    - MapServer Mapfile Landing Page example: <http://localhost:7000/timisoara/>
+    - MapServer Index Page request: <http://localhost:9090/>
+    - MapServer Mapfile Landing Page example: <http://localhost:9090/timisoara/>
 
 ??? Config file "mapserver.conf"
 
@@ -132,12 +132,12 @@ services available for that Mapfile, such as WMS, WFS, WCS, and OGC APIs. For ex
 
 - Add the Mapfile `./workshop/exercises/mapfiles/config.map` to the configuration file
   `./workshop/exercises/mapfiles/mapserver.conf`. Check it appears in the MapServer Index page
-  at <http://localhost:7000/>. You will need to restart the MapServer container to see this change.
+  at <http://localhost:9090/>. You will need to restart the MapServer container to see this change.
 - Enable the CGI functionality in the Mapfile by changing `"ms_enable_modes" "!*"`
   to `"*"` (or comment-out the whole line). This should create a new "OpenLayers Viewer"
-  link at <http://localhost:7000/CONFIG_MAP/>.
+  link at <http://localhost:9090/CONFIG_MAP/>.
 - Comment and uncomment the various `enable_request` `METADATA` items, and see how they affect
-  the available services for the Mapfile at <http://localhost:7000/CONFIG_MAP/>.
+  the available services for the Mapfile at <http://localhost:9090/CONFIG_MAP/>.
 
 !!! tip
 
diff --git a/workshop/content/docs/mapfile/labels.md b/workshop/content/docs/mapfile/labels.md
index e118d8e..b490899 100644
--- a/workshop/content/docs/mapfile/labels.md
+++ b/workshop/content/docs/mapfile/labels.md
@@ -41,9 +41,9 @@ GEOMTRANSFORM (centerline(densify([shape], 0.1)))
 
 !!! example
 
-    - Direct MapServer request: <http://localhost:7000/?map=/etc/mapserver/lakes.map&mode=map&layer=lakes&layer=lake-labels>
-    - Inbuilt OpenLayers viewer: <http://localhost:7000/lakes/?template=openlayers&mode=browse&layers=all>
-    - Local OpenLayers example: <http://localhost:7001/lakes.html>
+    - Direct MapServer request: <http://localhost:9090/?map=/etc/mapserver/lakes.map&mode=map&layer=lakes&layer=lake-labels>
+    - Inbuilt OpenLayers viewer: <http://localhost:9090/lakes/?template=openlayers&mode=browse&layers=all>
+    - Local OpenLayers example: <http://localhost:9091/lakes.html>
 
 ??? JavaScript "lakes.js"
 
diff --git a/workshop/content/docs/mapfile/lines.md b/workshop/content/docs/mapfile/lines.md
index a36a8df..33a4795 100644
--- a/workshop/content/docs/mapfile/lines.md
+++ b/workshop/content/docs/mapfile/lines.md
@@ -66,9 +66,9 @@ END
 
 !!! example
 
-    - Direct MapServer request: <http://localhost:7000/?map=/etc/mapserver/lines.map&mode=map&layer=roads>
-    - Inbuilt OpenLayers viewer: <http://localhost:7000/lines/?template=openlayers&mode=browse&layers=all>
-    - Local OpenLayers example: <http://localhost:7001/lines.html>
+    - Direct MapServer request: <http://localhost:9090/?map=/etc/mapserver/lines.map&mode=map&layer=roads>
+    - Inbuilt OpenLayers viewer: <http://localhost:9090/lines/?template=openlayers&mode=browse&layers=all>
+    - Local OpenLayers example: <http://localhost:9091/lines.html>
 
 !!! tip
 
diff --git a/workshop/content/docs/mapfile/points.md b/workshop/content/docs/mapfile/points.md
index d0e4058..90694da 100644
--- a/workshop/content/docs/mapfile/points.md
+++ b/workshop/content/docs/mapfile/points.md
@@ -50,7 +50,7 @@ We then reference this file in the Mapfile and use any of the font aliases for s
 In the example below we're using a
 cinema character from Google's [Material Symbols](https://fonts.google.com/icons).
 We specify the symbol using its HTML entity code in the [CHARACTER](https://mapserver.org/mapfile/symbol.html#mapfile-symbol-character) keyword.
-A list of these codes and their associated symbols is available at [http://localhost:7001/fonts.html](http://localhost:7001/fonts.html).
+A list of these codes and their associated symbols is available at [http://localhost:9091/fonts.html](http://localhost:9091/fonts.html).
 
 ```scala
 FONTSET "data/fonts/fontset.txt"
@@ -66,9 +66,9 @@ END
 
 !!! example
 
-    - Direct MapServer request: <http://localhost:7000/?map=/etc/mapserver/points.map&mode=map&layer=pois>
-    - Inbuilt OpenLayers viewer: <http://localhost:7000/points/?template=openlayers&mode=browse&layers=all>
-    - Local OpenLayers example: <http://localhost:7001/points.html>
+    - Direct MapServer request: <http://localhost:9090/?map=/etc/mapserver/points.map&mode=map&layer=pois>
+    - Inbuilt OpenLayers viewer: <http://localhost:9090/points/?template=openlayers&mode=browse&layers=all>
+    - Local OpenLayers example: <http://localhost:9091/points.html>
 
 ??? JavaScript "points.js"
 
@@ -86,7 +86,7 @@ END
 
 1. Edit the `workshop/exercises/app/js/points.js` to show the OpenStreetMap base layer. You need to set the `visible: false` to `visible: true`.
 2. Change the default `CLASS` to use larger points and a more visible colour.
-3. Add another `CLASS` to display another point type. Choose an appropriate symbol from the list at <http://localhost:7001/fonts.html>. Some example attribute types include `fast_food`, `monument`, and `post_box`. The source dataset is `workshop/exercises/mapfiles/data/osm/pois.fgb` - this can be opened in QGIS to view all available attributes and values. 
+3. Add another `CLASS` to display another point type. Choose an appropriate symbol from the list at <http://localhost:9091/fonts.html>. Some example attribute types include `fast_food`, `monument`, and `post_box`. The source dataset is `workshop/exercises/mapfiles/data/osm/pois.fgb` - this can be opened in QGIS to view all available attributes and values. 
 
 <!--
 
diff --git a/workshop/content/docs/mapfile/polygons.md b/workshop/content/docs/mapfile/polygons.md
index 2df155a..7c6a6d5 100644
--- a/workshop/content/docs/mapfile/polygons.md
+++ b/workshop/content/docs/mapfile/polygons.md
@@ -50,9 +50,9 @@ CLASS
 
 !!! example
 
-    - Direct MapServer request: <http://localhost:7000/?map=/etc/mapserver/polygons.map&mode=map&layer=buildings>
-    - Inbuilt OpenLayers viewer: <http://localhost:7000/polygons/?template=openlayers&mode=browse&layers=all>
-    - Local OpenLayers example: <http://localhost:7001/polygons.html>
+    - Direct MapServer request: <http://localhost:9090/?map=/etc/mapserver/polygons.map&mode=map&layer=buildings>
+    - Inbuilt OpenLayers viewer: <http://localhost:9090/polygons/?template=openlayers&mode=browse&layers=all>
+    - Local OpenLayers example: <http://localhost:9091/polygons.html>
 
 !!! tip
 
diff --git a/workshop/content/docs/outputs/ogcapi-features-query.md b/workshop/content/docs/outputs/ogcapi-features-query.md
index 58a7133..3c93210 100644
--- a/workshop/content/docs/outputs/ogcapi-features-query.md
+++ b/workshop/content/docs/outputs/ogcapi-features-query.md
@@ -8,8 +8,8 @@ In this tutorial, you'll learn how filtering is supported in MapServer and how t
   <iframe src="https://mapserver.github.io/getting-started-with-mapserver-demo/timisoara.html"></iframe>
 </div>
 
-Let's take a look at the [Timișoara OGC API Landing Page](http://localhost:7000/TIMISOARA/ogcapi/?f=html). 
-This contains a link to a page listing all the supported [Conformance Classes](http://localhost:7000/TIMISOARA/ogcapi/conformance?f=html).
+Let's take a look at the [Timișoara OGC API Landing Page](http://localhost:9090/TIMISOARA/ogcapi/?f=html). 
+This contains a link to a page listing all the supported [Conformance Classes](http://localhost:9090/TIMISOARA/ogcapi/conformance?f=html).
 
 The three we are interested in for this tutorial are:
 
@@ -24,7 +24,7 @@ The three we are interested in for this tutorial are:
 
 We can see which attributes in the **buildings** layer are filterable by opening the queryables endpoint:
 
-<http://localhost:7000/TIMISOARA/ogcapi/collections/buildings/queryables?f=html>
+<http://localhost:9090/TIMISOARA/ogcapi/collections/buildings/queryables?f=html>
 
 This list is controlled in MapServer by the `oga_queryable_items` keyword in the layer `METADATA` block. 
 In this example we use the special value `all`, which exposes all layer attributes as queryables
@@ -52,7 +52,7 @@ use a comma-separated list.
 The default MapServer Bootstrap templates then expose these queryables as simple filter inputs in the HTML interface. 
 You can try this directly on the items page:
 
-<http://localhost:7000/TIMISOARA/ogcapi/collections/buildings/items?f=html>
+<http://localhost:9090/TIMISOARA/ogcapi/collections/buildings/items?f=html>
 
 ![Filter interface](../assets/images/filters.png)
 
@@ -66,7 +66,7 @@ making it easier for software to generate, validate, and manipulate programmatic
 
 When you use the Bootstrap template above and apply a filter, you will see the query in the URL, for example:
 
-<http://localhost:7000/TIMISOARA/ogcapi/collections/buildings/items?f=html&filter=building+LIKE+%27%25hospital%25%27&filter-lang=cql2-text>
+<http://localhost:9090/TIMISOARA/ogcapi/collections/buildings/items?f=html&filter=building+LIKE+%27%25hospital%25%27&filter-lang=cql2-text>
 
 The `filter-lang=cql2-text` parameter indicates that the filter is written in CQL2-text.
 The filter itself is URL-encoded (for example spaces become `+` and special characters are percent-encoded),
@@ -88,7 +88,7 @@ Both expressions mean the same thing: return features where the `building` attri
 
 The JSON filter looks as follows as an encoded-URL:
 
-<http://localhost:7000/TIMISOARA/ogcapi/collections/buildings/items?f=json&filter=%7B%22op%22%3A%22like%22%2C%22args%22%3A%5B%7B%22property%22%3A%22building%22%7D%2C%22%25hospital%25%22%5D%7D&filter-lang=cql2-json>
+<http://localhost:9090/TIMISOARA/ogcapi/collections/buildings/items?f=json&filter=%7B%22op%22%3A%22like%22%2C%22args%22%3A%5B%7B%22property%22%3A%22building%22%7D%2C%22%25hospital%25%22%5D%7D&filter-lang=cql2-json>
 
 If you open this in a browser, you will see a list of matching features. These are returned in JSON because we supplied the `f=json` parameter.
 We also have to add the `&filter-lang=cql2-json` parameter, as by default MapServer assumes `cql2-text`.
@@ -97,12 +97,12 @@ In addition to CQL2 filters, MapServer also supports simple query parameter filt
 For example, `&building=hospital` is a shorthand for an equality-style filter on the building attribute.
 This is convenient for quick lookups but lacks the expressiveness of full CQL2.
 
-<http://localhost:7000/TIMISOARA/ogcapi/collections/buildings/items?f=json&building=hospital>
+<http://localhost:9090/TIMISOARA/ogcapi/collections/buildings/items?f=json&building=hospital>
 
 ## Custom Application with Filtering
 
 MapServer's filtering support allows us to quickly build powerful applications, using
-simple API calls. <http://localhost:7001/timisoara.html> links to a custom OpenLayers application,
+simple API calls. <http://localhost:9091/timisoara.html> links to a custom OpenLayers application,
 using the OGC filtering API to filter buildings by type, and highlight them on a map.
 
 The key parts of the code relating to filtering are building the filter string (as `cql2-text`):
@@ -143,8 +143,8 @@ The options for the drop-down list are defined in the `./workshop/exercises/app/
 
 !!! example
 
-    - MapServer OGC API Features request: <http://localhost:7000/timisoara/ogcapi/collections/buildings/items?f=html>
-    - Local OpenLayers example: <http://localhost:7001/timisoara.html>
+    - MapServer OGC API Features request: <http://localhost:9090/timisoara/ogcapi/collections/buildings/items?f=html>
+    - Local OpenLayers example: <http://localhost:9091/timisoara.html>
 
 ??? JavaScript "timisoara.js"
 
@@ -162,10 +162,10 @@ The options for the drop-down list are defined in the `./workshop/exercises/app/
 
 - Update the `oga_queryable_items` metadata keyword to only include the "building" and "name" fields.
   Check that the list of queryables is updated at:
-  <http://localhost:7000/TIMISOARA/ogcapi/collections/buildings/queryables?f=html>,
+  <http://localhost:9090/TIMISOARA/ogcapi/collections/buildings/queryables?f=html>,
   and also in the Bootstrap page:
-  <http://localhost:7000/TIMISOARA/ogcapi/collections/buildings/items?f=html>.
+  <http://localhost:9090/TIMISOARA/ogcapi/collections/buildings/items?f=html>.
 
 - Add a new building type to the dropdown in `./workshop/exercises/app/timisoara.html`.
   You can find additional types by inspecting the
-  [buildings items page](http://localhost:7000/TIMISOARA/ogcapi/collections/buildings/items?f=html).
+  [buildings items page](http://localhost:9090/TIMISOARA/ogcapi/collections/buildings/items?f=html).
diff --git a/workshop/content/docs/outputs/ogcapi-features.md b/workshop/content/docs/outputs/ogcapi-features.md
index 47578ea..4c96fa4 100644
--- a/workshop/content/docs/outputs/ogcapi-features.md
+++ b/workshop/content/docs/outputs/ogcapi-features.md
@@ -77,9 +77,9 @@ The OGC API - Features can be viewed as HTML pages, which are rendered using tem
 
 The services use hierarchical URLs for example:
 
-* The root of the service is at <http://localhost:7000/ogcapi-features/ogcapi/>
-* The feature collections are listed at <http://localhost:7000/ogcapi-features/ogcapi/collections?f=html>
-* The Polygon feature collection is available at <http://localhost:7000/ogcapi-features/ogcapi/collections/pois_polygon?f=html>
+* The root of the service is at <http://localhost:9090/ogcapi-features/ogcapi/>
+* The feature collections are listed at <http://localhost:9090/ogcapi-features/ogcapi/collections?f=html>
+* The Polygon feature collection is available at <http://localhost:9090/ogcapi-features/ogcapi/collections/pois_polygon?f=html>
 
 ## Adding OGC API - Features to OpenLayers
 
@@ -102,9 +102,9 @@ new VectorLayer({
 
 !!! example
 
-    - Direct MapServer request: <http://localhost:7000/ogcapi-features/ogcapi/>
-    - Direct MapServer request: <http://localhost:7000/ogcapi-features/ogcapi/collections/pois/items?f=html>
-    - Local OpenLayers example: <http://localhost:7001/ogcapi-features.html>
+    - Direct MapServer request: <http://localhost:9090/ogcapi-features/ogcapi/>
+    - Direct MapServer request: <http://localhost:9090/ogcapi-features/ogcapi/collections/pois/items?f=html>
+    - Local OpenLayers example: <http://localhost:9091/ogcapi-features.html>
 
 ??? JavaScript "ogcapi-features.js"
 
@@ -136,7 +136,7 @@ new VectorLayer({
         You need to add `TEMPLATE "void"` to each of the layers you want to make available through the OGC API - Features. 
         [TEMPLATE](https://mapserver.org/mapfile/layer.html#mapfile-layer-template) is a left-over from when HTML templates were used to return features, and allows the layer to be queried. 
 
-    Once setup correctly you should be able to browse the OGC API - Features at <http://localhost:7000/railways/ogcapi/>.
+    Once setup correctly you should be able to browse the OGC API - Features at <http://localhost:9090/railways/ogcapi/>.
 
 ## Possible Errors
 
diff --git a/workshop/content/docs/outputs/tiles.md b/workshop/content/docs/outputs/tiles.md
index 667e2d7..70db617 100644
--- a/workshop/content/docs/outputs/tiles.md
+++ b/workshop/content/docs/outputs/tiles.md
@@ -45,8 +45,8 @@ new TileLayer({
 
 !!! example
 
-    -  MapServer request: <http://localhost:7000/?map=/etc/mapserver/tiles.map&MODE=tile&TILE=0+0+0&LAYERS=countries&TILEMODE=gmap>
-    - Local OpenLayers example: <http://localhost:7001/tiles.html>
+    -  MapServer request: <http://localhost:9090/?map=/etc/mapserver/tiles.map&MODE=tile&TILE=0+0+0&LAYERS=countries&TILEMODE=gmap>
+    - Local OpenLayers example: <http://localhost:9091/tiles.html>
 
 ??? JavaScript "tiles.js"
 
diff --git a/workshop/content/docs/outputs/vector-tiles.md b/workshop/content/docs/outputs/vector-tiles.md
index 994f8cb..b7c9edb 100644
--- a/workshop/content/docs/outputs/vector-tiles.md
+++ b/workshop/content/docs/outputs/vector-tiles.md
@@ -49,7 +49,7 @@ new VectorTileLayer({
 
 !!! example
 
-    - Local OpenLayers example: <http://localhost:7001/vector-tiles.html>
+    - Local OpenLayers example: <http://localhost:9091/vector-tiles.html>
 
 ??? JavaScript "vector-tiles.js"
 
diff --git a/workshop/content/docs/outputs/wcs.md b/workshop/content/docs/outputs/wcs.md
index 988d467..e30fe40 100644
--- a/workshop/content/docs/outputs/wcs.md
+++ b/workshop/content/docs/outputs/wcs.md
@@ -14,9 +14,9 @@ Cloud-Optimized GeoTIFF (COG) from the Estonian Land Board as the source dataset
 
 Some sample MapServer requests for testing the WCS service are listed below. You can test these in your browser.
 
-- [GetCapabilities](http://localhost:7000/?map=/etc/mapserver/wcs.map&SERVICE=WCS&REQUEST=GetCapabilities&VERSION=2.0.1)
-- [DescribeCoverage 2.0](http://localhost:7000/?map=/etc/mapserver/wcs.map&SERVICE=WCS&VERSION=2.0.1&REQUEST=DescribeCoverage&COVERAGEID=dtm)
-- [GetCoverage 2.0 image/tiff full](http://localhost:7000/?map=/etc/mapserver/wcs.map&SERVICE=WCS&VERSION=2.0.1&REQUEST=GetCoverage&COVERAGEID=dtm&FORMAT=image/tiff)
+- [GetCapabilities](http://localhost:9090/?map=/etc/mapserver/wcs.map&SERVICE=WCS&REQUEST=GetCapabilities&VERSION=2.0.1)
+- [DescribeCoverage 2.0](http://localhost:9090/?map=/etc/mapserver/wcs.map&SERVICE=WCS&VERSION=2.0.1&REQUEST=DescribeCoverage&COVERAGEID=dtm)
+- [GetCoverage 2.0 image/tiff full](http://localhost:9090/?map=/etc/mapserver/wcs.map&SERVICE=WCS&VERSION=2.0.1&REQUEST=GetCoverage&COVERAGEID=dtm&FORMAT=image/tiff)
 
 You can also connect to the MapServer Docker container and use `mapserv` to test the requests from the command line.
 
@@ -77,7 +77,6 @@ WEB
         "wcs_srs" "EPSG:4326 EPSG:3857"
         "wcs_title" "Example WCS Mapfile"
         "wcs_description" "Test description"
-        "wcs_onlineresource" "http://localhost:7000/"
     END
 END
 ```
diff --git a/workshop/content/docs/outputs/wms.md b/workshop/content/docs/outputs/wms.md
index 7c4e54b..9fbd383 100644
--- a/workshop/content/docs/outputs/wms.md
+++ b/workshop/content/docs/outputs/wms.md
@@ -49,7 +49,7 @@ More details are in [the documentation](https://www.mapserver.org/ogc/wms_server
 
 A sample request for the legend for the `polygons.map` is as follows:
 
-- <http://localhost:7000/?map=/etc/mapserver/polygons.map&service=wms&version=1.3.0&request=GetLegendGraphic&layer=buildings&format=image/png&SLD_VERSION=1.1.0>
+- <http://localhost:9090/?map=/etc/mapserver/polygons.map&service=wms&version=1.3.0&request=GetLegendGraphic&layer=buildings&format=image/png&SLD_VERSION=1.1.0>
 
 !!! tip
 
@@ -63,8 +63,8 @@ A sample request for the legend for the `polygons.map` is as follows:
 
 ## Exercises
 
-1. If you've read this far you deserve to discover one of MapServer's Easter eggs. Try changing the output format to `&format=image/txt`. We'll use the `polygons.map` for the request: <http://localhost:7000/?map=/etc/mapserver/polygons.map&service=wms&version=1.3.0&request=GetMap&layers=buildings&format=image/txt>
+1. If you've read this far you deserve to discover one of MapServer's Easter eggs. Try changing the output format to `&format=image/txt`. We'll use the `polygons.map` for the request: <http://localhost:9090/?map=/etc/mapserver/polygons.map&service=wms&version=1.3.0&request=GetMap&layers=buildings&format=image/txt>
 2. Create a `GetLegendGraphic` request, but for the `points.map` for the `layer=poi`.
-3. Run a [GetCapabilities](http://localhost:7000/?map=/etc/mapserver/polygons.map&service=wms&version=1.3.0&request=GetCapabilities) request for the `polygons.map`. 
+3. Run a [GetCapabilities](http://localhost:9090/?map=/etc/mapserver/polygons.map&service=wms&version=1.3.0&request=GetCapabilities) request for the `polygons.map`. 
    Add various `METADATA` pairs listed in the [Web Object Metadata](https://mapserver.org/ogc/wms_server.html#web-object-metadata) and check its output
    in the `GetCapabilities` response.
diff --git a/workshop/content/docs/setup.md b/workshop/content/docs/setup.md
index 6d03549..e59b5f1 100644
--- a/workshop/content/docs/setup.md
+++ b/workshop/content/docs/setup.md
@@ -106,8 +106,8 @@ cd /home/getting-started-with-mapserver/workshop/exercises/
 sudo docker compose up
 
 # Test the following URLs in a browser
-# http://localhost:7000
-# http://localhost:7001/lines.html
+# http://localhost:9090
+# http://localhost:9091/lines.html
 ```
 
 ### Testing the Docker installation
@@ -147,10 +147,10 @@ docker compose down
 ```
 
 Once the containers are downloaded you can test they are running and you can connect to them. Open a web browser
-and navigate to <http://localhost:7000/>, and you should see the "MapServer Homepage" which means MapServer
+and navigate to <http://localhost:9090/>, and you should see the "MapServer Homepage" which means MapServer
 is running correctly.
 
-Next we will check that the front-end container is running by opening <http://localhost:7001/points.html>.
+Next we will check that the front-end container is running by opening <http://localhost:9091/points.html>.
 Hopefully you'll see a map, and we're ready to start the workshop.
 
 ## Possible Errors
diff --git a/workshop/exercises/README.md b/workshop/exercises/README.md
index 8dd1563..4696a54 100644
--- a/workshop/exercises/README.md
+++ b/workshop/exercises/README.md
@@ -12,8 +12,8 @@ cd D:\GitHub\getting-started-with-mapserver\workshop\exercises
 docker compose up -d
 ```
 
-This will start a Docker container with MapServer (reachable from the browser at <http://localhost:7000/>), and
-a Docker container with an OpenLayers development environment (reachable from the browser at <http://localhost:7001/>).
+This will start a Docker container with MapServer (reachable from the browser at <http://localhost:9090/>), and
+a Docker container with an OpenLayers development environment (reachable from the browser at <http://localhost:9091/>).
 
 To stop, use the command:
 
diff --git a/workshop/exercises/app/vite.config.js b/workshop/exercises/app/vite.config.js
index 31c480c..c645147 100644
--- a/workshop/exercises/app/vite.config.js
+++ b/workshop/exercises/app/vite.config.js
@@ -13,8 +13,8 @@ export default {
     base: '', // otherwise assets are located at /assets
     server: {
         host: true, // allow connections from other Docker containers
-        allowedHosts: ['node', 'mapserver.github.io'], // allow access using http://node:7001 from the mapserver container
-        port: 7001,
+        allowedHosts: ['node', 'mapserver.github.io'], // allow access using http://node:9091 from the mapserver container
+        port: 9091,
         watch: {
             // fix for Windows on WSL - https://github.com/vitejs/vite/issues/1153
             usePolling: true
diff --git a/workshop/exercises/docker-compose.yml b/workshop/exercises/docker-compose.yml
index 6f442c2..d3c2f52 100644
--- a/workshop/exercises/docker-compose.yml
+++ b/workshop/exercises/docker-compose.yml
@@ -32,7 +32,7 @@ services:
     image: geographika/mapserver-workshop:latest
     container_name: mapserver
     ports:
-      - 7000:8080
+      - 9090:8080
     environment:
       MAPSERVER_CONFIG_FILE: "/etc/mapserver/mapserver.conf"
     volumes:
@@ -45,7 +45,7 @@ services:
     image: node:lts-slim
     container_name: node
     ports:
-      - 7001:7001
+      - 9091:9091
     working_dir: /home/node/app
     volumes:
       - ./app:/home/node/app:z
diff --git a/workshop/exercises/docker-db-compose.yml b/workshop/exercises/docker-db-compose.yml
index 4930bab..2002c71 100644
--- a/workshop/exercises/docker-db-compose.yml
+++ b/workshop/exercises/docker-db-compose.yml
@@ -32,7 +32,7 @@ services:
     image: geographika/mapserver-workshop:latest
     container_name: mapserver2
     ports:
-      - 7000:8080
+      - 9090:8080
     environment:
       MAPSERVER_CONFIG_FILE: "/etc/mapserver/mapserver.conf"
     volumes:
@@ -45,7 +45,7 @@ services:
     image: node:lts-slim
     container_name: node2
     ports:
-      - 7001:7001
+      - 9091:9091
     working_dir: /home/node/app
     volumes:
       - ./app:/home/node/app:z
diff --git a/workshop/exercises/mapfiles/points.map b/workshop/exercises/mapfiles/points.map
index fb7345f..0db0cae 100644
--- a/workshop/exercises/mapfiles/points.map
+++ b/workshop/exercises/mapfiles/points.map
@@ -11,7 +11,6 @@ MAP
         METADATA
             "wms_enable_request" "*"
             "wms_srs" "EPSG:4326 EPSG:3857"
-            "wms_onlineresource" "http://localhost:7000/?map=/etc/mapserver/points.map&"
         END
     END
     SYMBOL
diff --git a/workshop/exercises/mapfiles/wcs.map b/workshop/exercises/mapfiles/wcs.map
index a01d1b7..ba26a9f 100644
--- a/workshop/exercises/mapfiles/wcs.map
+++ b/workshop/exercises/mapfiles/wcs.map
@@ -20,7 +20,6 @@ MAP
             "wcs_srs" "EPSG:4326 EPSG:3857"
             "wcs_title" "Example WCS Mapfile"
             "wcs_description" "Test description"
-            "wcs_onlineresource" "http://localhost:7000/"
         END
     END
     LAYER