diff --git a/internal/controller/shared_controller.go b/internal/controller/shared_controller.go
index 643488a..7f14be8 100644
--- a/internal/controller/shared_controller.go
+++ b/internal/controller/shared_controller.go
@@ -524,18 +524,30 @@ func makeUptimeName[O pdoknlv3.WMSWFS](obj O) (string, error) {
 
 	datasetID, ok := obj.GetLabels()["dataset"]
 	if !ok {
-		return "", errors.New("dataset label not found in object")
+		// V3 label
+		datasetID, ok = obj.GetLabels()["pdok.nl/dataset-id"]
+		if !ok {
+			return "", errors.New("dataset label not found in object")
+		}
 	}
 	parts = append(parts, strings.ReplaceAll(datasetID, "-", ""))
 
 	theme, ok := obj.GetLabels()["theme"]
+	if !ok {
+		// V3 label
+		theme, ok = obj.GetLabels()["pdok.nl/tag"]
+	}
+
 	if ok {
 		parts = append(parts, strings.ReplaceAll(theme, "-", ""))
 	}
 
 	version, ok := obj.GetLabels()["service-version"]
 	if !ok {
-		return "", errors.New("service-version label not found in object")
+		version, ok = obj.GetLabels()["pdok.nl/service-version"]
+		if !ok {
+			return "", errors.New("service-version label not found in object")
+		}
 	}
 	parts = append(parts, version)