diff --git a/data-model/developer-schema/machine-annotation-service/0.3.0/schema/machine-annotation-service-request.json b/data-model/developer-schema/machine-annotation-service/0.3.0/schema/machine-annotation-service-request.json
index 21056e8..7db106e 100644
--- a/data-model/developer-schema/machine-annotation-service/0.3.0/schema/machine-annotation-service-request.json
+++ b/data-model/developer-schema/machine-annotation-service/0.3.0/schema/machine-annotation-service-request.json
@@ -158,13 +158,13 @@
       "type": "array",
       "description": "Environmental variables to supply to the MAS, non-sensitive",
       "items": {
-        "$ref": "https://schemas.dissco.tech/schemas/developer-schema/machine-annotation-service/0.3.0/machine-annotation-service-environment.json"
+        "$ref": "https://schemas.dissco.tech/schemas/fdo-type/machine-annotation-service/0.3.0/machine-annotation-service-environment.json"
       }
     },
     "ods:hasSecret": {
       "type": "array",
       "items": {
-        "$ref": "https://schemas.dissco.tech/schemas/developer-schema/machine-annotation-service/0.3.0/machine-annotation-service-secret.json"
+        "$ref": "https://schemas.dissco.tech/schemas/fdo-type/machine-annotation-service/0.3.0/machine-annotation-service-secret.json"
       }
     }
   },
diff --git a/data-model/fdo-type/machine-annotation-service/0.3.0/schema/machine-annotation-service-environment.json b/data-model/fdo-type/machine-annotation-service/0.3.0/schema/machine-annotation-service-environment.json
index bcf543c..8df6fda 100644
--- a/data-model/fdo-type/machine-annotation-service/0.3.0/schema/machine-annotation-service-environment.json
+++ b/data-model/fdo-type/machine-annotation-service/0.3.0/schema/machine-annotation-service-environment.json
@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.dissco.tech/schemas/developer-schema/machine-annotation-service/0.3.0/machine-annotation-service-environment.json",
+  "$id": "https://schemas.dissco.tech/schemas/fdo-type/machine-annotation-service/0.3.0/machine-annotation-service-environment.json",
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$comment": "Machine Annotation Service Environment Version 0.3.0",
   "title": "MachineAnnotationServiceEnvironment",
diff --git a/data-model/fdo-type/machine-annotation-service/0.3.0/schema/machine-annotation-service-secret.json b/data-model/fdo-type/machine-annotation-service/0.3.0/schema/machine-annotation-service-secret.json
index 9e237a9..67ab27d 100644
--- a/data-model/fdo-type/machine-annotation-service/0.3.0/schema/machine-annotation-service-secret.json
+++ b/data-model/fdo-type/machine-annotation-service/0.3.0/schema/machine-annotation-service-secret.json
@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.dissco.tech/schemas/developer-schema/machine-annotation-service/0.3.0/machine-annotation-service-secret.json",
+  "$id": "https://schemas.dissco.tech/schemas/fdo-type/machine-annotation-service/0.3.0/machine-annotation-service-secret.json",
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$comment": "Machine Annotation Service Environment Version 0.3.0",
   "title": "MachineAnnotationServiceSecret",
diff --git a/data-model/fdo-type/machine-annotation-service/0.3.0/schema/machine-annotation-service.json b/data-model/fdo-type/machine-annotation-service/0.3.0/schema/machine-annotation-service.json
index 6ea7b59..5324e88 100644
--- a/data-model/fdo-type/machine-annotation-service/0.3.0/schema/machine-annotation-service.json
+++ b/data-model/fdo-type/machine-annotation-service/0.3.0/schema/machine-annotation-service.json
@@ -221,13 +221,13 @@
       "type": "array",
       "description": "Environmental variables to supply to the MAS, non-sensitive",
       "items": {
-        "$ref": "https://schemas.dissco.tech/schemas/developer-schema/machine-annotation-service/0.3.0/machine-annotation-service-environment.json"
+        "$ref": "https://schemas.dissco.tech/schemas/fdo-type/machine-annotation-service/0.3.0/machine-annotation-service-environment.json"
       }
     },
     "ods:hasSecret": {
       "type": "array",
       "items": {
-        "$ref": "https://schemas.dissco.tech/schemas/developer-schema/machine-annotation-service/0.3.0/machine-annotation-service-secret.json"
+        "$ref": "https://schemas.dissco.tech/schemas/fdo-type/machine-annotation-service/0.3.0/machine-annotation-service-secret.json"
       }
     }
   },