diff --git a/workshop/content/docs/advanced/bridges.md b/workshop/content/docs/advanced/bridges.md
index bcf4c340..79664d66 100644
--- a/workshop/content/docs/advanced/bridges.md
+++ b/workshop/content/docs/advanced/bridges.md
@@ -192,7 +192,7 @@ The [OGC SensorThings API standard](https://ogcapi-workshop.ogc.org/api-deep-div
 
 The pygeoapi SensorThings bridge enables to proxy the SensorThings entities (e.g.:  `Thing` , `Sensor`, `DataStream`, `ObservedProperty` ) into feature collections.
 
-In this section we'll have a look at how to Publish a SensorThings API `Thing` as an OGC API - Features collection, which can then be consumed by various clients, like [the ones listed here](../../publishing/ogcapi-features/#client-access)
+In this section we'll have a look at how to Publish a SensorThings API `Thing` as an OGC API - Features collection, which can then be consumed by various clients, like [the ones listed here](../publishing/ogcapi-features.md#client-access)
 
 !!! question "Update the pygeoapi configuration"
 
diff --git a/workshop/content/docs/advanced/semantic-web-linked-data.md b/workshop/content/docs/advanced/semantic-web-linked-data.md
index cc35dc6d..b8ee0a84 100644
--- a/workshop/content/docs/advanced/semantic-web-linked-data.md
+++ b/workshop/content/docs/advanced/semantic-web-linked-data.md
@@ -21,7 +21,7 @@ pygeoapi supports this use case via embedding a `schema.org` JSON-LD snippet in
 
 !!! tip
 
-    See more information at [Search Engine Optimization](../seo)
+    See more information at [Search Engine Optimization](./seo.md)
 
 ## Publish spatial data in the Semantic Web
 
diff --git a/workshop/content/docs/publishing/first.md b/workshop/content/docs/publishing/first.md
index 0417c1b5..f73f04bf 100644
--- a/workshop/content/docs/publishing/first.md
+++ b/workshop/content/docs/publishing/first.md
@@ -6,8 +6,8 @@ title: Exercise 1 - Your first dataset
 
 In this section you are going to publish a vector dataset.
 
-For this exercise, we will use a CSV dataset of [Points of interest in Kosovo](https://github.com/geopython/diving-into-pygeoapi/blob/main/workshop/exercises/data/osm_poi_kosovo.csv),
-kindly provided by [Open Street Map Community and GeoFabrik](https://download.geofabrik.de/europe/kosovo.html).
+For this exercise, we will use a CSV dataset of [Bathing waters in Estonia](https://github.com/geopython/diving-into-pygeoapi/tree/main/workshop/exercises/data/bathingwater-estonia.csv),
+kindly provided by [Estonian Health Board](https://terviseamet.ee).
 
 You can find this dataset in `workshop/exercises/data/osm_poi_kosovo.csv`.
 
diff --git a/workshop/content/docs/publishing/ogcapi-features.md b/workshop/content/docs/publishing/ogcapi-features.md
index 3103b0ac..b57efce9 100644
--- a/workshop/content/docs/publishing/ogcapi-features.md
+++ b/workshop/content/docs/publishing/ogcapi-features.md
@@ -157,7 +157,7 @@ And the feature items here:
 
 ## pygeoapi as a WFS proxy
 
-You can check the "pygeoapi as a Bridge to Other Services" section to learn how to [publish WFS as OGC API - Features](../../advanced/bridges/#publishing-wfs-as-ogc-api-features).
+You can check the "pygeoapi as a Bridge to Other Services" section to learn how to [publish WFS as OGC API - Features](../advanced/bridges.md#publishing-wfs-as-ogc-api-features).
 
 ## Client access
 
diff --git a/workshop/content/docs/publishing/ogcapi-maps.md b/workshop/content/docs/publishing/ogcapi-maps.md
index 2f840368..2f11bf2d 100644
--- a/workshop/content/docs/publishing/ogcapi-maps.md
+++ b/workshop/content/docs/publishing/ogcapi-maps.md
@@ -63,7 +63,7 @@ In this section we'll be exposing a Geopackage file available at `workshop/exerc
 
 ## pygeoapi as a WMS proxy
 
-You can check the "pygeoapi as a Bridge to Other Services" section to learn how to [publish WMS as OGC API - Maps](../../advanced/bridges/#publishing-wms-as-ogc-api-maps).
+You can check the "pygeoapi as a Bridge to Other Services" section to learn how to [publish WMS as OGC API - Maps](../advanced/bridges.md#publishing-wms-as-ogc-api-maps).
 
 ## Client access
 
diff --git a/workshop/content/docs/publishing/ogcapi-records.md b/workshop/content/docs/publishing/ogcapi-records.md
index 4346623a..d1b0e5a3 100644
--- a/workshop/content/docs/publishing/ogcapi-records.md
+++ b/workshop/content/docs/publishing/ogcapi-records.md
@@ -140,7 +140,7 @@ to the collection.
 
 ## pygeoapi as a CSW proxy
 
-You can check the "pygeoapi as a Bridge to Other Services" section to learn how to [publish CSW as OGC API - Records](../../advanced/bridges/#publishing-csw-as-ogc-api-records).
+You can check the "pygeoapi as a Bridge to Other Services" section to learn how to [publish CSW as OGC API - Records](../advanced/bridges.md#publishing-csw-as-ogc-api-records).
 
 ## Client access