From 2da1497ec25a1f5a72a7965c707f053b968e5152 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Wed, 21 Jun 2023 09:26:47 +0200
Subject: [PATCH 1/2] prepare Ditto 3.3.0 release

---
 SECURITY.md                                   |   6 +-
 documentation/src/main/resources/_config.yml  |  10 +-
 .../_data/sidebars/ditto_sidebar.yml          |  27 +--
 .../2023-06-23-release-announcement-330.md    |  80 ++++++++
 .../pages/ditto/release_notes_330.md          | 177 ++++++++++++++++++
 5 files changed, 277 insertions(+), 23 deletions(-)
 create mode 100644 documentation/src/main/resources/_posts/2023-06-23-release-announcement-330.md
 create mode 100644 documentation/src/main/resources/pages/ditto/release_notes_330.md

diff --git a/SECURITY.md b/SECURITY.md
index ead6f09625..14caa8332f 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -9,9 +9,9 @@ These versions of Eclipse Ditto are currently being supported with security upda
 
 | Version | Supported          |
 |---------| ------------------ |
-| 3.2x    | :white_check_mark: |
-| 3.1.x   | :white_check_mark: |
-| < 3.1.0 | :x:                |
+| 3.3.x   | :white_check_mark: |
+| 3.2.x   | :white_check_mark: |
+| < 3.2.0 | :x:                |
 
 ## Reporting a Vulnerability
 
diff --git a/documentation/src/main/resources/_config.yml b/documentation/src/main/resources/_config.yml
index e87bf43154..8d6b64a8c0 100644
--- a/documentation/src/main/resources/_config.yml
+++ b/documentation/src/main/resources/_config.yml
@@ -114,6 +114,8 @@ plugins:
 docVersions:
   - label: "development"
     basePath: ""
+  - label: "3.3"
+    basePath: "3.3"
   - label: "3.2"
     basePath: "3.2"
   - label: "3.1"
@@ -122,11 +124,3 @@ docVersions:
     basePath: "3.0"
   - label: "2.4"
     basePath: "2.4"
-  - label: "2.3"
-    basePath: "2.3"
-  - label: "2.2"
-    basePath: "2.2"
-  - label: "2.1"
-    basePath: "2.1"
-  - label: "2.0"
-    basePath: "2.0"
diff --git a/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml b/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml
index 1a08a3122f..b0a6ddeef0 100644
--- a/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml
+++ b/documentation/src/main/resources/_data/sidebars/ditto_sidebar.yml
@@ -23,29 +23,32 @@ entries:
       - title: Release Notes
         output: web
         folderitems:
+          - title: 3.3.0
+            url: /release_notes_330.html
+            output: web
           - title: 3.2.1
             url: /release_notes_321.html
             output: web
           - title: 3.2.0
             url: /release_notes_320.html
             output: web
-          - title: 3.1.2
-            url: /release_notes_312.html
-            output: web
-          - title: 3.1.1
-            url: /release_notes_311.html
-            output: web
-          - title: 3.1.0
-            url: /release_notes_310.html
-            output: web
-          - title: 3.0.0
-            url: /release_notes_300.html
-            output: web
 
             subfolders:
               - title: Archive
                 output: web
                 subfolderitems:
+                  - title: 3.1.2
+                    url: /release_notes_312.html
+                    output: web
+                  - title: 3.1.1
+                    url: /release_notes_311.html
+                    output: web
+                  - title: 3.1.0
+                    url: /release_notes_310.html
+                    output: web
+                  - title: 3.0.0
+                    url: /release_notes_300.html
+                    output: web
                   - title: 2.4.2
                     url: /release_notes_242.html
                     output: web
diff --git a/documentation/src/main/resources/_posts/2023-06-23-release-announcement-330.md b/documentation/src/main/resources/_posts/2023-06-23-release-announcement-330.md
new file mode 100644
index 0000000000..07a6b2d9b7
--- /dev/null
+++ b/documentation/src/main/resources/_posts/2023-06-23-release-announcement-330.md
@@ -0,0 +1,80 @@
+---
+title: "Announcing Eclipse Ditto Release 3.3.0"
+published: true
+permalink: 2023-06-23-release-announcement-330.html
+layout: post
+author: thomas_jaeckle
+tags: [blog]
+hide_sidebar: true
+sidebar: false
+toc: false
+---
+
+The Eclipse Ditto teams is proud to announce the availability of Eclipse Ditto 
+[3.3.0](https://projects.eclipse.org/projects/iot.ditto/releases/3.3.0).
+
+Version 3.3.0 contains features improving **merge/PATCH** commands, **skipping modifications** of a twin if the
+value would be equal after the modification and a more production ready Ditto Helm chart.
+
+
+## Adoption
+
+Companies are willing to show their adoption of Eclipse Ditto publicly: 
+[https://iot.eclipse.org/adopters/?#iot.ditto](https://iot.eclipse.org/adopters/?#iot.ditto)
+
+When you use Eclipse Ditto it would be great to support the project by putting your logo there.  
+
+
+## Changelog
+
+The main improvements and additions of Ditto 3.3.0 are:
+
+* Support **replacing certain json objects** in a **merge/PATCH command** instead of merging their fields
+* Implicitly **convert a merge/PATCH command** to a **"Create Thing"** if thing is **not yet existing**
+* Provide option to **skip a modification** in the "twin" **if the value "is equal"** to the previous value
+* Addition of the **DevOps API endpoints** to Ditto's **OpenAPI** definition
+* Improve DittoProtocol MessagePath to be aware of message subject
+* Support alternative way of specifying **"list" query parameters**
+* UI enhancements:
+  * Enhance Ditto-UI to dynamically configure log levels of Ditto
+  * Building and packaging the UI with esbuild
+
+The following non-functional enhancements are also included:
+
+* Provide **official Eclipse Ditto Helm chart** via **Docker Hub** and move its sources to Ditto Git repository
+  * In addition, provide a lot more configuration options and hardening of the chart to make it more feasible
+    for productive use
+
+The following notable fixes are included:
+
+* Fix that redeliveries for acknowledgeable connectivity messages were issued too often
+* Fix WoT dispatcher starvation by adding timeouts to fetch models
+
+Please have a look at the [3.3.0 release notes](release_notes_330.html) for a more detailed information on the release.
+
+
+## Artifacts
+
+The new Java artifacts have been published at the [Eclipse Maven repository](https://repo.eclipse.org/content/repositories/ditto/)
+as well as [Maven central](https://repo1.maven.org/maven2/org/eclipse/ditto/).
+
+The Ditto JavaScript client release was published on [npmjs.com](https://www.npmjs.com/~eclipse_ditto):
+* [@eclipse-ditto/ditto-javascript-client-dom](https://www.npmjs.com/package/@eclipse-ditto/ditto-javascript-client-dom)
+* [@eclipse-ditto/ditto-javascript-client-node](https://www.npmjs.com/package/@eclipse-ditto/ditto-javascript-client-node)
+
+
+The Docker images have been pushed to Docker Hub:
+* [eclipse/ditto-policies](https://hub.docker.com/r/eclipse/ditto-policies/)
+* [eclipse/ditto-things](https://hub.docker.com/r/eclipse/ditto-things/)
+* [eclipse/ditto-things-search](https://hub.docker.com/r/eclipse/ditto-things-search/)
+* [eclipse/ditto-gateway](https://hub.docker.com/r/eclipse/ditto-gateway/)
+* [eclipse/ditto-connectivity](https://hub.docker.com/r/eclipse/ditto-connectivity/)
+
+The Ditto Helm chart has been published to Docker Hub:
+* [eclipse/ditto](https://hub.docker.com/r/eclipse/ditto/)
+
+<br/>
+<br/>
+{% include image.html file="ditto.svg" alt="Ditto" max-width=500 %}
+--<br/>
+The Eclipse Ditto team
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_330.md b/documentation/src/main/resources/pages/ditto/release_notes_330.md
new file mode 100644
index 0000000000..974265ede2
--- /dev/null
+++ b/documentation/src/main/resources/pages/ditto/release_notes_330.md
@@ -0,0 +1,177 @@
+---
+title: Release notes 3.3.0
+tags: [release_notes]
+published: true
+keywords: release notes, announcements, changelog
+summary: "Version 3.3.0 of Eclipse Ditto, released on 23.06.2023"
+permalink: release_notes_330.html
+---
+
+Eclipse Ditto version 3.3.0 is here, continuing on adding features while keeping APIs backwards compatible.
+
+This release is completely [IP (intellectual property) checked by the Eclipse Foundation](https://www.eclipse.org/projects/handbook/#ip)
+meaning that project code as well as all used dependencies were "[...] reviewed to ensure that the copyrights
+expressed are correct, licensing is valid and compatible, and that other issues have been uncovered and properly
+investigated."
+
+## Changelog
+
+Eclipse Ditto 3.3.0 focuses on the following areas:
+
+* Support **replacing certain json objects** in a **merge/PATCH command** instead of merging their fields
+* Implicitly **convert a merge/PATCH command** to a **"Create Thing"** if thing is **not yet existing**
+* Provide option to **skip a modification** in the "twin" **if the value "is equal"** to the previous value
+* Addition of the **DevOps API endpoints** to Ditto's **OpenAPI** definition
+* Improve DittoProtocol MessagePath to be aware of message subject
+* Support alternative way of specifying **"list" query parameters**
+* UI enhancements:
+  * Enhance Ditto-UI to dynamically configure log levels of Ditto
+  * Building and packaging the UI with esbuild
+
+The following non-functional work is also included:
+
+* Provide **official Eclipse Ditto Helm chart** via **Docker Hub** and move its sources to Ditto Git repository
+  * In addition, provide a lot more configuration options and hardening of the chart to make it more feasible
+    for productive use
+
+The following notable fixes are included:
+
+* Fix that redeliveries for acknowledgeable connectivity messages were issued too often
+* Fix WoT dispatcher starvation by adding timeouts to fetch models
+
+### New features
+
+#### [Support replacing certain json objects in a merge/PATCH command instead of merging their fields](https://github.com/eclipse-ditto/ditto/issues/1593)
+
+Previously, when updating a thing using merge commands, any encountered json object is merged with the fields of the 
+provided json object.  
+The old values are not deleted, which often is needed and expected.
+
+In this enhancement an option is provided to define that for a certain json object the existing content should be 
+completely replaced with the new object.
+
+More details can be found in the [added documentation about "Removing fields in a merge update with a regex"](httpapi-concepts.html#removing-fields-in-a-merge-update-with-a-regex).
+
+#### [Implicitly convert a merge/PATCH command to a "Create Thing" if thing is not yet existing](https://github.com/eclipse-ditto/ditto/issues/1614)
+
+This new feature creates a thing implicitly if it did not yet exist when using a merge/PATCH command trying to modify 
+it partially.
+
+#### [Provide option to skip a modification in the "twin" if the value "is equal" to the previous value](https://github.com/eclipse-ditto/ditto/issues/1524)
+
+The default behaviour until now in Ditto is for each "ModifyCommand" to apply the modification and also the twin in the 
+MongoDB.  
+
+Using a new header `if-equal: skip`, a modification of a "thing" will only be performed when its value would be changed
+as a result of that modification.  
+The default behavior (if not specified as `skip`) is: `if-equal: update` - which will update the thing for each
+modification, even if the value did not change.
+
+Using this feature, it e.g. is possible to reduce database I/O operations and also prevent events from being published
+when in fact nothing in the twin was changed.
+
+This is documented in the [HTTP API concepts - Conditional Headers](httpapi-concepts.html#conditional-headers), but is
+also usable via [Ditto Protocol headers](protocol-specification.html#headers).
+
+#### [Addition of the DevOps API endpoints to Ditto's OpenAPI definition](https://github.com/eclipse-ditto/ditto/issues/1623)
+
+Ditto's OpenAPI definition now also includes the HTTP endpoints for the 
+[DevOps commands](installation-operating.html#devops-commands).
+
+This was a contribution from [Luca Neotti](https://github.com/neottil) - many thanks for that.
+
+#### [Improve DittoProtocol MessagePath to be aware of message subject](https://github.com/eclipse-ditto/ditto/pull/1641)
+
+This was a small addition to the Java API of `MessagePath` in the ditto-protocol module which lets the user of the SDK
+access more easily the `subject` of a Ditto "Message".
+
+#### [Support alternative way of specifying "list" query parameters](https://github.com/eclipse-ditto/ditto/issues/1644)
+
+Supports an alternative syntax of specifying a list of a certain HTTP query parameter in the form:
+```
+GET /thing/my:thing-123?fields=thingId&fields=policyId&fields=attributes
+```
+
+#### Enhancements in Ditto explorer UI
+
+We again received contributions by [Thomas Fries](https://github.com/thfries),
+who contributed the Ditto explorer UI.  
+The latest live version of the UI can be found here:  
+[https://eclipse-ditto.github.io/ditto/](https://eclipse-ditto.github.io/ditto/)
+
+You can use it in order to e.g. connect to your Ditto installation to manage things, policies and even connections and 
+DevOps related commands.
+
+Contributions in this release:
+* [UI: Enhance Ditto-UI to configure log levels of Ditto](https://github.com/eclipse-ditto/ditto/issues/1590)
+* [Building and packaging the UI with esbuild](https://github.com/eclipse-ditto/ditto/pull/1630)
+
+
+### Changes
+
+#### [Provide official Eclipse Ditto Helm chart via Docker Hub and move its sources to Ditto Git repository](https://github.com/eclipse-ditto/ditto/pull/1635)
+
+The official Ditto Helm chart was migrated from being maintained at the [Eclipse IoT Packages](https://github.com/eclipse/packages)
+project to being maintained as part of the Ditto Git repository.  
+The old [Helm chart was deprecated](https://artifacthub.io/packages/helm/eclipse-iot/ditto), the new chart is now hosted 
+via [Docker Hub](https://hub.docker.com/r/eclipse/ditto).
+
+The official chart was also enhanced a lot:
+* with a lot more configuration options in order to be the basis for a productive Helm chart
+* also added quite advanced Ingress configuration
+
+
+### Bugfixes
+
+
+#### [Fix that redeliveries for acknowledgeable connectivity messages were issued too often](https://github.com/eclipse-ditto/ditto/pull/1657)
+
+Messages processed via a Ditto connection which required QoS 1 ("at least once") were ask for being redelivered too often
+and too early.  
+The existing logic which took the status code in account in order to ask for a redelivery was never executed.  
+As a result, e.g. a command resulting in status code `400` (bad request) would have been redelivered over and over again
+without the chance of ever being successful.
+
+This was fixed.
+
+#### [Fix WoT dispatcher starvation by adding timeouts to fetch models](https://github.com/eclipse-ditto/ditto/pull/1658)
+
+When fetching WoT TMs there was no timeout defined and potentially a thread could be blocked forever.
+
+This was fixed.
+
+
+#### Enhancements in Ditto Clients
+
+None in this release.
+
+### Changes
+
+None in this release
+
+### Bugfixes
+
+None in this release
+
+## Migration notes
+
+There are no migration steps required when updating from Ditto 3.2.x to Ditto 3.3.0.  
+When updating from Ditto 2.x version to 3.3.0, the migration notes of 
+[Ditto 3.0.0](release_notes_300.html#migration-notes) and [Ditto 3.1.0](release_notes_310.html#migration-notes)
+and [Ditto 3.2.0](release_notes_320.html#migration-notes) apply.
+
+
+## Roadmap
+
+Looking forward, the (current) ideas for Ditto 3.4.0 are:
+
+* Enforcing linked WoT ThingModels in Things/Features by validating JsonSchema of model elements
+  * Ensuring that a Ditto Thing is ensured to always follow its WoT ThingModel and also message payloads are always 
+    provided in the specified format
+* Search in history of a thing using an RQL filter
+* Perform a benchmark of Ditto and provide a "tuning" chapter in the documentation as a reference to the commonly 
+  asked questions 
+  * how many Things Ditto can manage
+  * how many updates/second can be done
+  * whether Ditto can scale horizontally
+  * how many resources (e.g. machines) are required at which scale

From d4c9cbbe88ab1ad03e076878932d4a774410dbf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= <thomas.jaeckle@beyonnex.io>
Date: Wed, 21 Jun 2023 10:11:14 +0200
Subject: [PATCH 2/2] adjusted Eclipse Ditto domain to eclipse.dev/ditto
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 NOTICE.md                                     |   2 +-
 README.md                                     |   6 +-
 RELEASE.md                                    |   4 +-
 .../AcknowledgementLabelInvalidException.java |   4 +-
 .../NamespacedEntityIdInvalidException.java   |   2 +-
 .../resources/javascript/incoming-mapping.js  |   2 +-
 deployment/docker/README.md                   |   2 +-
 deployment/docker/sandbox/html/index.html     |   2 +-
 deployment/helm/ditto/Chart.yaml              |   4 +-
 deployment/helm/ditto/README.md               |   2 +-
 .../helm/ditto/ci/ci-workflow-values.yaml     |  10 +-
 deployment/helm/ditto/local-values.yaml       |  10 +-
 deployment/helm/ditto/values.yaml             |  28 +--
 deployment/kubernetes/README.md               |   2 +-
 deployment/openshift/nginx/index.html         |   2 +-
 documentation/README.md                       |   2 +-
 .../src/main/resources/_includes/head.html    |   4 +-
 ...example-demonstrating-rest-to-websocket.md |   4 +-
 .../2018-10-16-example-mqtt-bidirectional.md  |   2 +-
 .../2021-03-22-azure-iot-hub-integration.md   |   6 +-
 .../src/main/resources/jsonschema/policy.json |   2 +-
 .../protocol-search-subscribe-payload.json    |   4 +-
 .../main/resources/jsonschema/thing_v2.json   |   4 +-
 .../main/resources/openapi/ditto-api-2.yml    | 170 +++++++++---------
 .../parameters/importedPolicyIdPathParam.yml  |   2 +-
 .../sources/parameters/policyIdPathParam.yml  |   2 +-
 .../sources/parameters/thingIdPathParam.yml   |   2 +-
 .../sources/paths/cloudevents/cloudevents.yml |   6 +-
 .../sources/paths/features/definition.yml     |   8 +-
 .../paths/features/desiredProperties.yml      |   8 +-
 .../paths/features/desiredProperty.yml        |   8 +-
 .../sources/paths/features/feature.yml        |   8 +-
 .../openapi/sources/paths/features/index.yml  |   8 +-
 .../sources/paths/features/properties.yml     |   8 +-
 .../sources/paths/features/property.yml       |   8 +-
 .../paths/messages/feature-inbox-message.yml  |   2 +-
 .../paths/messages/feature-outbox-message.yml |   2 +-
 .../sources/paths/messages/inbox-claim.yml    |   4 +-
 .../sources/paths/messages/inbox-message.yml  |   2 +-
 .../sources/paths/messages/outbox-message.yml |   2 +-
 .../sources/paths/policies/entries.yml        |   4 +-
 .../openapi/sources/paths/policies/entry.yml  |   6 +-
 .../openapi/sources/paths/policies/import.yml |   6 +-
 .../sources/paths/policies/imports.yml        |   4 +-
 .../openapi/sources/paths/policies/policy.yml |   6 +-
 .../sources/paths/policies/resource.yml       |   6 +-
 .../sources/paths/policies/resources.yml      |   4 +-
 .../sources/paths/policies/subject.yml        |   6 +-
 .../sources/paths/policies/subjects.yml       |   4 +-
 .../sources/paths/things/attribute.yml        |   8 +-
 .../sources/paths/things/attributes.yml       |   8 +-
 .../sources/paths/things/definition.yml       |   8 +-
 .../openapi/sources/paths/things/policyId.yml |  10 +-
 .../openapi/sources/paths/things/thing.yml    |   6 +-
 .../sources/requests/dittoProtocol.yml        |   2 +-
 .../sources/schemas/wot-thingDescription.yml  |   2 +-
 .../resources/pages/ditto/basic-errors.md     |   2 +-
 .../ditto/basic-wot-integration-example.md    |   4 +-
 .../resources/pages/ditto/client-sdk-java.md  |  12 +-
 .../exceptions/policies_id_invalid.md         |   2 +-
 .../generated/exceptions/things_id_invalid.md |   2 +-
 .../pages/ditto/release_notes_080M2.md        |   2 +-
 .../pages/ditto/release_notes_100M1a.md       |   2 +-
 .../2018_02_07-virtualiot-meetup/index.html   |  20 +--
 .../2018_05_23-meetup-iot-hessen/index.html   |  20 +--
 .../index.html                                |   2 +-
 .../index.html                                |   2 +-
 .../index.html                                |  12 +-
 .../index.html                                |   4 +-
 .../index.html                                |   4 +-
 .../index.html                                |  14 +-
 .../2021_06_ditto-20-overview/index.html      |   2 +-
 .../slides/2021_06_ditto-in-20-min/index.html |  12 +-
 .../index.html                                |   2 +-
 .../index.html                                |   2 +-
 .../slides/2022_10_ditto-and-wot/index.html   |  16 +-
 .../slides/2023_01_ditto-in-30-min/index.html |  16 +-
 .../main/resources/wot/ditto-extension.html   |   2 +-
 legal/NOTICE.md                               |   2 +-
 .../model/ThingIdInvalidException.java        |   2 +-
 .../model/PolicyIdInvalidException.java       |   2 +-
 pom.xml                                       |   4 +-
 .../things/model/ThingIdInvalidException.java |   2 +-
 things/service/src/main/resources/things.conf |   4 +-
 .../connections/connectionTemplates.json      |   2 +-
 wot/model/README.md                           |   2 +-
 .../ditto/wot/model/ThingDescriptionTest.java |   8 +-
 .../test/resources/tds/some-example.td.json   |   4 +-
 88 files changed, 319 insertions(+), 319 deletions(-)

diff --git a/NOTICE.md b/NOTICE.md
index 0f7d66929c..d53c4ca974 100644
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -1,6 +1,6 @@
 This content is produced and maintained by the Eclipse Ditto project.
 
-* Project home: https://www.eclipse.org/ditto
+* Project home: https://www.eclipse.dev/ditto
 
 # Trademarks
 
diff --git a/README.md b/README.md
index cc627a66e3..b5f5169f07 100755
--- a/README.md
+++ b/README.md
@@ -13,14 +13,14 @@
 [![License](https://img.shields.io/badge/License-EPL%202.0-green.svg)](https://opensource.org/licenses/EPL-2.0)
 [![Lines of code](https://img.shields.io/badge/dynamic/xml.svg?label=Lines%20of%20code&url=https%3A%2F%2Fwww.openhub.net%2Fprojects%2Feclipse-ditto.xml%3Fapi_key%3D11ac3aa12a364fd87b461559a7eedcc53e18fb5a4cf1e43e02cb7a615f1f3d4f&query=%2Fresponse%2Fresult%2Fproject%2Fanalysis%2Ftotal_code_lines&colorB=lightgrey)](https://www.openhub.net/p/eclipse-ditto)
 
-[Eclipse Ditto](https://www.eclipse.org/ditto/)™ is a technology in the IoT implementing a software pattern called “digital twins”.  
+[Eclipse Ditto](https://www.eclipse.dev/ditto/)™ is a technology in the IoT implementing a software pattern called “digital twins”.  
 A digital twin is a virtual, cloud based, representation of his real world counterpart (real world “Things”, e.g. devices like sensors, smart heating, connected cars, smart grids, EV charging stations, …).
 
 An ever growing list of [adopters](https://iot.eclipse.org/adopters/?#iot.ditto) makes use of Ditto as part of their IoT platforms - if you're as well using it, it would be super nice to show your [adoption here](https://iot.eclipse.org/adopters/how-to-be-listed-as-an-adopter/).
 
 ## Documentation
 
-Find the documentation on the project site: [https://www.eclipse.org/ditto/](https://www.eclipse.org/ditto/)
+Find the documentation on the project site: [https://www.eclipse.dev/ditto/](https://www.eclipse.dev/ditto/)
 
 ## Eclipse Ditto™ explorer UI
 
@@ -58,7 +58,7 @@ docker-compose logs -f
 ```
 
 Open following URL to get started: [http://localhost:8080](http://localhost:8080)<br/>
-Or have a look at the ["Hello World"](https://www.eclipse.org/ditto/intro-hello-world.html)
+Or have a look at the ["Hello World"](https://www.eclipse.dev/ditto/intro-hello-world.html)
 
 Additional [deployment options](deployment/) are also available, if Docker Compose is not what you want to use.
 
diff --git a/RELEASE.md b/RELEASE.md
index 406b6573eb..cc93d5667b 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -14,10 +14,10 @@ Ditto releases are tracked and planned here: https://projects.eclipse.org/projec
       * First close the staging repo (after all artifacts are there, e.g. also the client artifacts)
       * Then release the staging repo
       * Then it will take a few hours until those changes are synced successfully to Maven central
-* Write Release notes, e.g. like for 3.1.0: https://www.eclipse.org/ditto/release_notes_310.html
+* Write Release notes, e.g. like for 3.1.0: https://www.eclipse.dev/ditto/release_notes_310.html
    * New features, changes, bug fixes to last release / milestone release
    * Add migration notes (if there are any)
-* Write a Blog post announcement, e.g. like for: https://www.eclipse.org/ditto/2022-12-16-release-announcement-310.html
+* Write a Blog post announcement, e.g. like for: https://www.eclipse.dev/ditto/2022-12-16-release-announcement-310.html
 * Close GitHub milestone (and assign all Issues/PRs which were still included in that milestone): https://github.com/eclipse-ditto/ditto/milestones
 * Create a GitHub release: https://github.com/eclipse-ditto/ditto/releases (based on the Tags which was pushed during release job)
 * Write a mail to the "ditto-dev" mailing list
diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/acks/AcknowledgementLabelInvalidException.java b/base/model/src/main/java/org/eclipse/ditto/base/model/acks/AcknowledgementLabelInvalidException.java
index 8dbc94eed4..03f40f0439 100644
--- a/base/model/src/main/java/org/eclipse/ditto/base/model/acks/AcknowledgementLabelInvalidException.java
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/acks/AcknowledgementLabelInvalidException.java
@@ -19,12 +19,12 @@
 import javax.annotation.concurrent.Immutable;
 import javax.annotation.concurrent.NotThreadSafe;
 
-import org.eclipse.ditto.json.JsonObject;
 import org.eclipse.ditto.base.model.common.HttpStatus;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeException;
 import org.eclipse.ditto.base.model.exceptions.DittoRuntimeExceptionBuilder;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.json.JsonParsableException;
+import org.eclipse.ditto.json.JsonObject;
 
 /**
  * Thrown if an AcknowledgementLabel is not valid, for example because it did not comply to the AcknowledgmentLabel
@@ -48,7 +48,7 @@ public final class AcknowledgementLabelInvalidException extends DittoRuntimeExce
             "An acknowledgement label must conform to the regular expression of Ditto documentation.";
 
     private static final URI DEFAULT_HREF = URI.create(
-            "https://www.eclipse.org/ditto/protocol-specification-topic.html#acknowledgement-criterion-actions");
+            "https://www.eclipse.dev/ditto/protocol-specification-topic.html#acknowledgement-criterion-actions");
 
     private static final long serialVersionUID = -2385649293006205966L;
 
diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/entity/id/NamespacedEntityIdInvalidException.java b/base/model/src/main/java/org/eclipse/ditto/base/model/entity/id/NamespacedEntityIdInvalidException.java
index 4843ff9794..da4d16a030 100644
--- a/base/model/src/main/java/org/eclipse/ditto/base/model/entity/id/NamespacedEntityIdInvalidException.java
+++ b/base/model/src/main/java/org/eclipse/ditto/base/model/entity/id/NamespacedEntityIdInvalidException.java
@@ -56,7 +56,7 @@ public final class NamespacedEntityIdInvalidException extends EntityIdInvalidExc
                     "length of 256 characters.";
 
     private static final URI DEFAULT_HREF =
-            URI.create("https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id");
+            URI.create("https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id");
 
     private static final long serialVersionUID = -8903476318490123234L;
 
diff --git a/connectivity/service/src/main/resources/javascript/incoming-mapping.js b/connectivity/service/src/main/resources/javascript/incoming-mapping.js
index d85f3c61cb..b9f6beeda0 100644
--- a/connectivity/service/src/main/resources/javascript/incoming-mapping.js
+++ b/connectivity/service/src/main/resources/javascript/incoming-mapping.js
@@ -19,7 +19,7 @@ function mapToDittoProtocolMsg(
   // ### Insert/adapt your mapping logic here.
   // Use helper function Ditto.buildDittoProtocolMsg to build Ditto protocol message
   // based on incoming payload.
-  // See https://www.eclipse.org/ditto/connectivity-mapping.html#helper-functions for details.
+  // See https://www.eclipse.dev/ditto/connectivity-mapping.html#helper-functions for details.
 
   // ### example code assuming the Ditto protocol content type for incoming messages.
   if (contentType === 'application/vnd.eclipse.ditto+json') {
diff --git a/deployment/docker/README.md b/deployment/docker/README.md
index 87631e977a..ffc4874e22 100755
--- a/deployment/docker/README.md
+++ b/deployment/docker/README.md
@@ -49,7 +49,7 @@ curl http://devops:foobar@localhost:8080/devops/config/gateway/?path=ditto
 ```
 
 Or by going through the configuration files in this repository, all available configuration files are 
-[linked here](https://www.eclipse.org/ditto/installation-operating.html#ditto-configuration).
+[linked here](https://www.eclipse.dev/ditto/installation-operating.html#ditto-configuration).
 
 ## Start Eclipse Ditto
 
diff --git a/deployment/docker/sandbox/html/index.html b/deployment/docker/sandbox/html/index.html
index 4bcc631389..cd904d960f 100644
--- a/deployment/docker/sandbox/html/index.html
+++ b/deployment/docker/sandbox/html/index.html
@@ -105,7 +105,7 @@ <h1><img src="./images/ditto.svg" class="ditto-logo" alt="Eclipse Ditto logo"> -
             API</a>.<br/> The Swagger UI for exploring the API will require authentication.
         </p>
         <p>
-            Visit the Eclipse Ditto <a href="https://www.eclipse.org/ditto/intro-overview.html">documentation</a> in
+            Visit the Eclipse Ditto <a href="https://www.eclipse.dev/ditto/intro-overview.html">documentation</a> in
             order to learn more about the project.
         </p>
         <p>
diff --git a/deployment/helm/ditto/Chart.yaml b/deployment/helm/ditto/Chart.yaml
index e743c2776d..131bd3ae79 100644
--- a/deployment/helm/ditto/Chart.yaml
+++ b/deployment/helm/ditto/Chart.yaml
@@ -16,7 +16,7 @@ description: |
   A digital twin is a virtual, cloud based, representation of his real world counterpart
   (real world “Things”, e.g. devices like sensors, smart heating, connected cars, smart grids, EV charging stations etc).
 type: application
-version: 0.0.2  # chart version is set by release-job
+version: 0.0.4  # chart version is set by release-job
 appVersion: 3.2.1
 keywords:
   - iot-chart
@@ -25,7 +25,7 @@ keywords:
 home: https://www.eclipse.org/ditto
 sources:
   - https://github.com/eclipse-ditto/ditto
-icon: https://www.eclipse.org/ditto/images/ditto.svg
+icon: https://www.eclipse.dev/ditto/images/ditto.svg
 maintainers:
   - name: thjaeckle
     email: thomas.jaeckle@beyonnex.io
diff --git a/deployment/helm/ditto/README.md b/deployment/helm/ditto/README.md
index 4212a7c4f8..631852cb0b 100644
--- a/deployment/helm/ditto/README.md
+++ b/deployment/helm/ditto/README.md
@@ -2,7 +2,7 @@
 
 ## Introduction
 
-[Eclipse Ditto™](https://www.eclipse.org/ditto/) is a technology in the IoT implementing a software pattern
+[Eclipse Ditto™](https://www.eclipse.dev/ditto/) is a technology in the IoT implementing a software pattern
 called “digital twins”. A digital twin is a virtual, cloud based, representation of his real world counterpart
 (real world “Things”, e.g. devices like sensors, smart heating, connected cars, smart grids, EV charging stations, …).
 
diff --git a/deployment/helm/ditto/ci/ci-workflow-values.yaml b/deployment/helm/ditto/ci/ci-workflow-values.yaml
index 6e1b99504c..f47e2e3a19 100644
--- a/deployment/helm/ditto/ci/ci-workflow-values.yaml
+++ b/deployment/helm/ditto/ci/ci-workflow-values.yaml
@@ -27,7 +27,7 @@ ingress:
 
 ## ----------------------------------------------------------------------------
 ## policies configuration
-## ref: https://www.eclipse.org/ditto/architecture-services-policies.html
+## ref: https://www.eclipse.dev/ditto/architecture-services-policies.html
 policies:
   resources:
     cpu: 0.15
@@ -38,7 +38,7 @@ policies:
 
 ## ----------------------------------------------------------------------------
 ## things configuration
-## ref: https://www.eclipse.org/ditto/architecture-services-things.html
+## ref: https://www.eclipse.dev/ditto/architecture-services-things.html
 things:
   resources:
     cpu: 0.15
@@ -49,7 +49,7 @@ things:
 
 ## ----------------------------------------------------------------------------
 ## things-search configuration
-## ref: https://www.eclipse.org/ditto/architecture-services-things-search.html
+## ref: https://www.eclipse.dev/ditto/architecture-services-things-search.html
 thingsSearch:
   resources:
     cpu: 0.15
@@ -60,7 +60,7 @@ thingsSearch:
 
 ## ----------------------------------------------------------------------------
 ## connectivity configuration
-## ref: https://www.eclipse.org/ditto/architecture-services-connectivity.html
+## ref: https://www.eclipse.dev/ditto/architecture-services-connectivity.html
 connectivity:
   resources:
     cpu: 0.15
@@ -71,7 +71,7 @@ connectivity:
 
 ## ----------------------------------------------------------------------------
 ## gateway configuration
-## ref: https://www.eclipse.org/ditto/architecture-services-gateway.html
+## ref: https://www.eclipse.dev/ditto/architecture-services-gateway.html
 gateway:
   resources:
     cpu: 0.15
diff --git a/deployment/helm/ditto/local-values.yaml b/deployment/helm/ditto/local-values.yaml
index c58ad3f1c8..9523f26b63 100644
--- a/deployment/helm/ditto/local-values.yaml
+++ b/deployment/helm/ditto/local-values.yaml
@@ -25,7 +25,7 @@ global:
 
 ## ----------------------------------------------------------------------------
 ## policies configuration
-## ref: https://www.eclipse.org/ditto/architecture-services-policies.html
+## ref: https://www.eclipse.dev/ditto/architecture-services-policies.html
 policies:
   resources:
     cpu: 0.2
@@ -43,7 +43,7 @@ policies:
 
 ## ----------------------------------------------------------------------------
 ## things configuration
-## ref: https://www.eclipse.org/ditto/architecture-services-things.html
+## ref: https://www.eclipse.dev/ditto/architecture-services-things.html
 things:
   resources:
     cpu: 0.2
@@ -61,7 +61,7 @@ things:
 
 ## ----------------------------------------------------------------------------
 ## things-search configuration
-## ref: https://www.eclipse.org/ditto/architecture-services-things-search.html
+## ref: https://www.eclipse.dev/ditto/architecture-services-things-search.html
 thingsSearch:
   resources:
     cpu: 0.2
@@ -72,7 +72,7 @@ thingsSearch:
 
 ## ----------------------------------------------------------------------------
 ## connectivity configuration
-## ref: https://www.eclipse.org/ditto/architecture-services-connectivity.html
+## ref: https://www.eclipse.dev/ditto/architecture-services-connectivity.html
 connectivity:
   resources:
     cpu: 0.2
@@ -83,7 +83,7 @@ connectivity:
 
 ## ----------------------------------------------------------------------------
 ## gateway configuration
-## ref: https://www.eclipse.org/ditto/architecture-services-gateway.html
+## ref: https://www.eclipse.dev/ditto/architecture-services-gateway.html
 gateway:
   resources:
     cpu: 0.2
diff --git a/deployment/helm/ditto/values.yaml b/deployment/helm/ditto/values.yaml
index f3beb5ad68..182190f6fb 100644
--- a/deployment/helm/ditto/values.yaml
+++ b/deployment/helm/ditto/values.yaml
@@ -61,7 +61,7 @@ global:
   hashedBasicAuthUsers: []
   # jwtOnly controls whether only OpenID-Connect authentication is supported
   #  if false, both OpenID-Connect and basicAuth via nginx (see above "basicAuthUsers" and "hashedBasicAuthUsers") is used
-  #  ref: https://www.eclipse.org/ditto/installation-operating.html#openid-connect
+  #  ref: https://www.eclipse.dev/ditto/installation-operating.html#openid-connect
   jwtOnly: true
   # jvmOptions defines the JVM options applied to all Ditto services running in the JVM, it is put in JAVA_TOOL_OPTIONS
   jvmOptions: >
@@ -370,7 +370,7 @@ akka:
 
 ## ----------------------------------------------------------------------------
 ## policies configuration
-##  ref: https://www.eclipse.org/ditto/architecture-services-policies.html
+##  ref: https://www.eclipse.dev/ditto/architecture-services-policies.html
 policies:
   # enabled controls whether policies related resources should be created
   enabled: true
@@ -401,7 +401,7 @@ policies:
   # additionalJvmOptions JVM options to put into JAVA_TOOL_OPTIONS
   additionalJvmOptions: ""
   # systemProps used to define arbitrary system properties for policies service
-  #  ref: https://www.eclipse.org/ditto/installation-operating.html#configuration
+  #  ref: https://www.eclipse.dev/ditto/installation-operating.html#configuration
   systemProps:
   # extraEnv to add arbitrary environment variable to policies container
   extraEnv:
@@ -552,7 +552,7 @@ policies:
 
 ## ----------------------------------------------------------------------------
 ## things configuration
-##  ref: https://www.eclipse.org/ditto/architecture-services-things.html
+##  ref: https://www.eclipse.dev/ditto/architecture-services-things.html
 things:
   # enabled controls whether things related resources should be created
   enabled: true
@@ -583,7 +583,7 @@ things:
   # additionalJvmOptions JVM options to put into JAVA_TOOL_OPTIONS
   additionalJvmOptions: ""
   # systemProps used to define arbitrary system properties for things service
-  #  ref: https://www.eclipse.org/ditto/installation-operating.html#configuration
+  #  ref: https://www.eclipse.dev/ditto/installation-operating.html#configuration
   systemProps:
   # extraEnv to add arbitrary environment variable to things container
   extraEnv:
@@ -751,12 +751,12 @@ things:
             }
           },
           "security": "basic_sc",
-          "support": "https://www.eclipse.org/ditto/"
+          "support": "https://www.eclipse.dev/ditto/"
         }
 
 ## ----------------------------------------------------------------------------
 ## things-search configuration
-##  ref: https://www.eclipse.org/ditto/architecture-services-things-search.html
+##  ref: https://www.eclipse.dev/ditto/architecture-services-things-search.html
 thingsSearch:
   # enabled controls whether things-search related resources should be created
   enabled: true
@@ -787,7 +787,7 @@ thingsSearch:
   # additional JVM options to put into JAVA_TOOL_OPTIONS
   additionalJvmOptions: ""
   # systemProps used to define arbitrary system properties for things-search service
-  #  ref: https://www.eclipse.org/ditto/installation-operating.html#configuration
+  #  ref: https://www.eclipse.dev/ditto/installation-operating.html#configuration
   systemProps:
   # extraEnv to add arbitrary environment variable to things-search container
   extraEnv:
@@ -870,7 +870,7 @@ thingsSearch:
       #  one of: unacknowledged | acknowledged | majority | journaled | w1 | w2 | w3
       searchWriteConcern: "acknowledged"
       # searchWithAcksWriteConcern configures the MongoDB write concern for commands sent with "search-persisted" ACK
-      #  ref: https://www.eclipse.org/ditto/basic-acknowledgements.html#built-in-acknowledgement-labels
+      #  ref: https://www.eclipse.dev/ditto/basic-acknowledgements.html#built-in-acknowledgement-labels
       #  one of: unacknowledged | acknowledged | majority | journaled | w1 | w2 | w3
       searchWithAcksWriteConcern: "majority"
       # queryReadConcern configures the MongoDB read concern for doing queries / performing searches
@@ -936,7 +936,7 @@ thingsSearch:
 
 ## ----------------------------------------------------------------------------
 ## connectivity configuration
-##  ref: https://www.eclipse.org/ditto/architecture-services-connectivity.html
+##  ref: https://www.eclipse.dev/ditto/architecture-services-connectivity.html
 connectivity:
   # enabled controls whether connectivity related resources should be created
   enabled: true
@@ -967,7 +967,7 @@ connectivity:
   # additional JVM options to put into JAVA_TOOL_OPTIONS
   additionalJvmOptions: ""
   # systemProps used to define arbitrary system properties for connectivity service
-  #  ref: https://www.eclipse.org/ditto/installation-operating.html#configuration
+  #  ref: https://www.eclipse.dev/ditto/installation-operating.html#configuration
   systemProps:
   # extraEnv to add arbitrary environment variable to connectivity container
   extraEnv:
@@ -1174,7 +1174,7 @@ connectivity:
 
 ## ----------------------------------------------------------------------------
 ## gateway configuration
-##  ref: https://www.eclipse.org/ditto/architecture-services-gateway.html
+##  ref: https://www.eclipse.dev/ditto/architecture-services-gateway.html
 gateway:
   # enabled controls whether gateway related resources should be created
   enabled: true
@@ -1205,7 +1205,7 @@ gateway:
     # pullPolicy for the gateway docker image
     pullPolicy: IfNotPresent
   # systemProps used to define arbitrary system properties configuration for gateway
-  #  ref: https://www.eclipse.org/ditto/installation-operating.html#configuration
+  #  ref: https://www.eclipse.dev/ditto/installation-operating.html#configuration
   systemProps:
     - "-Dditto.protocol.blocklist.0=raw-request-uri"
     - "-Dditto.protocol.blocklist.1=cache-control"
@@ -1302,7 +1302,7 @@ gateway:
     # authentication contains the settings regarding authentication against the gateway
     authentication:
       # enablePreAuthentication whether Ditto "pre-authentication" should be enabled
-      #  ref: https://www.eclipse.org/ditto/installation-operating.html#pre-authentication
+      #  ref: https://www.eclipse.dev/ditto/installation-operating.html#pre-authentication
       enablePreAuthentication: false
       # oauth contains the OAuth2.0 / OpenID Connect related configuration
       oauth:
diff --git a/deployment/kubernetes/README.md b/deployment/kubernetes/README.md
index 4f34d10311..351e404874 100644
--- a/deployment/kubernetes/README.md
+++ b/deployment/kubernetes/README.md
@@ -53,7 +53,7 @@ In case you already have a MongoDB in the cloud or elsewhere it is possible to c
 This can be done by setting the MongoDB URI via env variable "MONGO_DB_URI" in the 
 `deployment/kubernetes/deploymentFiles/ditto/ditto-cluster.yml` for all services except the `gateway`.
 Other MongoDB settings can be set via env variables and are documented in
-[Operating Ditto](https://www.eclipse.org/ditto/installation-operating.html) section.
+[Operating Ditto](https://www.eclipse.dev/ditto/installation-operating.html) section.
 
 In case your "MONGO_DB_URI" contains sensitive information like username and password it is recommended to use
 a kubernetes secret. 
diff --git a/deployment/openshift/nginx/index.html b/deployment/openshift/nginx/index.html
index d836b02321..d2c8839941 100644
--- a/deployment/openshift/nginx/index.html
+++ b/deployment/openshift/nginx/index.html
@@ -41,7 +41,7 @@
   <h1>You have started Eclipse Ditto</h1>
   <div>
     <p>Thank you for trying out Eclipse Ditto!</p>
-    <p>In order to get started quickly, you can now have a look at the <a href="https://www.eclipse.org/ditto/index.html">documentation</a>
+    <p>In order to get started quickly, you can now have a look at the <a href="https://www.eclipse.dev/ditto/index.html">documentation</a>
 
     <p>To authenticate at the HTTP APIs use the following username "ditto" and password "ditto" when asked for by your browser.</p>
 
diff --git a/documentation/README.md b/documentation/README.md
index 878139c3b3..eb0cc54181 100755
--- a/documentation/README.md
+++ b/documentation/README.md
@@ -1,6 +1,6 @@
 ## Eclipse Ditto :: Documentation
 
-This folder contains the documentation and [static website of Eclipse Ditto](https://www.eclipse.org/ditto/).
+This folder contains the documentation and [static website of Eclipse Ditto](https://www.eclipse.dev/ditto/).
 
 The documentation is based on [Jekyll](https://jekyllrb.com) and the fabulous [Jekyll Documentation Theme 6.0](http://idratherbewriting.com/documentation-theme-jekyll/).
 
diff --git a/documentation/src/main/resources/_includes/head.html b/documentation/src/main/resources/_includes/head.html
index 89e575f0cd..f85c61837f 100644
--- a/documentation/src/main/resources/_includes/head.html
+++ b/documentation/src/main/resources/_includes/head.html
@@ -24,8 +24,8 @@
 {
   "@context": "http://schema.org",
   "@type": "Organization",
-  "url": "https://www.eclipse.org/ditto/",
-  "logo": "https://www.eclipse.org/ditto/images/ditto.svg"
+  "url": "https://www.eclipse.dev/ditto/",
+  "logo": "https://www.eclipse.dev/ditto/images/ditto.svg"
 }
 </script>
 
diff --git a/documentation/src/main/resources/_posts/2018-01-15-example-demonstrating-rest-to-websocket.md b/documentation/src/main/resources/_posts/2018-01-15-example-demonstrating-rest-to-websocket.md
index 62e96d14bc..c29a55e103 100644
--- a/documentation/src/main/resources/_posts/2018-01-15-example-demonstrating-rest-to-websocket.md
+++ b/documentation/src/main/resources/_posts/2018-01-15-example-demonstrating-rest-to-websocket.md
@@ -15,7 +15,7 @@ over at the [Eclipse Ditto examples repository](https://github.com/eclipse-ditto
 Right from the project's description:
 
 >This example shows how to leverage the powers of combining the REST and
- WebSocket Messages API of [Eclipse Ditto](https://www.eclipse.org/ditto/).
+ WebSocket Messages API of [Eclipse Ditto](https://www.eclipse.dev/ditto/).
  It demonstrates how to send direct Messages to a *live* Thing, as well as
  updating the *twin* representation of a Thing inside Ditto.
 <br/> 
@@ -35,7 +35,7 @@ caption="Source: https://github.com/eclipse-ditto/ditto-examples" %}
 
 If you have any wishes, improvements, are missing something
 or just want to get in touch with us, you can use one of
-our [feedback channels](https://www.eclipse.org/ditto/feedback.html).
+our [feedback channels](https://www.eclipse.dev/ditto/feedback.html).
 
 {% include image.html file="ditto.svg" alt="Ditto" max-width=500 %}
 --<br/>
diff --git a/documentation/src/main/resources/_posts/2018-10-16-example-mqtt-bidirectional.md b/documentation/src/main/resources/_posts/2018-10-16-example-mqtt-bidirectional.md
index 569cb50730..8a0e6f3884 100644
--- a/documentation/src/main/resources/_posts/2018-10-16-example-mqtt-bidirectional.md
+++ b/documentation/src/main/resources/_posts/2018-10-16-example-mqtt-bidirectional.md
@@ -50,7 +50,7 @@ caption="Source: https://github.com/eclipse-ditto/ditto-examples" %}
 
 If you have any wishes, improvements, are missing something
 or just want to get in touch with us, you can use one of
-our [feedback channels](https://www.eclipse.org/ditto/feedback.html).
+our [feedback channels](https://www.eclipse.dev/ditto/feedback.html).
 
 
 {% include image.html file="ditto.svg" alt="Ditto" max-width=500 %}
diff --git a/documentation/src/main/resources/_posts/2021-03-22-azure-iot-hub-integration.md b/documentation/src/main/resources/_posts/2021-03-22-azure-iot-hub-integration.md
index 7e88a7627a..eafa809771 100644
--- a/documentation/src/main/resources/_posts/2021-03-22-azure-iot-hub-integration.md
+++ b/documentation/src/main/resources/_posts/2021-03-22-azure-iot-hub-integration.md
@@ -77,7 +77,7 @@ and represents the actual use of Ditto as a  northbound service.*
   ]
 }
 ```
-- [Further information on creating connections](https://www.eclipse.org/ditto/connectivity-manage-connections.html)
+- [Further information on creating connections](https://www.eclipse.dev/ditto/connectivity-manage-connections.html)
 
 - [Further information on D2C messaging capabilities of Azure IoT Hub](https://docs.microsoft.com/en-us/azure/iot-hub/iot-hub-devguide-messages-d2c)
 
@@ -162,9 +162,9 @@ function mapFromDittoProtocolMsg(
 }
 ```
 
-- [Further information on creating connections](https://www.eclipse.org/ditto/connectivity-manage-connections.html)
+- [Further information on creating connections](https://www.eclipse.dev/ditto/connectivity-manage-connections.html)
 
-- [Further information on payload-mapping](https://www.eclipse.org/ditto/connectivity-mapping.html)
+- [Further information on payload-mapping](https://www.eclipse.dev/ditto/connectivity-mapping.html)
 
 - [Further information on C2D messaging capabilities of Azure IoT Hub](https://docs.microsoft.com/de-de/azure/iot-hub/iot-hub-devguide-messages-c2d)
 
diff --git a/documentation/src/main/resources/jsonschema/policy.json b/documentation/src/main/resources/jsonschema/policy.json
index cd627629c3..b532c491e7 100644
--- a/documentation/src/main/resources/jsonschema/policy.json
+++ b/documentation/src/main/resources/jsonschema/policy.json
@@ -6,7 +6,7 @@
   "properties": {
     "policyId": {
       "type": "string",
-      "description": "Unique identifier representing the policy, has to conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).\n\nExamples for a valid policy ID:\n * `org.eclipse.ditto:xdk_policy_53`\n * `foo:xdk_53`\n * `org.eclipse.vorto_42:xdk_policy`"
+      "description": "Unique identifier representing the policy, has to conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).\n\nExamples for a valid policy ID:\n * `org.eclipse.ditto:xdk_policy_53`\n * `foo:xdk_53`\n * `org.eclipse.vorto_42:xdk_policy`"
     },
     "imports": {
       "title": "PolicyImports",
diff --git a/documentation/src/main/resources/jsonschema/protocol-search-subscribe-payload.json b/documentation/src/main/resources/jsonschema/protocol-search-subscribe-payload.json
index 51ea62f7e6..d395fc6f36 100644
--- a/documentation/src/main/resources/jsonschema/protocol-search-subscribe-payload.json
+++ b/documentation/src/main/resources/jsonschema/protocol-search-subscribe-payload.json
@@ -6,11 +6,11 @@
   "properties": {
     "filter": {
       "type": "string",
-      "description": "[RQL filter expression](https://www.eclipse.org/ditto/basic-rql.html#rql-filter) to select for things."
+      "description": "[RQL filter expression](https://www.eclipse.dev/ditto/basic-rql.html#rql-filter) to select for things."
     },
     "options": {
       "type": "string",
-      "description": "Specify the page size with `size(PAGE_SIZE)`, or the order of the search results by `sort(<+|-><property>)` (see [RQL sorting](https://www.eclipse.org/ditto/basic-rql.html#rql-sorting)).",
+      "description": "Specify the page size with `size(PAGE_SIZE)`, or the order of the search results by `sort(<+|-><property>)` (see [RQL sorting](https://www.eclipse.dev/ditto/basic-rql.html#rql-sorting)).",
       "examples": ["size(25)", "sort(+_modified,-thingId)"]
     },
     "namespaces": {
diff --git a/documentation/src/main/resources/jsonschema/thing_v2.json b/documentation/src/main/resources/jsonschema/thing_v2.json
index d7ef22efbd..8c08fc09be 100644
--- a/documentation/src/main/resources/jsonschema/thing_v2.json
+++ b/documentation/src/main/resources/jsonschema/thing_v2.json
@@ -6,11 +6,11 @@
   "properties": {
     "thingId": {
       "type": "string",
-      "description": "Unique identifier representing the thing, has to conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).\n\nExamples for a valid thing ID:\n * `org.eclipse.ditto:xdk_53`\n * `foo:xdk_53`\n * `org.eclipse.vorto_42:xdk_thing`"
+      "description": "Unique identifier representing the thing, has to conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).\n\nExamples for a valid thing ID:\n * `org.eclipse.ditto:xdk_53`\n * `foo:xdk_53`\n * `org.eclipse.vorto_42:xdk_thing`"
     },
     "policyId": {
       "type": "string",
-      "description": "Links to the ID of an existing Policy which contains the authorization information applied for this thing. The policy ID has to conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))."
+      "description": "Links to the ID of an existing Policy which contains the authorization information applied for this thing. The policy ID has to conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))."
     },
     "definition": {
       "title": "Definition",
diff --git a/documentation/src/main/resources/openapi/ditto-api-2.yml b/documentation/src/main/resources/openapi/ditto-api-2.yml
index a62645111b..5c3f0d90c9 100644
--- a/documentation/src/main/resources/openapi/ditto-api-2.yml
+++ b/documentation/src/main/resources/openapi/ditto-api-2.yml
@@ -257,7 +257,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
               * at least one of the defined query parameters is invalid
           content:
             application/json:
@@ -390,7 +390,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
               * the JSON body of the thing to be created/modified is invalid
               * the JSON body of the thing to be created/modified contains a `thingId`
               which does not match the ID in the path
@@ -709,7 +709,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           content:
             application/json:
               schema:
@@ -784,7 +784,7 @@ paths:
             The request could not be completed. Possible reasons:
 
             * the `thingId` does not conform to the namespaced entity ID notation
-            (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+            (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           content:
             application/json:
               schema:
@@ -863,7 +863,7 @@ paths:
             The request could not be completed. Possible reasons:
 
               * the `thingId` does not conform to the namespaced entity ID notation
-                (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+                (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
               * the JSON was invalid
               * the request body was not a JSON object.
           content:
@@ -937,7 +937,7 @@ paths:
             The request could not be completed. Possible reasons:
 
               * the `thingId` does not conform to the namespaced entity ID notation
-                (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+                (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
               * the JSON was invalid
               * the request body was not a JSON object.
           content:
@@ -1007,7 +1007,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. The `thingId` does not conform to the namespaced entity ID notation
-            (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+            (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           content:
             application/json:
               schema:
@@ -1080,7 +1080,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           content:
             application/json:
               schema:
@@ -1135,7 +1135,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           content:
             application/json:
               schema:
@@ -1170,7 +1170,7 @@ paths:
           The policy is used for controlling access to this thing. It is managed by
           resource `/policies/{policyId}`.
 
-          The ID of a policy needs to conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          The ID of a policy needs to conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
         required: true
     patch:
       summary: Patch the policy ID of a thing
@@ -1208,7 +1208,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
               * the `policyId` can not be removed from a thing.
           content:
             application/json:
@@ -1241,7 +1241,7 @@ paths:
         description: |-
           The policy is used for controlling access to this thing. It is managed by resource `/policies/{policyId}`.
 
-          The ID of a policy needs to conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          The ID of a policy needs to conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
         required: true
   '/api/2/things/{thingId}/attributes':
     get:
@@ -1288,7 +1288,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-            * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+            * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           content:
             application/json:
               schema:
@@ -1357,7 +1357,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * the JSON body of the attributes to be created/modified is invalid
           content:
             application/json:
@@ -1430,7 +1430,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * the JSON body of the attributes to be patched is invalid
           content:
             application/json:
@@ -1503,7 +1503,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           content:
             application/json:
               schema:
@@ -1581,7 +1581,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           content:
             application/json:
               schema:
@@ -1657,7 +1657,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           content:
             application/json:
               schema:
@@ -1735,7 +1735,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           content:
             application/json:
               schema:
@@ -1797,7 +1797,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           content:
             application/json:
               schema:
@@ -1885,7 +1885,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * at least one of the defined query parameters is invalid.
           content:
             application/json:
@@ -1991,7 +1991,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * the JSON body of the feature to be created/modified is invalid
           content:
             application/json:
@@ -2121,7 +2121,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * the JSON body of the feature to be created/modified is invalid
           content:
             application/json:
@@ -2199,7 +2199,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           content:
             application/json:
               schema:
@@ -2281,7 +2281,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * at least one of the defined query parameters is invalid.
           content:
             application/json:
@@ -2372,7 +2372,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * the JSON body of the feature to be created/modified is invalid
           content:
             application/json:
@@ -2479,7 +2479,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * the JSON body of the feature to be created/modified is invalid
           content:
             application/json:
@@ -2554,7 +2554,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           content:
             application/json:
               schema:
@@ -2629,7 +2629,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * at least one of the defined query parameters is invalid.
           content:
             application/json:
@@ -2703,7 +2703,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * the JSON body is invalid
           content:
             application/json:
@@ -2788,7 +2788,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * the JSON body is invalid
           content:
             application/json:
@@ -2856,7 +2856,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           content:
             application/json:
               schema:
@@ -2933,7 +2933,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * at least one of the defined query parameters is invalid.
           content:
             application/json:
@@ -3002,7 +3002,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * the JSON body of the feature properties to be created/modified is invalid
           content:
             application/json:
@@ -3097,7 +3097,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * the JSON body of the feature properties to be created/modified is invalid
           content:
             application/json:
@@ -3173,7 +3173,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           content:
             application/json:
               schema:
@@ -3253,7 +3253,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           content:
             application/json:
               schema:
@@ -3324,7 +3324,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * the JSON body is invalid
           content:
             application/json:
@@ -3404,7 +3404,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * the JSON body is invalid
           content:
             application/json:
@@ -3468,7 +3468,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           content:
             application/json:
               schema:
@@ -3545,7 +3545,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * at least one of the defined query parameters is invalid.
           content:
             application/json:
@@ -3614,7 +3614,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * the JSON body of the desired feature roperties to be created/modified is invalid
           content:
             application/json:
@@ -3709,7 +3709,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * the JSON body of the desired feature roperties to be created/modified is invalid
           content:
             application/json:
@@ -3785,7 +3785,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           content:
             application/json:
               schema:
@@ -3866,7 +3866,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           content:
             application/json:
               schema:
@@ -3938,7 +3938,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * the JSON body is invalid
           content:
             application/json:
@@ -4017,7 +4017,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * the JSON body is invalid
           content:
             application/json:
@@ -4084,7 +4084,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           content:
             application/json:
               schema:
@@ -4147,7 +4147,7 @@ paths:
         No special permission is required to issue a claim message.
 
         ### Example
-        See [Claiming](https://www.eclipse.org/ditto/protocol-specification-things-messages.html#sending-and-handling-claim-messages) concept in detail and example in GitHub.
+        See [Claiming](https://www.eclipse.dev/ditto/protocol-specification-things-messages.html#sending-and-handling-claim-messages) concept in detail and example in GitHub.
         However, in that scenario, the policy should grant you READ and WRITE permission on
         the "message:/" resource in order to be able to send the message and read the response.
         Further, the things-client which handles the "claim" message, needs permission to change the policy itself
@@ -4173,7 +4173,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * at least one of the defined path parameters is invalid
           content:
             application/json:
@@ -4264,7 +4264,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * at least one of the defined path parameters is invalid
           content:
             application/json:
@@ -4346,7 +4346,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * at least one of the defined path parameters is invalid.
           content:
             application/json:
@@ -4432,7 +4432,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * at least one of the defined path parameters is invalid.
           content:
             application/json:
@@ -4516,7 +4516,7 @@ paths:
         '400':
           description: |-
             The request could not be completed. Possible reasons:
-              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+              * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
               * at least one of the defined path parameters is valid.
           content:
             application/json:
@@ -4604,7 +4604,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           content:
             application/json:
               schema:
@@ -4734,7 +4734,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
               * the JSON body of the policy to be created/modified is invalid
           content:
             application/json:
@@ -4827,7 +4827,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           content:
             application/json:
               schema:
@@ -4979,7 +4979,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           content:
             application/json:
               schema:
@@ -5031,7 +5031,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
               * the JSON body of the policy to be created/modified is invalid
           content:
             application/json:
@@ -5133,7 +5133,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           content:
             application/json:
               schema:
@@ -5204,7 +5204,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
             * the JSON body of the policy entry to be created/modified is invalid
           content:
             application/json:
@@ -5319,7 +5319,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           content:
             application/json:
               schema:
@@ -5471,7 +5471,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-               * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+               * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           content:
             application/json:
               schema:
@@ -5536,7 +5536,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-               * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+               * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
              * the JSON body of the policy subjects to be created/modified is invalid
           content:
             application/json:
@@ -5619,7 +5619,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           content:
             application/json:
               schema:
@@ -5688,7 +5688,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)))
+              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)))
             * the JSON body of the policy subject to be created/modified is invalid.
           content:
             application/json:
@@ -5757,7 +5757,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           content:
             application/json:
               schema:
@@ -5824,7 +5824,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           content:
             application/json:
               schema:
@@ -5924,7 +5924,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
               * the JSON is invalid, or no valid Resources JSON object.
           content:
             application/json:
@@ -6004,7 +6004,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           content:
             application/json:
               schema:
@@ -6076,7 +6076,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-             * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+             * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
               * the JSON is invalid, or no valid Resource JSON object.
           content:
             application/json:
@@ -6141,7 +6141,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           content:
             application/json:
               schema:
@@ -6206,7 +6206,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           content:
             application/json:
               schema:
@@ -6265,7 +6265,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
               * the JSON body of the policy imports to be created/modified is invalid
           content:
             application/json:
@@ -6354,7 +6354,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `policyId` or the `importedPolicyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `policyId` or the `importedPolicyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           content:
             application/json:
               schema:
@@ -6437,7 +6437,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `policyId` or the `importedPolicyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `policyId` or the `importedPolicyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
               * the JSON body of the policy import to be created/modified is invalid
           content:
             application/json:
@@ -6511,7 +6511,7 @@ paths:
           description: |-
             The request could not be completed. Possible reasons:
 
-              * the `policyId` or the `importedPolicyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+              * the `policyId` or the `importedPolicyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           content:
             application/json:
               schema:
@@ -6726,11 +6726,11 @@ paths:
       summary: Processes a CloudEvent sent in Ditto Protocol
       description: |-
         Provides an endpoint accepting [CloudEvents via its HTTP protocol binding](https://github.com/cloudevents/spec/blob/v1.0/http-protocol-binding.md)
-        in [Ditto Protocol JSON](https://www.eclipse.org/ditto/protocol-specification.html).
+        in [Ditto Protocol JSON](https://www.eclipse.dev/ditto/protocol-specification.html).
 
         The endpoint can also directly be configured as a [Knative eventing](https://knative.dev/docs/eventing/) destination.
 
-        Find more documentation on that [here](https://www.eclipse.org/ditto/httpapi-protocol-bindings-cloudevents.html).
+        Find more documentation on that [here](https://www.eclipse.dev/ditto/httpapi-protocol-bindings-cloudevents.html).
       tags:
         - CloudEvents
       parameters:
@@ -6784,7 +6784,7 @@ paths:
             The request could not be completed. Possible reasons:
               * the CloudEvent could not be parsed as some mandatory CloudEvent headers were missing from the request
               * the payload was missing from the CloudEvent
-              * the [Ditto Protocol JSON](https://www.eclipse.org/ditto/protocol-specification.html) message could not be parsed or was missing a required field
+              * the [Ditto Protocol JSON](https://www.eclipse.dev/ditto/protocol-specification.html) message could not be parsed or was missing a required field
           content:
             application/json:
               schema:
@@ -6870,7 +6870,7 @@ paths:
                 attributes:
                   foo: 42
         description: |-
-          The [Ditto Protocol JSON](https://www.eclipse.org/ditto/protocol-specification.html) payload defining which
+          The [Ditto Protocol JSON](https://www.eclipse.dev/ditto/protocol-specification.html) payload defining which
           command to process.
   /api/2/connections:
     get:
@@ -8277,7 +8277,7 @@ components:
       name: importedPolicyId
       in: path
       description: |-
-        The ID of the imported policy needs to follow the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+        The ID of the imported policy needs to follow the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
 
         The namespace needs to:
         * conform to the reverse domain name notation
@@ -8421,7 +8421,7 @@ components:
       name: policyId
       in: path
       description: |-
-        The ID of the policy needs to follow the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+        The ID of the policy needs to follow the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
 
         The namespace needs to:
         * conform to the reverse domain name notation
@@ -8684,7 +8684,7 @@ components:
     ThingIdPathParam:
       name: thingId
       in: path
-      description: 'The ID of a thing needs to follow the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).'
+      description: 'The ID of a thing needs to follow the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).'
       required: true
       schema:
         type: string
@@ -10101,7 +10101,7 @@ components:
         support:
           type: string
           format: iri-reference
-          example: 'https://www.eclipse.org/ditto/'
+          example: 'https://www.eclipse.dev/ditto/'
         created:
           type: string
           format: date-time
diff --git a/documentation/src/main/resources/openapi/sources/parameters/importedPolicyIdPathParam.yml b/documentation/src/main/resources/openapi/sources/parameters/importedPolicyIdPathParam.yml
index eb29b07dce..2a597f9de8 100644
--- a/documentation/src/main/resources/openapi/sources/parameters/importedPolicyIdPathParam.yml
+++ b/documentation/src/main/resources/openapi/sources/parameters/importedPolicyIdPathParam.yml
@@ -11,7 +11,7 @@
 name: importedPolicyId
 in: path
 description: |-
-  The ID of the imported policy needs to follow the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+  The ID of the imported policy needs to follow the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
 
   The namespace needs to:
   * conform to the reverse domain name notation
diff --git a/documentation/src/main/resources/openapi/sources/parameters/policyIdPathParam.yml b/documentation/src/main/resources/openapi/sources/parameters/policyIdPathParam.yml
index f64e0fe3e9..82ad626a9a 100644
--- a/documentation/src/main/resources/openapi/sources/parameters/policyIdPathParam.yml
+++ b/documentation/src/main/resources/openapi/sources/parameters/policyIdPathParam.yml
@@ -11,7 +11,7 @@
 name: policyId
 in: path
 description: |-
-  The ID of the policy needs to follow the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+  The ID of the policy needs to follow the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
 
   The namespace needs to:
   * conform to the reverse domain name notation
diff --git a/documentation/src/main/resources/openapi/sources/parameters/thingIdPathParam.yml b/documentation/src/main/resources/openapi/sources/parameters/thingIdPathParam.yml
index c5dfac5766..8a406359e1 100644
--- a/documentation/src/main/resources/openapi/sources/parameters/thingIdPathParam.yml
+++ b/documentation/src/main/resources/openapi/sources/parameters/thingIdPathParam.yml
@@ -11,7 +11,7 @@
 name: thingId
 in: path
 description: |-
-  The ID of a thing needs to follow the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+  The ID of a thing needs to follow the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
 required: true
 schema:
   type: string
\ No newline at end of file
diff --git a/documentation/src/main/resources/openapi/sources/paths/cloudevents/cloudevents.yml b/documentation/src/main/resources/openapi/sources/paths/cloudevents/cloudevents.yml
index b333e4925d..b0f2482a06 100644
--- a/documentation/src/main/resources/openapi/sources/paths/cloudevents/cloudevents.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/cloudevents/cloudevents.yml
@@ -12,11 +12,11 @@ post:
   summary: Processes a CloudEvent sent in Ditto Protocol
   description: |-
     Provides an endpoint accepting [CloudEvents via its HTTP protocol binding](https://github.com/cloudevents/spec/blob/v1.0/http-protocol-binding.md)
-    in [Ditto Protocol JSON](https://www.eclipse.org/ditto/protocol-specification.html).
+    in [Ditto Protocol JSON](https://www.eclipse.dev/ditto/protocol-specification.html).
 
     The endpoint can also directly be configured as a [Knative eventing](https://knative.dev/docs/eventing/) destination.
 
-    Find more documentation on that [here](https://www.eclipse.org/ditto/httpapi-protocol-bindings-cloudevents.html).
+    Find more documentation on that [here](https://www.eclipse.dev/ditto/httpapi-protocol-bindings-cloudevents.html).
   tags:
     - CloudEvents
   parameters:
@@ -71,7 +71,7 @@ post:
         The request could not be completed. Possible reasons:
           * the CloudEvent could not be parsed as some mandatory CloudEvent headers were missing from the request
           * the payload was missing from the CloudEvent
-          * the [Ditto Protocol JSON](https://www.eclipse.org/ditto/protocol-specification.html) message could not be parsed or was missing a required field
+          * the [Ditto Protocol JSON](https://www.eclipse.dev/ditto/protocol-specification.html) message could not be parsed or was missing a required field
       content:
         application/json:
           schema:
diff --git a/documentation/src/main/resources/openapi/sources/paths/features/definition.yml b/documentation/src/main/resources/openapi/sources/paths/features/definition.yml
index d86e5571d3..db43c0dee9 100644
--- a/documentation/src/main/resources/openapi/sources/paths/features/definition.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/features/definition.yml
@@ -55,7 +55,7 @@ get:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * at least one of the defined query parameters is invalid.
       content:
         application/json:
@@ -129,7 +129,7 @@ put:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * the JSON body is invalid
       content:
         application/json:
@@ -213,7 +213,7 @@ patch:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * the JSON body is invalid
       content:
         application/json:
@@ -283,7 +283,7 @@ delete:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
       content:
         application/json:
           schema:
diff --git a/documentation/src/main/resources/openapi/sources/paths/features/desiredProperties.yml b/documentation/src/main/resources/openapi/sources/paths/features/desiredProperties.yml
index 8b2bf34577..060c39170f 100644
--- a/documentation/src/main/resources/openapi/sources/paths/features/desiredProperties.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/features/desiredProperties.yml
@@ -55,7 +55,7 @@ get:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * at least one of the defined query parameters is invalid.
       content:
         application/json:
@@ -124,7 +124,7 @@ put:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * the JSON body of the desired feature roperties to be created/modified is invalid
       content:
         application/json:
@@ -224,7 +224,7 @@ patch:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * the JSON body of the desired feature roperties to be created/modified is invalid
       content:
         application/json:
@@ -302,7 +302,7 @@ delete:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
       content:
         application/json:
           schema:
diff --git a/documentation/src/main/resources/openapi/sources/paths/features/desiredProperty.yml b/documentation/src/main/resources/openapi/sources/paths/features/desiredProperty.yml
index c091efb15c..d87a48d46e 100644
--- a/documentation/src/main/resources/openapi/sources/paths/features/desiredProperty.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/features/desiredProperty.yml
@@ -58,7 +58,7 @@ get:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
       content:
         application/json:
           schema:
@@ -130,7 +130,7 @@ put:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * the JSON body is invalid
       content:
         application/json:
@@ -210,7 +210,7 @@ patch:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * the JSON body is invalid
       content:
         application/json:
@@ -278,7 +278,7 @@ delete:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
       content:
         application/json:
           schema:
diff --git a/documentation/src/main/resources/openapi/sources/paths/features/feature.yml b/documentation/src/main/resources/openapi/sources/paths/features/feature.yml
index 706983cce9..4bf7ea92c8 100644
--- a/documentation/src/main/resources/openapi/sources/paths/features/feature.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/features/feature.yml
@@ -59,7 +59,7 @@ get:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * at least one of the defined query parameters is invalid.
       content:
         application/json:
@@ -150,7 +150,7 @@ put:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * the JSON body of the feature to be created/modified is invalid
       content:
         application/json:
@@ -258,7 +258,7 @@ patch:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * the JSON body of the feature to be created/modified is invalid
       content:
         application/json:
@@ -334,7 +334,7 @@ delete:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
       content:
         application/json:
           schema:
diff --git a/documentation/src/main/resources/openapi/sources/paths/features/index.yml b/documentation/src/main/resources/openapi/sources/paths/features/index.yml
index ee473c370d..4fd941db96 100644
--- a/documentation/src/main/resources/openapi/sources/paths/features/index.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/features/index.yml
@@ -68,7 +68,7 @@ get:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * at least one of the defined query parameters is invalid.
       content:
         application/json:
@@ -175,7 +175,7 @@ put:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * the JSON body of the feature to be created/modified is invalid
       content:
         application/json:
@@ -313,7 +313,7 @@ patch:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * the JSON body of the feature to be created/modified is invalid
       content:
         application/json:
@@ -393,7 +393,7 @@ delete:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
       content:
         application/json:
           schema:
diff --git a/documentation/src/main/resources/openapi/sources/paths/features/properties.yml b/documentation/src/main/resources/openapi/sources/paths/features/properties.yml
index b9b97ddd21..f82425052a 100644
--- a/documentation/src/main/resources/openapi/sources/paths/features/properties.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/features/properties.yml
@@ -55,7 +55,7 @@ get:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * at least one of the defined query parameters is invalid.
       content:
         application/json:
@@ -124,7 +124,7 @@ put:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * the JSON body of the feature properties to be created/modified is invalid
       content:
         application/json:
@@ -223,7 +223,7 @@ patch:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * the JSON body of the feature properties to be created/modified is invalid
       content:
         application/json:
@@ -301,7 +301,7 @@ delete:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
       content:
         application/json:
           schema:
diff --git a/documentation/src/main/resources/openapi/sources/paths/features/property.yml b/documentation/src/main/resources/openapi/sources/paths/features/property.yml
index 29c772ea27..1c048d2d73 100644
--- a/documentation/src/main/resources/openapi/sources/paths/features/property.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/features/property.yml
@@ -57,7 +57,7 @@ get:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
       content:
         application/json:
           schema:
@@ -128,7 +128,7 @@ put:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * the JSON body is invalid
 
       content:
@@ -210,7 +210,7 @@ patch:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * the JSON body is invalid
       content:
         application/json:
@@ -275,7 +275,7 @@ delete:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
       content:
         application/json:
           schema:
diff --git a/documentation/src/main/resources/openapi/sources/paths/messages/feature-inbox-message.yml b/documentation/src/main/resources/openapi/sources/paths/messages/feature-inbox-message.yml
index 86056d8be2..0e3e5b7059 100644
--- a/documentation/src/main/resources/openapi/sources/paths/messages/feature-inbox-message.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/messages/feature-inbox-message.yml
@@ -49,7 +49,7 @@ post:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * at least one of the defined path parameters is invalid.
       content:
         application/json:
diff --git a/documentation/src/main/resources/openapi/sources/paths/messages/feature-outbox-message.yml b/documentation/src/main/resources/openapi/sources/paths/messages/feature-outbox-message.yml
index df4ef3c19f..500ad28fc8 100644
--- a/documentation/src/main/resources/openapi/sources/paths/messages/feature-outbox-message.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/messages/feature-outbox-message.yml
@@ -47,7 +47,7 @@ post:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * at least one of the defined path parameters is valid.
       content:
         application/json:
diff --git a/documentation/src/main/resources/openapi/sources/paths/messages/inbox-claim.yml b/documentation/src/main/resources/openapi/sources/paths/messages/inbox-claim.yml
index c4c773b891..bdbd4c7d10 100644
--- a/documentation/src/main/resources/openapi/sources/paths/messages/inbox-claim.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/messages/inbox-claim.yml
@@ -38,7 +38,7 @@ post:
     No special permission is required to issue a claim message.
 
     ### Example
-    See [Claiming](https://www.eclipse.org/ditto/protocol-specification-things-messages.html#sending-and-handling-claim-messages) concept in detail and example in GitHub.
+    See [Claiming](https://www.eclipse.dev/ditto/protocol-specification-things-messages.html#sending-and-handling-claim-messages) concept in detail and example in GitHub.
     However, in that scenario, the policy should grant you READ and WRITE permission on
     the "message:/" resource in order to be able to send the message and read the response.
     Further, the things-client which handles the "claim" message, needs permission to change the policy itself
@@ -65,7 +65,7 @@ post:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * at least one of the defined path parameters is invalid
       content:
         application/json:
diff --git a/documentation/src/main/resources/openapi/sources/paths/messages/inbox-message.yml b/documentation/src/main/resources/openapi/sources/paths/messages/inbox-message.yml
index dfc2e6f0cb..feba0626d5 100644
--- a/documentation/src/main/resources/openapi/sources/paths/messages/inbox-message.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/messages/inbox-message.yml
@@ -59,7 +59,7 @@ post:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * at least one of the defined path parameters is invalid
       content:
         application/json:
diff --git a/documentation/src/main/resources/openapi/sources/paths/messages/outbox-message.yml b/documentation/src/main/resources/openapi/sources/paths/messages/outbox-message.yml
index 9579ba0a84..675439b050 100644
--- a/documentation/src/main/resources/openapi/sources/paths/messages/outbox-message.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/messages/outbox-message.yml
@@ -45,7 +45,7 @@ post:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * at least one of the defined path parameters is invalid.
       content:
         application/json:
diff --git a/documentation/src/main/resources/openapi/sources/paths/policies/entries.yml b/documentation/src/main/resources/openapi/sources/paths/policies/entries.yml
index 333369f967..17540673fd 100644
--- a/documentation/src/main/resources/openapi/sources/paths/policies/entries.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/policies/entries.yml
@@ -42,7 +42,7 @@ get:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
       content:
         application/json:
           schema:
@@ -94,7 +94,7 @@ put:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           * the JSON body of the policy to be created/modified is invalid
       content:
         application/json:
diff --git a/documentation/src/main/resources/openapi/sources/paths/policies/entry.yml b/documentation/src/main/resources/openapi/sources/paths/policies/entry.yml
index 63758c2821..d44e867afb 100644
--- a/documentation/src/main/resources/openapi/sources/paths/policies/entry.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/policies/entry.yml
@@ -44,7 +44,7 @@ get:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
       content:
         application/json:
           schema:
@@ -115,7 +115,7 @@ put:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
         * the JSON body of the policy entry to be created/modified is invalid
       content:
         application/json:
@@ -240,7 +240,7 @@ delete:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
       content:
         application/json:
           schema:
diff --git a/documentation/src/main/resources/openapi/sources/paths/policies/import.yml b/documentation/src/main/resources/openapi/sources/paths/policies/import.yml
index ca4d6301bf..872e3f5baa 100644
--- a/documentation/src/main/resources/openapi/sources/paths/policies/import.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/policies/import.yml
@@ -43,7 +43,7 @@ get:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `policyId` or the `importedPolicyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `policyId` or the `importedPolicyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
       content:
         application/json:
           schema:
@@ -126,7 +126,7 @@ put:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `policyId` or the `importedPolicyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `policyId` or the `importedPolicyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           * the JSON body of the policy import to be created/modified is invalid
       content:
         application/json:
@@ -201,7 +201,7 @@ delete:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `policyId` or the `importedPolicyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `policyId` or the `importedPolicyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
       content:
         application/json:
           schema:
diff --git a/documentation/src/main/resources/openapi/sources/paths/policies/imports.yml b/documentation/src/main/resources/openapi/sources/paths/policies/imports.yml
index e7389096e7..65d8162a51 100644
--- a/documentation/src/main/resources/openapi/sources/paths/policies/imports.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/policies/imports.yml
@@ -41,7 +41,7 @@ get:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
       content:
         application/json:
           schema:
@@ -101,7 +101,7 @@ put:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           * the JSON body of the policy imports to be created/modified is invalid
       content:
         application/json:
diff --git a/documentation/src/main/resources/openapi/sources/paths/policies/policy.yml b/documentation/src/main/resources/openapi/sources/paths/policies/policy.yml
index 12eb9309fa..5a89d09fad 100644
--- a/documentation/src/main/resources/openapi/sources/paths/policies/policy.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/policies/policy.yml
@@ -51,7 +51,7 @@ get:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
       content:
         application/json:
           schema:
@@ -181,7 +181,7 @@ put:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           * the JSON body of the policy to be created/modified is invalid
       content:
         application/json:
@@ -286,7 +286,7 @@ delete:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
       content:
         application/json:
           schema:
diff --git a/documentation/src/main/resources/openapi/sources/paths/policies/resource.yml b/documentation/src/main/resources/openapi/sources/paths/policies/resource.yml
index a304b11888..1329d675f7 100644
--- a/documentation/src/main/resources/openapi/sources/paths/policies/resource.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/policies/resource.yml
@@ -45,7 +45,7 @@ get:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
       content:
         application/json:
           schema:
@@ -117,7 +117,7 @@ put:
       description: |-
         The request could not be completed. Possible reasons:
 
-         * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+         * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           * the JSON is invalid, or no valid Resource JSON object.
       content:
         application/json:
@@ -182,7 +182,7 @@ delete:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
       content:
         application/json:
           schema:
diff --git a/documentation/src/main/resources/openapi/sources/paths/policies/resources.yml b/documentation/src/main/resources/openapi/sources/paths/policies/resources.yml
index 37506c69f9..a0204f9c7e 100644
--- a/documentation/src/main/resources/openapi/sources/paths/policies/resources.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/policies/resources.yml
@@ -42,7 +42,7 @@ get:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
       content:
         application/json:
           schema:
@@ -142,7 +142,7 @@ put:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           * the JSON is invalid, or no valid Resources JSON object.
       content:
         application/json:
diff --git a/documentation/src/main/resources/openapi/sources/paths/policies/subject.yml b/documentation/src/main/resources/openapi/sources/paths/policies/subject.yml
index 71b2ebd8e4..b7ac7ec3cb 100644
--- a/documentation/src/main/resources/openapi/sources/paths/policies/subject.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/policies/subject.yml
@@ -44,7 +44,7 @@ get:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
       content:
         application/json:
           schema:
@@ -113,7 +113,7 @@ put:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)))
+          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)))
         * the JSON body of the policy subject to be created/modified is invalid.
       content:
         application/json:
@@ -182,7 +182,7 @@ delete:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
       content:
         application/json:
           schema:
diff --git a/documentation/src/main/resources/openapi/sources/paths/policies/subjects.yml b/documentation/src/main/resources/openapi/sources/paths/policies/subjects.yml
index 01c6fbba26..966821c7ea 100644
--- a/documentation/src/main/resources/openapi/sources/paths/policies/subjects.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/policies/subjects.yml
@@ -42,7 +42,7 @@ get:
       description: |-
         The request could not be completed. Possible reasons:
 
-           * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+           * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
       content:
         application/json:
           schema:
@@ -107,7 +107,7 @@ put:
       description: |-
         The request could not be completed. Possible reasons:
 
-           * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+           * the `policyId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
          * the JSON body of the policy subjects to be created/modified is invalid
       content:
         application/json:
diff --git a/documentation/src/main/resources/openapi/sources/paths/things/attribute.yml b/documentation/src/main/resources/openapi/sources/paths/things/attribute.yml
index 7e17153910..a9457fb9c5 100644
--- a/documentation/src/main/resources/openapi/sources/paths/things/attribute.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/things/attribute.yml
@@ -57,7 +57,7 @@ get:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
       content:
         application/json:
           schema:
@@ -133,7 +133,7 @@ put:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
       content:
         application/json:
           schema:
@@ -212,7 +212,7 @@ patch:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
       content:
         application/json:
           schema:
@@ -275,7 +275,7 @@ delete:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
       content:
         application/json:
           schema:
diff --git a/documentation/src/main/resources/openapi/sources/paths/things/attributes.yml b/documentation/src/main/resources/openapi/sources/paths/things/attributes.yml
index b1d4c7d878..836e9c0e0b 100644
--- a/documentation/src/main/resources/openapi/sources/paths/things/attributes.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/things/attributes.yml
@@ -55,7 +55,7 @@ get:
       description: |-
         The request could not be completed. Possible reasons:
 
-        * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+        * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
       content:
         application/json:
           schema:
@@ -125,7 +125,7 @@ put:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * the JSON body of the attributes to be created/modified is invalid
       content:
         application/json:
@@ -199,7 +199,7 @@ patch:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
           * the JSON body of the attributes to be patched is invalid
       content:
         application/json:
@@ -274,7 +274,7 @@ delete:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
       content:
         application/json:
           schema:
diff --git a/documentation/src/main/resources/openapi/sources/paths/things/definition.yml b/documentation/src/main/resources/openapi/sources/paths/things/definition.yml
index 97f228b9e2..d32de60055 100644
--- a/documentation/src/main/resources/openapi/sources/paths/things/definition.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/things/definition.yml
@@ -55,7 +55,7 @@ get:
         The request could not be completed. Possible reasons:
 
         * the `thingId` does not conform to the namespaced entity ID notation
-        (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+        (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
       content:
         application/json:
           schema:
@@ -135,7 +135,7 @@ put:
         The request could not be completed. Possible reasons:
 
           * the `thingId` does not conform to the namespaced entity ID notation
-            (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+            (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           * the JSON was invalid
           * the request body was not a JSON object.
       content:
@@ -210,7 +210,7 @@ patch:
         The request could not be completed. Possible reasons:
 
           * the `thingId` does not conform to the namespaced entity ID notation
-            (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+            (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           * the JSON was invalid
           * the request body was not a JSON object.
       content:
@@ -282,7 +282,7 @@ delete:
     '400':
       description: |-
         The request could not be completed. The `thingId` does not conform to the namespaced entity ID notation
-        (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+        (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
       content:
         application/json:
           schema:
diff --git a/documentation/src/main/resources/openapi/sources/paths/things/policyId.yml b/documentation/src/main/resources/openapi/sources/paths/things/policyId.yml
index 3ba267d24f..7a49713e29 100644
--- a/documentation/src/main/resources/openapi/sources/paths/things/policyId.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/things/policyId.yml
@@ -53,7 +53,7 @@ get:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
       content:
         application/json:
           schema:
@@ -108,7 +108,7 @@ put:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
       content:
         application/json:
           schema:
@@ -143,7 +143,7 @@ put:
       The policy is used for controlling access to this thing. It is managed by
       resource `/policies/{policyId}`.
 
-      The ID of a policy needs to conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+      The ID of a policy needs to conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
     required: true
 patch:
   summary: Patch the policy ID of a thing
@@ -181,7 +181,7 @@ patch:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           * the `policyId` can not be removed from a thing.
       content:
         application/json:
@@ -215,5 +215,5 @@ patch:
     description: |-
       The policy is used for controlling access to this thing. It is managed by resource `/policies/{policyId}`.
 
-      The ID of a policy needs to conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+      The ID of a policy needs to conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
     required: true
diff --git a/documentation/src/main/resources/openapi/sources/paths/things/thing.yml b/documentation/src/main/resources/openapi/sources/paths/things/thing.yml
index 0a968cf9c8..25c7cb290d 100644
--- a/documentation/src/main/resources/openapi/sources/paths/things/thing.yml
+++ b/documentation/src/main/resources/openapi/sources/paths/things/thing.yml
@@ -65,7 +65,7 @@ get:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           * at least one of the defined query parameters is invalid
       content:
         application/json:
@@ -200,7 +200,7 @@ put:
       description: |-
         The request could not be completed. Possible reasons:
 
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id))
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id))
           * the JSON body of the thing to be created/modified is invalid
           * the JSON body of the thing to be created/modified contains a `thingId`
           which does not match the ID in the path
@@ -527,7 +527,7 @@ delete:
     '400':
       description: |-
         The request could not be completed. Possible reasons:
-          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id)).
+          * the `thingId` does not conform to the namespaced entity ID notation (see [Ditto documentation on namespaced entity IDs](https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id)).
       content:
         application/json:
           schema:
diff --git a/documentation/src/main/resources/openapi/sources/requests/dittoProtocol.yml b/documentation/src/main/resources/openapi/sources/requests/dittoProtocol.yml
index 9c25a01e62..e664247615 100644
--- a/documentation/src/main/resources/openapi/sources/requests/dittoProtocol.yml
+++ b/documentation/src/main/resources/openapi/sources/requests/dittoProtocol.yml
@@ -56,5 +56,5 @@ content:
       }
     }
 description: |-
-  The [Ditto Protocol JSON](https://www.eclipse.org/ditto/protocol-specification.html) payload defining which
+  The [Ditto Protocol JSON](https://www.eclipse.dev/ditto/protocol-specification.html) payload defining which
   command to process.
\ No newline at end of file
diff --git a/documentation/src/main/resources/openapi/sources/schemas/wot-thingDescription.yml b/documentation/src/main/resources/openapi/sources/schemas/wot-thingDescription.yml
index a6ef27f34f..b85f15c957 100644
--- a/documentation/src/main/resources/openapi/sources/schemas/wot-thingDescription.yml
+++ b/documentation/src/main/resources/openapi/sources/schemas/wot-thingDescription.yml
@@ -102,7 +102,7 @@ properties:
   support:
     type: string
     format: iri-reference
-    example: "https://www.eclipse.org/ditto/"
+    example: "https://www.eclipse.dev/ditto/"
   created:
     type: string
     format: date-time
diff --git a/documentation/src/main/resources/pages/ditto/basic-errors.md b/documentation/src/main/resources/pages/ditto/basic-errors.md
index 3ea394459e..ce86ac8315 100644
--- a/documentation/src/main/resources/pages/ditto/basic-errors.md
+++ b/documentation/src/main/resources/pages/ditto/basic-errors.md
@@ -71,7 +71,7 @@ The optional href contains a link to Ditto documentation or external resources i
   "error": "messages:id.invalid",
   "message": "Thing ID 'foobar2000' is not valid!",
   "description": "It must conform to the namespaced entity ID notation (see Ditto documentation)",
-  "href": "https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id"
+  "href": "https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id"
 }
 ```
 
diff --git a/documentation/src/main/resources/pages/ditto/basic-wot-integration-example.md b/documentation/src/main/resources/pages/ditto/basic-wot-integration-example.md
index 2d2ecad67d..f41e0e5c8e 100644
--- a/documentation/src/main/resources/pages/ditto/basic-wot-integration-example.md
+++ b/documentation/src/main/resources/pages/ditto/basic-wot-integration-example.md
@@ -239,7 +239,7 @@ That should result in an HTTP status code `200` (OK) and return the following bo
       "scheme": "basic"
     }
   },
-  "support": "https://www.eclipse.org/ditto/",
+  "support": "https://www.eclipse.dev/ditto/",
   "created": "2022-02-16T11:48:22.192286Z",
   "forms": [
     {
@@ -570,7 +570,7 @@ That should result in an HTTP status code `200` (OK) and return the following bo
       "scheme": "basic"
     }
   },
-  "support": "https://www.eclipse.org/ditto/",
+  "support": "https://www.eclipse.dev/ditto/",
   "created": "2022-02-16T11:48:22.192286Z",
   "forms": [
     {
diff --git a/documentation/src/main/resources/pages/ditto/client-sdk-java.md b/documentation/src/main/resources/pages/ditto/client-sdk-java.md
index 9f0e8f82f4..7cb500dd0e 100644
--- a/documentation/src/main/resources/pages/ditto/client-sdk-java.md
+++ b/documentation/src/main/resources/pages/ditto/client-sdk-java.md
@@ -9,18 +9,18 @@ A client SDK for Java in order to interact with digital twins provided by an Ecl
 
 ## Features
 
-* Digital twin management: CRUD (create, read, update, delete) of Ditto [things](https://www.eclipse.org/ditto/basic-thing.html)
-* [Change notifications](https://www.eclipse.org/ditto/basic-changenotifications.html): 
+* Digital twin management: CRUD (create, read, update, delete) of Ditto [things](https://www.eclipse.dev/ditto/basic-thing.html)
+* [Change notifications](https://www.eclipse.dev/ditto/basic-changenotifications.html): 
   consume notifications whenever a "watched" digital twin is modified 
-* Send/receive [messages](https://www.eclipse.org/ditto/basic-messages.html) to/from devices connected via a digital twin
-* Use the [live channel](https://www.eclipse.org/ditto/protocol-twinlive.html#live) in order to react on commands directed
+* Send/receive [messages](https://www.eclipse.dev/ditto/basic-messages.html) to/from devices connected via a digital twin
+* Use the [live channel](https://www.eclipse.dev/ditto/protocol-twinlive.html#live) in order to react on commands directed
   to devices targeting their "live" state
 
 ## Communication channel
 
 The Ditto Java client interacts with an Eclipse Ditto backend via Ditto's 
-[WebSocket](https://www.eclipse.org/ditto/httpapi-protocol-bindings-websocket.html) sending and receiving messages
-in [Ditto Protocol](https://www.eclipse.org/ditto/protocol-overview.html).
+[WebSocket](https://www.eclipse.dev/ditto/httpapi-protocol-bindings-websocket.html) sending and receiving messages
+in [Ditto Protocol](https://www.eclipse.dev/ditto/protocol-overview.html).
 
 ## Usage
 
diff --git a/documentation/src/main/resources/pages/ditto/protocol/examples/policies/generated/exceptions/policies_id_invalid.md b/documentation/src/main/resources/pages/ditto/protocol/examples/policies/generated/exceptions/policies_id_invalid.md
index 1e3d24f6e1..8fc67f0aee 100644
--- a/documentation/src/main/resources/pages/ditto/protocol/examples/policies/generated/exceptions/policies_id_invalid.md
+++ b/documentation/src/main/resources/pages/ditto/protocol/examples/policies/generated/exceptions/policies_id_invalid.md
@@ -12,7 +12,7 @@
     "error": "policies:id.invalid",
     "message": "Policy ID 'invalid id' is not valid!",
     "description": "It must conform to the namespaced entity ID notation (see Ditto documentation)",
-    "href": "https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id"
+    "href": "https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id"
   },
   "status": 400
 }
diff --git a/documentation/src/main/resources/pages/ditto/protocol/examples/things/generated/exceptions/things_id_invalid.md b/documentation/src/main/resources/pages/ditto/protocol/examples/things/generated/exceptions/things_id_invalid.md
index da4235d7e7..df054faa27 100644
--- a/documentation/src/main/resources/pages/ditto/protocol/examples/things/generated/exceptions/things_id_invalid.md
+++ b/documentation/src/main/resources/pages/ditto/protocol/examples/things/generated/exceptions/things_id_invalid.md
@@ -12,7 +12,7 @@
     "error": "things:id.invalid",
     "message": "Thing ID 'invalid id' is not valid!",
     "description": "It must conform to the namespaced entity ID notation (see Ditto documentation)",
-    "url": "https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id"
+    "url": "https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id"
   },
   "status": 400
 }
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_080M2.md b/documentation/src/main/resources/pages/ditto/release_notes_080M2.md
index e49c2f3ec8..713a53ac0d 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_080M2.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_080M2.md
@@ -51,7 +51,7 @@ The new feature is documented as [change notification filters](basic-changenotif
 
 Ditto's APIs now support `If-Match` and `If-None-Match` headers specified in 
 [rfc7232](https://tools.ietf.org/html/rfc7232#section-3.2) for `things` and `policies` resources. Have a look at the
-new [documentation for conditional requests](https://www.eclipse.org/ditto/httpapi-concepts.html) for how this concept
+new [documentation for conditional requests](https://www.eclipse.dev/ditto/httpapi-concepts.html) for how this concept
 can help with advanced interaction-patterns with your twins.
 
 
diff --git a/documentation/src/main/resources/pages/ditto/release_notes_100M1a.md b/documentation/src/main/resources/pages/ditto/release_notes_100M1a.md
index c2e56e1757..7f7bb9007f 100644
--- a/documentation/src/main/resources/pages/ditto/release_notes_100M1a.md
+++ b/documentation/src/main/resources/pages/ditto/release_notes_100M1a.md
@@ -50,7 +50,7 @@ Contribution was extracted from former commercial-only client - all references t
 ### [Configurable authorization servers](https://github.com/eclipse-ditto/ditto/pull/477)
 
 Eclipse Ditto now supports all OAuth 2.0 providers which implement OpenID Connect out-of-the-box. See this 
-[blog post](https://www.eclipse.org/ditto/2019-08-28-openid-connect.html) for more details.
+[blog post](https://www.eclipse.dev/ditto/2019-08-28-openid-connect.html) for more details.
  
 ### [Fine grained access for connections](https://github.com/eclipse-ditto/ditto/pull/463)
 
diff --git a/documentation/src/main/resources/slides/2018_02_07-virtualiot-meetup/index.html b/documentation/src/main/resources/slides/2018_02_07-virtualiot-meetup/index.html
index 0b3803480a..991f7ef58f 100644
--- a/documentation/src/main/resources/slides/2018_02_07-virtualiot-meetup/index.html
+++ b/documentation/src/main/resources/slides/2018_02_07-virtualiot-meetup/index.html
@@ -284,7 +284,7 @@ <h2>domain model</h2>
                 <br />
                 <br />
                 <img src="../../images/pages/basic/ditto-class-diagram-v2.png" alt="Ditto class diagram v2" class="fragment"/>
-                <a href="https://www.eclipse.org/ditto/basic-overview.html#domain-model">→ docs</a>
+                <a href="https://www.eclipse.dev/ditto/basic-overview.html#domain-model">→ docs</a>
             </section>
             <section id="ditto-3" style="clear: both;">
                 <h2>turn device data into API</h2>
@@ -326,7 +326,7 @@ <h2>turn device data into API</h2>
 
 
 </code></pre>
-                    <a href="https://www.eclipse.org/ditto/httpapi-concepts.html#endpoints" style="float: right;">→ docs</a>
+                    <a href="https://www.eclipse.dev/ditto/httpapi-concepts.html#endpoints" style="float: right;">→ docs</a>
                 </div>
             </section>
             <section id="ditto-4" style="clear: both">
@@ -344,7 +344,7 @@ <h2>Ditto Protocol API</h2>
   },
   "revision": 42
 }</code></pre>
-                <a href="https://www.eclipse.org/ditto/protocol-overview.html" style="float: right;">→ docs</a>
+                <a href="https://www.eclipse.dev/ditto/protocol-overview.html" style="float: right;">→ docs</a>
             </section>
             <section id="ditto-5" style="clear: both">
                 <h2>access control</h2>
@@ -394,7 +394,7 @@ <h3>API v2: Policy</h3>
     }
   }
 }</code></pre>
-                    <a href="https://www.eclipse.org/ditto/basic-auth.html#authorization" style="float: right;">→ docs</a>
+                    <a href="https://www.eclipse.dev/ditto/basic-auth.html#authorization" style="float: right;">→ docs</a>
                 </div>
             </section>
             <section id="ditto-6" style="clear: both;">
@@ -415,7 +415,7 @@ <h2>twin vs. live</h2>
                         <li>endpoints process commands, emit events</li>
                     </ul>
                     <img src="../../images/pages/protocol/ditto-live-channel.png" alt="Ditto live channel" />
-                    <a href="https://www.eclipse.org/ditto/protocol-twinlive.html" style="float: right;">→ docs</a>
+                    <a href="https://www.eclipse.dev/ditto/protocol-twinlive.html" style="float: right;">→ docs</a>
                 </div>
             </section>
             <section id="ditto-7" style="clear: both;">
@@ -434,7 +434,7 @@ <h3>via WebSocket</h3>
                     <ul style="font-size: 0.7em">
                         <li>bidirectionally send/receive Ditto Protocol messages</li>
                     </ul>
-                    <a href="https://www.eclipse.org/ditto/httpapi-protocol-bindings-websocket.html" style="float: right;">→ docs</a>
+                    <a href="https://www.eclipse.dev/ditto/httpapi-protocol-bindings-websocket.html" style="float: right;">→ docs</a>
                 </div>
                 <div style="text-align: left; float: right; width: 48%" class="fragment">
                     <h3>via SSEs</h3>
@@ -446,7 +446,7 @@ <h3>via SSEs</h3>
                     <ul style="font-size: 0.7em">
                         <li>unidirectionally receive changes in Thing JSON form</li>
                     </ul>
-                    <a href="https://www.eclipse.org/ditto/httpapi-sse.html" style="float: right;">→ docs</a>
+                    <a href="https://www.eclipse.dev/ditto/httpapi-sse.html" style="float: right;">→ docs</a>
                 </div>
             </section>
             <section id="ditto-8" style="clear: both;">
@@ -478,7 +478,7 @@ <h2>search</h2>
                         <li>apply field projection over the results</li>
                         <li>don't worry about indexing</li>
                     </ul>
-                    <a href="https://www.eclipse.org/ditto/basic-search.html" style="float: right;">→ docs</a>
+                    <a href="https://www.eclipse.dev/ditto/basic-search.html" style="float: right;">→ docs</a>
                 </div>
             </section>
             <section id="ditto-9" style="clear: both;">
@@ -582,7 +582,7 @@ <h1>Q & A</h1>
                 <h3>thanks for attending</h3>
                 <br/>
                 <br/>
-                <a href="https://www.eclipse.org/ditto/feedback.html">reach out to the Ditto team</a>
+                <a href="https://www.eclipse.dev/ditto/feedback.html">reach out to the Ditto team</a>
             </section>
         </section>
     </div>
@@ -593,7 +593,7 @@ <h3>thanks for attending</h3>
     Copyright ©2018
     <a href="https://www.bosch-si.com" target="_blank">Bosch Software Innovations GmbH</a> All rights reserved. |
     <a href="https://www.bosch.com/terms-of-use/terms-of-use/provider/" target="_blank">Imprint</a> |
-    <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
+    <a href="https://www.eclipse.dev/ditto/intro-overview.html" target="_blank">Documentation</a> |
     <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
     <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
diff --git a/documentation/src/main/resources/slides/2018_05_23-meetup-iot-hessen/index.html b/documentation/src/main/resources/slides/2018_05_23-meetup-iot-hessen/index.html
index 2c8594095a..db7d68f7b3 100644
--- a/documentation/src/main/resources/slides/2018_05_23-meetup-iot-hessen/index.html
+++ b/documentation/src/main/resources/slides/2018_05_23-meetup-iot-hessen/index.html
@@ -328,7 +328,7 @@ <h2>domain model</h2>
                 <br />
                 <br />
                 <img src="../../images/pages/basic/ditto-class-diagram-v2.png" alt="Ditto class diagram v2" class="fragment"/>
-                <a href="https://www.eclipse.org/ditto/basic-overview.html#domain-model">→ docs</a>
+                <a href="https://www.eclipse.dev/ditto/basic-overview.html#domain-model">→ docs</a>
             </section>
             <section id="ditto-3" style="clear: both;">
                 <h2>turn device data into API</h2>
@@ -370,7 +370,7 @@ <h2>turn device data into API</h2>
 
 
 </code></pre>
-                    <a href="https://www.eclipse.org/ditto/httpapi-concepts.html#endpoints" style="float: right;">→ docs</a>
+                    <a href="https://www.eclipse.dev/ditto/httpapi-concepts.html#endpoints" style="float: right;">→ docs</a>
                 </div>
             </section>
             <section id="ditto-4" style="clear: both;">
@@ -400,7 +400,7 @@ <h2>Ditto Protocol API</h2>
   },
   "revision": 42
 }</code></pre>
-                <a href="https://www.eclipse.org/ditto/protocol-overview.html" style="float: right;">→ docs</a>
+                <a href="https://www.eclipse.dev/ditto/protocol-overview.html" style="float: right;">→ docs</a>
             </section>
             <section id="ditto-6" style="clear: both">
                 <h2>access control</h2>
@@ -450,7 +450,7 @@ <h3>API v2: Policy</h3>
     }
   }
 }</code></pre>
-                    <a href="https://www.eclipse.org/ditto/basic-auth.html#authorization" style="float: right;">→ docs</a>
+                    <a href="https://www.eclipse.dev/ditto/basic-auth.html#authorization" style="float: right;">→ docs</a>
                 </div>
             </section>
             <section id="ditto-7" style="clear: both;">
@@ -471,7 +471,7 @@ <h2>twin vs. live</h2>
                         <li>endpoints process commands, emit events</li>
                     </ul>
                     <img src="../../images/pages/protocol/ditto-live-channel.png" alt="Ditto live channel" />
-                    <a href="https://www.eclipse.org/ditto/protocol-twinlive.html" style="float: right;">→ docs</a>
+                    <a href="https://www.eclipse.dev/ditto/protocol-twinlive.html" style="float: right;">→ docs</a>
                 </div>
             </section>
             <section id="ditto-8" style="clear: both;">
@@ -490,7 +490,7 @@ <h3>via WebSocket</h3>
                     <ul style="font-size: 0.7em">
                         <li>bidirectionally send/receive Ditto Protocol messages</li>
                     </ul>
-                    <a href="https://www.eclipse.org/ditto/httpapi-protocol-bindings-websocket.html" style="float: right;">→ docs</a>
+                    <a href="https://www.eclipse.dev/ditto/httpapi-protocol-bindings-websocket.html" style="float: right;">→ docs</a>
                 </div>
                 <div style="text-align: left; float: right; width: 48%" class="fragment">
                     <h3>via SSEs</h3>
@@ -502,7 +502,7 @@ <h3>via SSEs</h3>
                     <ul style="font-size: 0.7em">
                         <li>unidirectionally receive changes in Thing JSON form</li>
                     </ul>
-                    <a href="https://www.eclipse.org/ditto/httpapi-sse.html" style="float: right;">→ docs</a>
+                    <a href="https://www.eclipse.dev/ditto/httpapi-sse.html" style="float: right;">→ docs</a>
                 </div>
             </section>
             <section id="ditto-9" style="clear: both;">
@@ -514,7 +514,7 @@ <h3>notifications also possible via</h3>
                     <li>AMQP <b>0.9.1</b> broker (e.g. RabbitMQ)</li>
                 </ul>
                 <h3 class="fragment" style="margin-top: 1em">Ditto manages connections to those since version 0.3.0-M1</h3>
-                <a href="https://www.eclipse.org/ditto/connectivity-overview.html" style="float: right;">→ docs</a>
+                <a href="https://www.eclipse.dev/ditto/connectivity-overview.html" style="float: right;">→ docs</a>
             </section>
             <section id="ditto-10" style="clear: both;">
                 <h2>search</h2>
@@ -545,7 +545,7 @@ <h2>search</h2>
                         <li>apply field projection over the results</li>
                         <li>don't worry about indexing</li>
                     </ul>
-                    <a href="https://www.eclipse.org/ditto/basic-search.html" style="float: right;">→ docs</a>
+                    <a href="https://www.eclipse.dev/ditto/basic-search.html" style="float: right;">→ docs</a>
                 </div>
             </section>
             <section id="ditto-11" style="clear: both;">
@@ -681,7 +681,7 @@ <h1>Q & A</h1>
     Copyright ©2018
     <a href="https://www.bosch-si.com" target="_blank">Bosch Software Innovations GmbH</a> All rights reserved. |
     <a href="https://www.bosch.com/terms-of-use/terms-of-use/provider/" target="_blank">Imprint</a> |
-    <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
+    <a href="https://www.eclipse.dev/ditto/intro-overview.html" target="_blank">Documentation</a> |
     <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
     <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
diff --git a/documentation/src/main/resources/slides/2018_10_22-eclipse-iot-wg-f2f-ludwigsburg/index.html b/documentation/src/main/resources/slides/2018_10_22-eclipse-iot-wg-f2f-ludwigsburg/index.html
index b9cd0e9893..4eed06f4e0 100644
--- a/documentation/src/main/resources/slides/2018_10_22-eclipse-iot-wg-f2f-ludwigsburg/index.html
+++ b/documentation/src/main/resources/slides/2018_10_22-eclipse-iot-wg-f2f-ludwigsburg/index.html
@@ -299,7 +299,7 @@ <h2>Collaboration</h2>
   Copyright ©2018
   <a href="https://www.bosch-si.com" target="_blank">Bosch Software Innovations GmbH</a> All rights reserved. |
   <a href="https://www.bosch.com/terms-of-use/terms-of-use/provider/" target="_blank">Imprint</a> |
-  <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
+  <a href="https://www.eclipse.dev/ditto/intro-overview.html" target="_blank">Documentation</a> |
   <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
   <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
diff --git a/documentation/src/main/resources/slides/2019_10_21-eclipse-iot-wg-f2f-ludwigsburg/index.html b/documentation/src/main/resources/slides/2019_10_21-eclipse-iot-wg-f2f-ludwigsburg/index.html
index 9c31b55760..854a75f6e8 100644
--- a/documentation/src/main/resources/slides/2019_10_21-eclipse-iot-wg-f2f-ludwigsburg/index.html
+++ b/documentation/src/main/resources/slides/2019_10_21-eclipse-iot-wg-f2f-ludwigsburg/index.html
@@ -306,7 +306,7 @@ <h2>Challenges</h2>
   Copyright ©2018
   <a href="https://www.bosch-si.com" target="_blank">Bosch Software Innovations GmbH</a> All rights reserved. |
   <a href="https://www.bosch.com/terms-of-use/terms-of-use/provider/" target="_blank">Imprint</a> |
-  <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
+  <a href="https://www.eclipse.dev/ditto/intro-overview.html" target="_blank">Documentation</a> |
   <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
   <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
diff --git a/documentation/src/main/resources/slides/2020_04_16-ttn-virtual-conference/index.html b/documentation/src/main/resources/slides/2020_04_16-ttn-virtual-conference/index.html
index 3e8308338c..1eb087f76d 100644
--- a/documentation/src/main/resources/slides/2020_04_16-ttn-virtual-conference/index.html
+++ b/documentation/src/main/resources/slides/2020_04_16-ttn-virtual-conference/index.html
@@ -349,7 +349,7 @@ <h2>turn device data into APIs</h2>
 
 
 </code></pre>
-                    <a href="https://www.eclipse.org/ditto/httpapi-concepts.html#endpoints" style="float: right;">→ docs</a>
+                    <a href="https://www.eclipse.dev/ditto/httpapi-concepts.html#endpoints" style="float: right;">→ docs</a>
                 </div>
             </section>
             <section id="ditto-3" style="clear: both;">
@@ -404,7 +404,7 @@ <h2>authorization</h2>
       }
     }
   }</code></pre>
-              <a href="https://www.eclipse.org/ditto/basic-auth.html#authorization" style="float: right;">→ docs</a>
+              <a href="https://www.eclipse.dev/ditto/basic-auth.html#authorization" style="float: right;">→ docs</a>
             </div>
           </section>
           <section id="ditto-5" style="clear: both;">
@@ -436,7 +436,7 @@ <h2>search</h2>
                 <li>apply field projection over the results</li>
                 <li>don't worry about indexing</li>
               </ul>
-              <a href="https://www.eclipse.org/ditto/basic-search.html" style="float: right;">→ docs</a>
+              <a href="https://www.eclipse.dev/ditto/basic-search.html" style="float: right;">→ docs</a>
             </div>
           </section>
           <section id="ditto-6" style="clear: both;">
@@ -455,7 +455,7 @@ <h2>get notified about changes</h2>
   console.log('received: ' + msg.data);
 };</code></pre>
               <p style="text-align: left; font-size: 0.7em">example of WebSocket browser API</p>
-              <a href="https://www.eclipse.org/ditto/basic-changenotifications.html" style="float: right;">→ docs</a>
+              <a href="https://www.eclipse.dev/ditto/basic-changenotifications.html" style="float: right;">→ docs</a>
             </div>
           </section>
             <section id="ditto-7" style="clear: both;">
@@ -542,7 +542,7 @@ <h4 class="fragment"><b>* used now</b> for the hands-on part</h4>
             <section id="hands-on" class="new-chapter" data-background="../bg-images/background-demo-small.jpg" data-state="chapter-background">
                 <h1>hands-on time!</h1>
                 <br/>
-                <h3><a href="https://www.eclipse.org/ditto/2020-04-16-connecting-to-ttn-via-mqtt.html">Step-by-step blogpost</a></h3>
+                <h3><a href="https://www.eclipse.dev/ditto/2020-04-16-connecting-to-ttn-via-mqtt.html">Step-by-step blogpost</a></h3>
             </section>
         </section>
 
@@ -602,7 +602,7 @@ <h3>thanks to The Things Network for organising this virtual conference</h3>
 <div class="footer">
     Copyright ©2020
     <a href="https://www.bosch.io" target="_blank">Bosch.IO GmbH</a> All rights reserved. |
-    <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
+    <a href="https://www.eclipse.dev/ditto/intro-overview.html" target="_blank">Documentation</a> |
     <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
     <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
diff --git a/documentation/src/main/resources/slides/2020_07_28-iot-wg-status-update/index.html b/documentation/src/main/resources/slides/2020_07_28-iot-wg-status-update/index.html
index ed3bfe740d..95de55b514 100644
--- a/documentation/src/main/resources/slides/2020_07_28-iot-wg-status-update/index.html
+++ b/documentation/src/main/resources/slides/2020_07_28-iot-wg-status-update/index.html
@@ -279,7 +279,7 @@ <h2>Achievements</h2>
           </li>
         </ul>
         <h4 style="text-align: left; margin-top: 1em;" class="fragment">LoRaWAN Virtual Conference:
-          <a href="https://www.eclipse.org/ditto/slides/2020_04_16-ttn-virtual-conference/">workshop</a> +
+          <a href="https://www.eclipse.dev/ditto/slides/2020_04_16-ttn-virtual-conference/">workshop</a> +
           <a href="https://youtu.be/D33JrN2RWiI">YouTube recording</a>
         </h4>
       </section>
@@ -312,7 +312,7 @@ <h2>Roadmap</h2>
 <div class="footer">
     Copyright ©2020
     <a href="https://www.bosch.io" target="_blank">Bosch.IO GmbH</a> All rights reserved. |
-    <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
+    <a href="https://www.eclipse.dev/ditto/intro-overview.html" target="_blank">Documentation</a> |
     <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
     <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
diff --git a/documentation/src/main/resources/slides/2020_10_19-eclipse-iot-wg-community-day/index.html b/documentation/src/main/resources/slides/2020_10_19-eclipse-iot-wg-community-day/index.html
index f9f92594b7..1091f1204e 100644
--- a/documentation/src/main/resources/slides/2020_10_19-eclipse-iot-wg-community-day/index.html
+++ b/documentation/src/main/resources/slides/2020_10_19-eclipse-iot-wg-community-day/index.html
@@ -315,7 +315,7 @@ <h2>Achievements</h2>
         </li>
       </ul>
       <h4 style="text-align: left; margin-top: 1em;" class="fragment">LoRaWAN Virtual Conference:
-        <a href="https://www.eclipse.org/ditto/slides/2020_04_16-ttn-virtual-conference/">workshop</a> +
+        <a href="https://www.eclipse.dev/ditto/slides/2020_04_16-ttn-virtual-conference/">workshop</a> +
         <a href="https://youtu.be/D33JrN2RWiI">YouTube recording</a>
       </h4>
     </section>
@@ -361,7 +361,7 @@ <h2>Roadmap</h2>
 <div class="footer">
   Copyright ©2020
   <a href="https://www.bosch.io" target="_blank">Bosch.IO GmbH</a> All rights reserved. |
-  <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
+  <a href="https://www.eclipse.dev/ditto/intro-overview.html" target="_blank">Documentation</a> |
   <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
   <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
diff --git a/documentation/src/main/resources/slides/2021_05_ditto-introduction-deck/index.html b/documentation/src/main/resources/slides/2021_05_ditto-introduction-deck/index.html
index eb06469162..51b58f0e2a 100644
--- a/documentation/src/main/resources/slides/2021_05_ditto-introduction-deck/index.html
+++ b/documentation/src/main/resources/slides/2021_05_ditto-introduction-deck/index.html
@@ -359,7 +359,7 @@ <h2>turn device data into APIs</h2>
 
 
 </code></pre>
-                    <a href="https://www.eclipse.org/ditto/httpapi-concepts.html#endpoints" style="float: right; font-size: 0.7em">→ docs</a>
+                    <a href="https://www.eclipse.dev/ditto/httpapi-concepts.html#endpoints" style="float: right; font-size: 0.7em">→ docs</a>
                 </div>
             </section>
             <section id="ditto-3" style="clear: both;">
@@ -372,7 +372,7 @@ <h2>modeling thing capabilities</h2>
               </div>
               <div style="text-align: left; float: right; width: 25%">
                 <img src="../../images/pages/basic/ditto-thing-feature-definition-model.png" style="width: 110%" alt="Ditto thing feature definition model">
-                <a href="https://www.eclipse.org/ditto/basic-feature.html#feature-definition" style="float: right; font-size: 0.7em">→ docs</a>
+                <a href="https://www.eclipse.dev/ditto/basic-feature.html#feature-definition" style="float: right; font-size: 0.7em">→ docs</a>
               </div>
 
               <ul style="clear: both">
@@ -437,7 +437,7 @@ <h2>authorization</h2>
       }
     }
   }</code></pre>
-              <a href="https://www.eclipse.org/ditto/basic-auth.html#authorization" style="float: right; font-size: 0.7em">→ docs</a>
+              <a href="https://www.eclipse.dev/ditto/basic-auth.html#authorization" style="float: right; font-size: 0.7em">→ docs</a>
             </div>
           </section>
           <section id="ditto-6" style="clear: both;">
@@ -469,7 +469,7 @@ <h2>search</h2>
                 <li>apply field projection over the results</li>
                 <li>don't worry about indexing</li>
               </ul>
-              <a href="https://www.eclipse.org/ditto/basic-search.html" style="float: right; font-size: 0.7em">→ docs</a>
+              <a href="https://www.eclipse.dev/ditto/basic-search.html" style="float: right; font-size: 0.7em">→ docs</a>
             </div>
           </section>
           <section id="ditto-7" style="clear: both;">
@@ -487,7 +487,7 @@ <h2>get notified about changes</h2>
 ws.onmessage = function(msg) {
   console.log('received: ' + msg.data);
 };</code></pre>
-              <a href="https://www.eclipse.org/ditto/basic-changenotifications.html" style="float: right; font-size: 0.7em">→ docs</a>
+              <a href="https://www.eclipse.dev/ditto/basic-changenotifications.html" style="float: right; font-size: 0.7em">→ docs</a>
               <p style="text-align: left; font-size: 0.7em">example of WebSocket browser API</p>
             </div>
           </section>
@@ -554,7 +554,7 @@ <h2>could benefit from each other</h2>
 <!--            <section id="hands-on" class="new-chapter" data-background="../bg-images/background-demo-small.jpg" data-state="chapter-background">-->
 <!--                <h1>hands-on time!</h1>-->
 <!--                <br/>-->
-<!--                <h3><a href="https://www.eclipse.org/ditto/2020-04-16-connecting-to-ttn-via-mqtt.html">Step-by-step blogpost</a></h3>-->
+<!--                <h3><a href="https://www.eclipse.dev/ditto/2020-04-16-connecting-to-ttn-via-mqtt.html">Step-by-step blogpost</a></h3>-->
 <!--            </section>-->
 <!--        </section>-->
 
@@ -592,7 +592,7 @@ <h1>Wrap up</h1>
 <div class="footer">
     Copyright ©2021
     <a href="https://www.bosch.io" target="_blank">Bosch.IO GmbH</a> All rights reserved. |
-    <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
+    <a href="https://www.eclipse.dev/ditto/intro-overview.html" target="_blank">Documentation</a> |
     <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
     <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
diff --git a/documentation/src/main/resources/slides/2021_06_ditto-20-overview/index.html b/documentation/src/main/resources/slides/2021_06_ditto-20-overview/index.html
index 3d16be605f..61e96faf0b 100644
--- a/documentation/src/main/resources/slides/2021_06_ditto-20-overview/index.html
+++ b/documentation/src/main/resources/slides/2021_06_ditto-20-overview/index.html
@@ -300,7 +300,7 @@ <h3>Looking ahead</h3>
 <div class="footer">
     Copyright ©2021
     <a href="https://www.bosch.io" target="_blank">Bosch.IO GmbH</a> All rights reserved. |
-    <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
+    <a href="https://www.eclipse.dev/ditto/intro-overview.html" target="_blank">Documentation</a> |
     <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
     <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
diff --git a/documentation/src/main/resources/slides/2021_06_ditto-in-20-min/index.html b/documentation/src/main/resources/slides/2021_06_ditto-in-20-min/index.html
index 08fca90e49..f14da83481 100644
--- a/documentation/src/main/resources/slides/2021_06_ditto-in-20-min/index.html
+++ b/documentation/src/main/resources/slides/2021_06_ditto-in-20-min/index.html
@@ -280,7 +280,7 @@ <h2>turn device data into APIs</h2>
 
 
 </code></pre>
-                    <a href="https://www.eclipse.org/ditto/httpapi-concepts.html#endpoints" style="float: right; font-size: 0.7em">→ docs</a>
+                    <a href="https://www.eclipse.dev/ditto/httpapi-concepts.html#endpoints" style="float: right; font-size: 0.7em">→ docs</a>
                 </div>
             </section>
             <section id="ditto-3" style="clear: both;">
@@ -293,7 +293,7 @@ <h2>modeling thing capabilities</h2>
               </div>
               <div style="text-align: left; float: right; width: 25%">
                 <img src="../../images/pages/basic/ditto-thing-feature-definition-model.png" style="width: 110%" alt="Ditto thing feature definition model">
-                <a href="https://www.eclipse.org/ditto/basic-feature.html#feature-definition" style="float: right; font-size: 0.7em">→ docs</a>
+                <a href="https://www.eclipse.dev/ditto/basic-feature.html#feature-definition" style="float: right; font-size: 0.7em">→ docs</a>
               </div>
 
               <ul style="clear: both">
@@ -326,7 +326,7 @@ <h2>authorization</h2>
                 <li class="fragment" style="margin-top: 1em;">every API call is authorized</li>
               </ul>
             </div>
-            <a href="https://www.eclipse.org/ditto/basic-auth.html#authorization" style="float: right; font-size: 0.7em">→ docs</a>
+            <a href="https://www.eclipse.dev/ditto/basic-auth.html#authorization" style="float: right; font-size: 0.7em">→ docs</a>
           </section>
           <section id="ditto-6" style="clear: both;">
             <h2>search</h2>
@@ -357,7 +357,7 @@ <h2>search</h2>
                 <li>apply field projection over the results</li>
                 <li>don't worry about indexing</li>
               </ul>
-              <a href="https://www.eclipse.org/ditto/basic-search.html" style="float: right; font-size: 0.7em">→ docs</a>
+              <a href="https://www.eclipse.dev/ditto/basic-search.html" style="float: right; font-size: 0.7em">→ docs</a>
             </div>
           </section>
           <section id="ditto-7" style="clear: both;">
@@ -368,7 +368,7 @@ <h2>get notified about changes</h2>
               <li class="fragment" style="margin-top: 1em;">server side filtering via RQL (same as in search)</li>
             </ul>
             <div class="fragment">
-              <a href="https://www.eclipse.org/ditto/basic-changenotifications.html" style="float: right; font-size: 0.7em">→ docs</a>
+              <a href="https://www.eclipse.dev/ditto/basic-changenotifications.html" style="float: right; font-size: 0.7em">→ docs</a>
             </div>
           </section>
         </section>
@@ -427,7 +427,7 @@ <h1>Wrap up</h1>
 <div class="footer">
     Copyright ©2021
     <a href="https://www.bosch.io" target="_blank">Bosch.IO GmbH</a> All rights reserved. |
-    <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
+    <a href="https://www.eclipse.dev/ditto/intro-overview.html" target="_blank">Documentation</a> |
     <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
     <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
diff --git a/documentation/src/main/resources/slides/2021_10_25-eclipse-iot-wg-community-day/index.html b/documentation/src/main/resources/slides/2021_10_25-eclipse-iot-wg-community-day/index.html
index d17d5882b5..e9d278b4f4 100644
--- a/documentation/src/main/resources/slides/2021_10_25-eclipse-iot-wg-community-day/index.html
+++ b/documentation/src/main/resources/slides/2021_10_25-eclipse-iot-wg-community-day/index.html
@@ -324,7 +324,7 @@ <h2>Roadmap</h2>
 <div class="footer">
   Copyright ©2021
   <a href="https://www.bosch.io" target="_blank">Bosch.IO GmbH</a> All rights reserved. |
-  <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
+  <a href="https://www.eclipse.dev/ditto/intro-overview.html" target="_blank">Documentation</a> |
   <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
   <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
diff --git a/documentation/src/main/resources/slides/2022_10_24_eclipse-iot-wg-community-day/index.html b/documentation/src/main/resources/slides/2022_10_24_eclipse-iot-wg-community-day/index.html
index feeb321887..49cab5a4c3 100644
--- a/documentation/src/main/resources/slides/2022_10_24_eclipse-iot-wg-community-day/index.html
+++ b/documentation/src/main/resources/slides/2022_10_24_eclipse-iot-wg-community-day/index.html
@@ -348,7 +348,7 @@ <h2>Roadmap</h2>
 <div class="footer">
     Copyright ©2022
     <a href="https://www.bosch.io" target="_blank">Bosch.IO GmbH</a> All rights reserved. |
-    <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
+    <a href="https://www.eclipse.dev/ditto/intro-overview.html" target="_blank">Documentation</a> |
     <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
     <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
diff --git a/documentation/src/main/resources/slides/2022_10_ditto-and-wot/index.html b/documentation/src/main/resources/slides/2022_10_ditto-and-wot/index.html
index b77e23bf34..d740006584 100644
--- a/documentation/src/main/resources/slides/2022_10_ditto-and-wot/index.html
+++ b/documentation/src/main/resources/slides/2022_10_ditto-and-wot/index.html
@@ -288,7 +288,7 @@ <h2>turn device data into APIs</h2>
 
 </code></pre>
                   <p style="text-align: center">HTTP API of the Thing</p>
-                    <a href="https://www.eclipse.org/ditto/httpapi-concepts.html#endpoints" style="float: right; font-size: 0.7em">→ docs</a>
+                    <a href="https://www.eclipse.dev/ditto/httpapi-concepts.html#endpoints" style="float: right; font-size: 0.7em">→ docs</a>
                 </div>
             </section>
           <section id="ditto-3" style="clear: both;">
@@ -325,7 +325,7 @@ <h2>modeling thing capabilities</h2>
     }
   }
 }</code></pre>
-              <a href="https://www.eclipse.org/ditto/basic-feature.html#feature-definition" style="float: right; font-size: 0.7em">→ docs</a>
+              <a href="https://www.eclipse.dev/ditto/basic-feature.html#feature-definition" style="float: right; font-size: 0.7em">→ docs</a>
             </div>
           </section>
             <section id="ditto-4" style="clear: both;">
@@ -352,7 +352,7 @@ <h2>persistence of device state</h2>
 <!--                <li style="margin-top: 1em;">every API call is authorized</li>-->
 <!--              </ul>-->
 <!--            </div>-->
-<!--            <a href="https://www.eclipse.org/ditto/basic-auth.html#authorization" style="float: right; font-size: 0.7em">→ docs</a>-->
+<!--            <a href="https://www.eclipse.dev/ditto/basic-auth.html#authorization" style="float: right; font-size: 0.7em">→ docs</a>-->
 <!--          </section>-->
           <section id="ditto-6" style="clear: both;">
             <h2>search</h2>
@@ -382,7 +382,7 @@ <h2>search</h2>
                 <li>apply field projection over the results</li>
                 <li>don't worry about indexing</li>
               </ul>
-              <a href="https://www.eclipse.org/ditto/basic-search.html" style="float: right; font-size: 0.7em">→ docs</a>
+              <a href="https://www.eclipse.dev/ditto/basic-search.html" style="float: right; font-size: 0.7em">→ docs</a>
             </div>
           </section>
 <!--          <section id="ditto-7" style="clear: both;">-->
@@ -393,7 +393,7 @@ <h2>search</h2>
 <!--              <li class="fragment" data-fragment-index="1" style="margin-top: 1em;">server side filtering via RQL (same as in search)</li>-->
 <!--            </ul>-->
 <!--            <div class="fragment" data-fragment-index="1">-->
-<!--              <a href="https://www.eclipse.org/ditto/basic-changenotifications.html" style="float: right; font-size: 0.7em">→ docs</a>-->
+<!--              <a href="https://www.eclipse.dev/ditto/basic-changenotifications.html" style="float: right; font-size: 0.7em">→ docs</a>-->
 <!--            </div>-->
 <!--          </section>-->
         </section>
@@ -521,8 +521,8 @@ <h2>Demo</h2>
               <h2>Links</h2>
               <br/>
               <ul>
-                <li><a target="_blank" href="https://www.eclipse.org/ditto/2022-03-03-wot-integration.html">Ditto Blogpost about WoT integration</a></li>
-                <li><a target="_blank" href="https://www.eclipse.org/ditto/basic-wot-integration.html">Ditto docs about WoT integration</a></li>
+                <li><a target="_blank" href="https://www.eclipse.dev/ditto/2022-03-03-wot-integration.html">Ditto Blogpost about WoT integration</a></li>
+                <li><a target="_blank" href="https://www.eclipse.dev/ditto/basic-wot-integration.html">Ditto docs about WoT integration</a></li>
                 <li><a target="_blank" href="https://github.com/eclipse-ditto/ditto">GitHub</a> - please give us a star ;)</li>
                 <li><a target="_blank" href="https://gitter.im/eclipse/ditto">Chatroom to ask more questions</a></li>
               </ul>
@@ -535,7 +535,7 @@ <h2>Links</h2>
 <div class="footer">
     Copyright ©2022
     <a href="https://www.bosch.io" target="_blank">Bosch.IO GmbH</a> All rights reserved. |
-    <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
+    <a href="https://www.eclipse.dev/ditto/intro-overview.html" target="_blank">Documentation</a> |
     <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
     <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
diff --git a/documentation/src/main/resources/slides/2023_01_ditto-in-30-min/index.html b/documentation/src/main/resources/slides/2023_01_ditto-in-30-min/index.html
index 115339d5c2..ee315a963f 100644
--- a/documentation/src/main/resources/slides/2023_01_ditto-in-30-min/index.html
+++ b/documentation/src/main/resources/slides/2023_01_ditto-in-30-min/index.html
@@ -288,7 +288,7 @@ <h2>turn device data into APIs</h2>
 
 </code></pre>
                   <p style="text-align: center">HTTP API of the Thing</p>
-                    <a href="https://www.eclipse.org/ditto/httpapi-concepts.html#endpoints" style="float: right; font-size: 0.7em">→ docs</a>
+                    <a href="https://www.eclipse.dev/ditto/httpapi-concepts.html#endpoints" style="float: right; font-size: 0.7em">→ docs</a>
                 </div>
             </section>
           <section id="ditto-3" style="clear: both;">
@@ -325,7 +325,7 @@ <h2>modeling thing capabilities</h2>
     }
   }
 }</code></pre>
-              <a href="https://www.eclipse.org/ditto/basic-feature.html#feature-definition" style="float: right; font-size: 0.7em">→ docs</a>
+              <a href="https://www.eclipse.dev/ditto/basic-feature.html#feature-definition" style="float: right; font-size: 0.7em">→ docs</a>
             </div>
           </section>
           <section id="ditto-3b" style="clear: both;">
@@ -396,7 +396,7 @@ <h2>authorization</h2>
       }
     }
   }</code></pre>
-              <a href="https://www.eclipse.org/ditto/basic-auth.html#authorization" style="float: right;">→ docs</a>
+              <a href="https://www.eclipse.dev/ditto/basic-auth.html#authorization" style="float: right;">→ docs</a>
             </div>
           </section>
           <section id="ditto-6" style="clear: both;">
@@ -427,7 +427,7 @@ <h2>search</h2>
                 <li>apply field projection over the results</li>
                 <li>don't worry about indexing</li>
               </ul>
-              <a href="https://www.eclipse.org/ditto/basic-search.html" style="float: right; font-size: 0.7em">→ docs</a>
+              <a href="https://www.eclipse.dev/ditto/basic-search.html" style="float: right; font-size: 0.7em">→ docs</a>
             </div>
           </section>
           <section id="ditto-7" style="clear: both;">
@@ -438,7 +438,7 @@ <h2>get notified about changes</h2>
               <li class="fragment" data-fragment-index="1" style="margin-top: 1em;">server side filtering via RQL (same as in search)</li>
             </ul>
             <div class="fragment" data-fragment-index="1">
-              <a href="https://www.eclipse.org/ditto/basic-changenotifications.html" style="float: right; font-size: 0.7em">→ docs</a>
+              <a href="https://www.eclipse.dev/ditto/basic-changenotifications.html" style="float: right; font-size: 0.7em">→ docs</a>
             </div>
           </section>
           <section id="ditto-8" style="clear: both;">
@@ -495,8 +495,8 @@ <h2>Demo</h2>
               <h2>Links</h2>
               <br/>
               <ul>
-                <li><a target="_blank" href="https://www.eclipse.org/ditto/2022-03-03-wot-integration.html">Ditto Blogpost about WoT integration</a></li>
-                <li><a target="_blank" href="https://www.eclipse.org/ditto/basic-wot-integration.html">Ditto docs about WoT integration</a></li>
+                <li><a target="_blank" href="https://www.eclipse.dev/ditto/2022-03-03-wot-integration.html">Ditto Blogpost about WoT integration</a></li>
+                <li><a target="_blank" href="https://www.eclipse.dev/ditto/basic-wot-integration.html">Ditto docs about WoT integration</a></li>
                 <li><a target="_blank" href="https://github.com/eclipse-ditto/ditto">GitHub</a> - please give us a star ;)</li>
                 <li><a target="_blank" href="https://gitter.im/eclipse/ditto">Chatroom to ask more questions</a></li>
               </ul>
@@ -509,7 +509,7 @@ <h2>Links</h2>
 <div class="footer">
     Copyright ©2023
     <a href="https://www.bosch.io" target="_blank">Bosch.IO GmbH</a> All rights reserved. |
-    <a href="https://www.eclipse.org/ditto/intro-overview.html" target="_blank">Documentation</a> |
+    <a href="https://www.eclipse.dev/ditto/intro-overview.html" target="_blank">Documentation</a> |
     <a href="https://github.com/eclipse-ditto/ditto" target="_blank">GitHub</a> |
     <a href="https://ditto.eclipseprojects.io" target="_blank">Sandbox</a>
 </div>
diff --git a/documentation/src/main/resources/wot/ditto-extension.html b/documentation/src/main/resources/wot/ditto-extension.html
index 83809d8f1a..71297c2226 100644
--- a/documentation/src/main/resources/wot/ditto-extension.html
+++ b/documentation/src/main/resources/wot/ditto-extension.html
@@ -61,7 +61,7 @@
   <h1><img src="../images/ditto.svg" class="ditto-logo" alt="Eclipse Ditto logo"> - WoT Extension Ontology</h1>
   <section id="1-intro">
     <h2>1. Introduction</h2>
-    <p>This ontology provides additional <a href="https://www.eclipse.org/ditto/">Eclipse Ditto™</a> specific context for <a href="https://www.w3.org/WoT/">W3C Web of Things</a> TDs and TMs.</p>
+    <p>This ontology provides additional <a href="https://www.eclipse.dev/ditto/">Eclipse Ditto™</a> specific context for <a href="https://www.w3.org/WoT/">W3C Web of Things</a> TDs and TMs.</p>
   </section>
   <section id="2-formats">
     <h2>2. Formats</h2>
diff --git a/legal/NOTICE.md b/legal/NOTICE.md
index c5b2026dc6..8a361fe4b5 100644
--- a/legal/NOTICE.md
+++ b/legal/NOTICE.md
@@ -1,7 +1,7 @@
 
 This content is produced and maintained by the Eclipse Ditto project.
 
-* Project home: https://www.eclipse.org/ditto
+* Project home: https://www.eclipse.dev/ditto/
 
 # Trademarks
 
diff --git a/messages/model/src/main/java/org/eclipse/ditto/messages/model/ThingIdInvalidException.java b/messages/model/src/main/java/org/eclipse/ditto/messages/model/ThingIdInvalidException.java
index b5d830868c..d80a817efa 100755
--- a/messages/model/src/main/java/org/eclipse/ditto/messages/model/ThingIdInvalidException.java
+++ b/messages/model/src/main/java/org/eclipse/ditto/messages/model/ThingIdInvalidException.java
@@ -44,7 +44,7 @@ public final class ThingIdInvalidException extends EntityIdInvalidException impl
             "It must conform to the namespaced entity ID notation (see Ditto documentation)";
 
     private static final URI DEFAULT_HREF =
-            URI.create("https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id");
+            URI.create("https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id");
 
     private static final long serialVersionUID = -2426810319409279256L;
 
diff --git a/policies/model/src/main/java/org/eclipse/ditto/policies/model/PolicyIdInvalidException.java b/policies/model/src/main/java/org/eclipse/ditto/policies/model/PolicyIdInvalidException.java
index 95b7351fdd..d7802c6037 100755
--- a/policies/model/src/main/java/org/eclipse/ditto/policies/model/PolicyIdInvalidException.java
+++ b/policies/model/src/main/java/org/eclipse/ditto/policies/model/PolicyIdInvalidException.java
@@ -44,7 +44,7 @@ public final class PolicyIdInvalidException extends EntityIdInvalidException imp
     private static final String DEFAULT_DESCRIPTION =
             "It must conform to the namespaced entity ID notation (see Ditto documentation)";
 
-    private static final URI DEFAULT_HREF = URI.create("https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id");
+    private static final URI DEFAULT_HREF = URI.create("https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id");
 
     private static final long serialVersionUID = 8154256308793903738L;
 
diff --git a/pom.xml b/pom.xml
index 3a06ef5428..33ee0beedd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
 
     <name>Eclipse Ditto</name>
     <description>Eclipse Ditto is a framework for creating and managing digital twins in the IoT.</description>
-    <url>https://eclipse.org/ditto/</url>
+    <url>https://eclipse.dev/ditto/</url>
     <inceptionYear>2017</inceptionYear>
 
     <organization>
@@ -455,7 +455,7 @@
                         <instructions>
                             <Bundle-Vendor>Eclipse Ditto</Bundle-Vendor>
                             <Bundle-License>EPL-2.0</Bundle-License>
-                            <Bundle-DocURL>https://eclipse.org/ditto/</Bundle-DocURL>
+                            <Bundle-DocURL>https://eclipse.dev/ditto/</Bundle-DocURL>
                             <_noee>true</_noee>
                             <!-- stays at 1.8 as all exported bundles (json, model, protocol-adapter, signals, ...) are 1.8 -->
                             <Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
diff --git a/things/model/src/main/java/org/eclipse/ditto/things/model/ThingIdInvalidException.java b/things/model/src/main/java/org/eclipse/ditto/things/model/ThingIdInvalidException.java
index 000980d194..1c7799644b 100755
--- a/things/model/src/main/java/org/eclipse/ditto/things/model/ThingIdInvalidException.java
+++ b/things/model/src/main/java/org/eclipse/ditto/things/model/ThingIdInvalidException.java
@@ -44,7 +44,7 @@ public final class ThingIdInvalidException extends EntityIdInvalidException impl
             "It must conform to the namespaced entity ID notation (see Ditto documentation)";
 
     private static final URI DEFAULT_HREF =
-            URI.create("https://www.eclipse.org/ditto/basic-namespaces-and-names.html#namespaced-id");
+            URI.create("https://www.eclipse.dev/ditto/basic-namespaces-and-names.html#namespaced-id");
 
     private static final long serialVersionUID = -2026814719409279158L;
 
diff --git a/things/service/src/main/resources/things.conf b/things/service/src/main/resources/things.conf
index ef3ca2b5b0..22a4632ad3 100755
--- a/things/service/src/main/resources/things.conf
+++ b/things/service/src/main/resources/things.conf
@@ -185,7 +185,7 @@ ditto {
         #     }
         #   },
         #   "security": "oauth2_google_sc"
-        #   "support": "https://www.eclipse.org/ditto/"
+        #   "support": "https://www.eclipse.dev/ditto/"
         # }
 
         json-template {
@@ -196,7 +196,7 @@ ditto {
             }
           },
           "security": "basic_sc"
-          "support": "https://www.eclipse.org/ditto/"
+          "support": "https://www.eclipse.dev/ditto/"
         }
 
         placeholders {
diff --git a/ui/modules/connections/connectionTemplates.json b/ui/modules/connections/connectionTemplates.json
index b0bee479c1..ae9470baa8 100644
--- a/ui/modules/connections/connectionTemplates.json
+++ b/ui/modules/connections/connectionTemplates.json
@@ -160,7 +160,7 @@
       "javascript": {
         "mappingEngine": "JavaScript",
         "options": {
-          "incomingScript": "/**\n * Maps the passed parameters to a Ditto Protocol message.\n * @param {Object.<string, string>} headers - The headers Object containing all received header values\n * @param {string} [textPayload] - The String to be mapped\n * @param {ArrayBuffer} [bytePayload] - The bytes to be mapped as ArrayBuffer\n * @param {string} [contentType] - The received Content-Type, e.g. \"application/json\"\n * @returns {(DittoProtocolMessage|Array<DittoProtocolMessage>)} dittoProtocolMessage(s) -\n *  The mapped Ditto Protocol message,\n *  an array of Ditto Protocol messages or\n *  <code>null</code> if the message could/should not be mapped\n */\nfunction mapToDittoProtocolMsg(\n  headers,\n  textPayload,\n  bytePayload,\n  contentType\n) {\n\n  // ### Insert/adapt your mapping logic here.\n  // Use helper function Ditto.buildDittoProtocolMsg to build Ditto protocol message\n  // based on incoming payload.\n  // See https://www.eclipse.org/ditto/connectivity-mapping.html#helper-functions for details.\n\n  // ### example code assuming the Ditto protocol content type for incoming messages.\n  if (contentType === 'application/vnd.eclipse.ditto+json') {\n    // Message is sent as Ditto protocol text payload and can be used directly\n    return JSON.parse(textPayload);\n  } else if (contentType === 'application/octet-stream') {\n    // Message is sent as binary payload; assume Ditto protocol message (JSON).\n    try {\n      return JSON.parse(Ditto.arrayBufferToString(bytePayload));\n    } catch (e) {\n      // parsing failed (no JSON document); return null to drop the message\n      return null;\n    }\n  }\n\n  // no mapping logic matched; return null to drop the message\n  return null;\n}",
+          "incomingScript": "/**\n * Maps the passed parameters to a Ditto Protocol message.\n * @param {Object.<string, string>} headers - The headers Object containing all received header values\n * @param {string} [textPayload] - The String to be mapped\n * @param {ArrayBuffer} [bytePayload] - The bytes to be mapped as ArrayBuffer\n * @param {string} [contentType] - The received Content-Type, e.g. \"application/json\"\n * @returns {(DittoProtocolMessage|Array<DittoProtocolMessage>)} dittoProtocolMessage(s) -\n *  The mapped Ditto Protocol message,\n *  an array of Ditto Protocol messages or\n *  <code>null</code> if the message could/should not be mapped\n */\nfunction mapToDittoProtocolMsg(\n  headers,\n  textPayload,\n  bytePayload,\n  contentType\n) {\n\n  // ### Insert/adapt your mapping logic here.\n  // Use helper function Ditto.buildDittoProtocolMsg to build Ditto protocol message\n  // based on incoming payload.\n  // See https://www.eclipse.dev/ditto/connectivity-mapping.html#helper-functions for details.\n\n  // ### example code assuming the Ditto protocol content type for incoming messages.\n  if (contentType === 'application/vnd.eclipse.ditto+json') {\n    // Message is sent as Ditto protocol text payload and can be used directly\n    return JSON.parse(textPayload);\n  } else if (contentType === 'application/octet-stream') {\n    // Message is sent as binary payload; assume Ditto protocol message (JSON).\n    try {\n      return JSON.parse(Ditto.arrayBufferToString(bytePayload));\n    } catch (e) {\n      // parsing failed (no JSON document); return null to drop the message\n      return null;\n    }\n  }\n\n  // no mapping logic matched; return null to drop the message\n  return null;\n}",
           "outgoingScript": "/**\n * Maps the passed parameters which originated from a Ditto Protocol message to an external message.\n * @param {string} namespace - The namespace of the entity in java package notation, e.g.: \"org.eclipse.ditto\". Or \"_\"\n * (underscore) for connection announcements.\n * @param {string} name - The name of the entity, e.g.: \"device\".\n * @param {string} group - The affected group/entity: \"things\"|\"policies\"|\"connections\".\n * @param {string} channel - The channel for the signal: \"twin\"|\"live\"|\"none\"\n * @param {string} criterion - The criterion to apply: \"commands\"|\"events\"|\"search\"|\"messages\"|\"announcements\"|\"errors\".\n * @param {string} action - The action to perform: \"create\"|\"retrieve\"|\"modify\"|\"delete\". Or the announcement name:\n * \"opened\"|\"closed\"|\"subjectDeletion\". Or the subject of the message.\n * @param {string} path - The path which is affected by the message (e.g.: \"/attributes\"), or the destination\n * of a message (e.g.: \"inbox\"|\"outbox\").\n * @param {Object.<string, string>} dittoHeaders - The headers Object containing all Ditto Protocol header values.\n * @param {*} [value] - The value to apply / which was applied (e.g. in a \"modify\" action).\n * @param {number} [status] - The status code that indicates the result of the command. When this field is set,\n * it indicates that the Ditto Protocol Message contains a response.\n * @param {Object} [extra] - The enriched extra fields when selected via \"extraFields\" option.\n * @returns {(ExternalMessage|Array<ExternalMessage>)} externalMessage - The mapped external message, an array of\n * external messages or <code>null</code> if the message could/should not be mapped.\n */\nfunction mapFromDittoProtocolMsg(\n  namespace,\n  name,\n  group,\n  channel,\n  criterion,\n  action,\n  path,\n  dittoHeaders,\n  value,\n  status,\n  extra\n) {\n\n  // ###\n  // Insert your mapping logic here\n\n  // ### example code using the Ditto protocol content type.\n  let headers = dittoHeaders;\n  let textPayload = JSON.stringify(Ditto.buildDittoProtocolMsg(namespace, name, group, channel, criterion, action,\n                                                               path, dittoHeaders, value, status, extra));\n  let bytePayload = null;\n  let contentType = 'application/vnd.eclipse.ditto+json';\n\n  return Ditto.buildExternalMsg(\n      headers, // The external headers Object containing header values\n      textPayload, // The external mapped String\n      bytePayload, // The external mapped byte[]\n      contentType // The returned Content-Type\n  );\n}",
           "loadBytebufferJS": "false",
           "loadLongJS": "false"
diff --git a/wot/model/README.md b/wot/model/README.md
index 0677705a4f..9384c1e760 100755
--- a/wot/model/README.md
+++ b/wot/model/README.md
@@ -106,7 +106,7 @@ public final class TesterBuilder {
                         Arrays.asList(
                                 SingleUriAtContext.W3ORG_2022_WOT_TD_V11,
                                 SinglePrefixedAtContext.of("ditto",
-                                        SingleUriAtContext.of("https://www.eclipse.org/ditto/ctx"))
+                                        SingleUriAtContext.of("https://www.eclipse.dev/ditto/ctx"))
                         )
                 ))
                 .setId(IRI.of("urn:org.eclipse.ditto:333-WoTLamp-1234"))
diff --git a/wot/model/src/test/java/org/eclipse/ditto/wot/model/ThingDescriptionTest.java b/wot/model/src/test/java/org/eclipse/ditto/wot/model/ThingDescriptionTest.java
index 27611f533b..793f29364a 100644
--- a/wot/model/src/test/java/org/eclipse/ditto/wot/model/ThingDescriptionTest.java
+++ b/wot/model/src/test/java/org/eclipse/ditto/wot/model/ThingDescriptionTest.java
@@ -69,7 +69,7 @@ public void testOverallParsingOfThingDescriptionFromJson() {
         assertThat(thingDescription.getAtContext()).isEqualTo(MultipleAtContext.of(
                 Arrays.asList(
                         SingleUriAtContext.W3ORG_2022_WOT_TD_V11,
-                        SinglePrefixedAtContext.of("ditto", SingleUriAtContext.of("https://www.eclipse.org/ditto/ctx")),
+                        SinglePrefixedAtContext.of("ditto", SingleUriAtContext.of("https://www.eclipse.dev/ditto/ctx")),
                         SinglePrefixedAtContext.of("ace", SingleUriAtContext.of("http://www.example.org/ace-security#"))
                 )
         ));
@@ -137,7 +137,7 @@ public void testOverallParsingOfThingDescriptionFromJson() {
         final List<BaseLink<?>> expectedLinks = new ArrayList<>();
         expectedLinks.add(Link.newBuilder()
                 .setRel("service-doc")
-                .setHref(IRI.of("https://eclipse.org/ditto/some-pdf.pdf"))
+                .setHref(IRI.of("https://eclipse.dev/ditto/some-pdf.pdf"))
                 .setType("application/pdf")
                 .setHreflang(Hreflang.newSingleHreflang("de-CH-1996"))
                 .build()
@@ -161,7 +161,7 @@ public void testBuildingThingDescriptionWithBuilder() {
                         Arrays.asList(
                                 SingleUriAtContext.W3ORG_2022_WOT_TD_V11,
                                 SinglePrefixedAtContext.of("ditto",
-                                        SingleUriAtContext.of("https://www.eclipse.org/ditto/ctx")),
+                                        SingleUriAtContext.of("https://www.eclipse.dev/ditto/ctx")),
                                 SinglePrefixedAtContext.of("ace",
                                         SingleUriAtContext.of("http://www.example.org/ace-security#"))
                         )
@@ -203,7 +203,7 @@ public void testBuildingThingDescriptionWithBuilder() {
                 )))
                 .setLinks(Links.of(Collections.singletonList(Link.newBuilder()
                         .setRel("service-doc")
-                        .setHref(IRI.of("https://eclipse.org/ditto/some-pdf.pdf"))
+                        .setHref(IRI.of("https://eclipse.dev/ditto/some-pdf.pdf"))
                         .setType("application/pdf")
                         .setHreflang(Hreflang.newSingleHreflang("de-CH-1996"))
                         .build()
diff --git a/wot/model/src/test/resources/tds/some-example.td.json b/wot/model/src/test/resources/tds/some-example.td.json
index 249530b812..717b836a71 100644
--- a/wot/model/src/test/resources/tds/some-example.td.json
+++ b/wot/model/src/test/resources/tds/some-example.td.json
@@ -2,7 +2,7 @@
   "@context": [
     "https://www.w3.org/2022/wot/td/v1.1",
     {
-      "ditto": "https://www.eclipse.org/ditto/ctx",
+      "ditto": "https://www.eclipse.dev/ditto/ctx",
       "ace": "http://www.example.org/ace-security#"
     }
   ],
@@ -46,7 +46,7 @@
   },
   "links": [{
     "rel": "service-doc",
-    "href": "https://eclipse.org/ditto/some-pdf.pdf",
+    "href": "https://eclipse.dev/ditto/some-pdf.pdf",
     "type": "application/pdf",
     "hreflang" : "de-CH-1996"
   }]