diff --git a/docs/config.toml b/docs/config.toml
index 54d38d84e..551f94224 100755
--- a/docs/config.toml
+++ b/docs/config.toml
@@ -7,7 +7,7 @@
 # http://www.eclipse.org/legal/epl-v10.html
 #
 
-baseurl = "https://www.eclipse.dev/hawkbit/"
+baseurl = "https://eclipse.dev/hawkbit/"
 languageCode = "en-us"
 title = "Eclipse hawkBit"
 theme = "hugo-material-docs"
@@ -18,6 +18,8 @@ canonifyurls = false
 	[markup.goldmark]
 		[markup.goldmark.extensions]
 			typographer = true
+        [markup.goldmark.renderer]
+            unsafe = true
 
 [markup.highlight]
 	codeFences = false
diff --git a/docs/content/apis/ddi_api.md b/docs/content/apis/ddi_api.md
index c062e9103..4cb980e48 100644
--- a/docs/content/apis/ddi_api.md
+++ b/docs/content/apis/ddi_api.md
@@ -32,4 +32,4 @@ SCHEDULED                   | This can be used by the target to inform that it s
 RESUMED                     | This can be used by the target to inform that it continued to work on the action.                                                                                                                                                        | RUNNING
 
 
-<iframe width="100%" height="800px" frameborder="0" src="../../rest-api/rootcontroller-api-guide/"></iframe>
\ No newline at end of file
+<iframe width="100%" height="800px" frameborder="0" src="../../rest-api/rootcontroller-api-guide.html"></iframe>
\ No newline at end of file
diff --git a/docs/content/apis/mgmt/distributionsets.md b/docs/content/apis/mgmt/distributionsets.md
index 80a19c65e..50952749b 100644
--- a/docs/content/apis/mgmt/distributionsets.md
+++ b/docs/content/apis/mgmt/distributionsets.md
@@ -4,4 +4,4 @@ parent: Management API
 weight: -101
 ---
 
-<iframe width="100%" height="800px" frameborder="0" src="../../../rest-api/distributionsets-api-guide/"></iframe>
\ No newline at end of file
+<iframe width="100%" height="800px" frameborder="0" src="../../../rest-api/distributionsets-api-guide.html"></iframe>
\ No newline at end of file
diff --git a/docs/content/apis/mgmt/distributionsettag.md b/docs/content/apis/mgmt/distributionsettag.md
index 6ca62043c..975b87b92 100644
--- a/docs/content/apis/mgmt/distributionsettag.md
+++ b/docs/content/apis/mgmt/distributionsettag.md
@@ -4,4 +4,4 @@ parent: Management API
 weight: -105
 ---
 
-<iframe width="100%" height="800px" frameborder="0" src="../../../rest-api/distributionsettag-api-guide/"></iframe>
\ No newline at end of file
+<iframe width="100%" height="800px" frameborder="0" src="../../../rest-api/distributionsettag-api-guide.html"></iframe>
\ No newline at end of file
diff --git a/docs/content/apis/mgmt/distributionsettypes.md b/docs/content/apis/mgmt/distributionsettypes.md
index a0848fc70..d9a97e3c5 100644
--- a/docs/content/apis/mgmt/distributionsettypes.md
+++ b/docs/content/apis/mgmt/distributionsettypes.md
@@ -4,4 +4,4 @@ parent: Management API
 weight: -102
 ---
 
-<iframe width="100%" height="800px" frameborder="0" src="../../../rest-api/distributionsettypes-api-guide/"></iframe>
\ No newline at end of file
+<iframe width="100%" height="800px" frameborder="0" src="../../../rest-api/distributionsettypes-api-guide.html"></iframe>
\ No newline at end of file
diff --git a/docs/content/apis/mgmt/rollouts.md b/docs/content/apis/mgmt/rollouts.md
index ceb219c64..26192da3f 100644
--- a/docs/content/apis/mgmt/rollouts.md
+++ b/docs/content/apis/mgmt/rollouts.md
@@ -4,4 +4,4 @@ parent: Management API
 weight: -106
 ---
 
-<iframe width="100%" height="800px" frameborder="0" src="../../../rest-api/rollout-api-guide/"></iframe>
\ No newline at end of file
+<iframe width="100%" height="800px" frameborder="0" src="../../../rest-api/rollout-api-guide.html"></iframe>
\ No newline at end of file
diff --git a/docs/content/apis/mgmt/softwaremodules.md b/docs/content/apis/mgmt/softwaremodules.md
index 290003295..3e340452f 100644
--- a/docs/content/apis/mgmt/softwaremodules.md
+++ b/docs/content/apis/mgmt/softwaremodules.md
@@ -4,4 +4,4 @@ parent: Management API
 weight: -103
 ---
 
-<iframe width="100%" height="800px" frameborder="0" src="../../../rest-api/softwaremodules-api-guide/"></iframe>
\ No newline at end of file
+<iframe width="100%" height="800px" frameborder="0" src="../../../rest-api/softwaremodules-api-guide.html"></iframe>
\ No newline at end of file
diff --git a/docs/content/apis/mgmt/softwaremoduletypes.md b/docs/content/apis/mgmt/softwaremoduletypes.md
index 986d75121..a537d4a9e 100644
--- a/docs/content/apis/mgmt/softwaremoduletypes.md
+++ b/docs/content/apis/mgmt/softwaremoduletypes.md
@@ -4,4 +4,4 @@ parent: Management API
 weight: -100
 ---
 
-<iframe width="100%" height="800px" frameborder="0" src="../../../rest-api/softwaremoduletypes-api-guide/"></iframe>
\ No newline at end of file
+<iframe width="100%" height="800px" frameborder="0" src="../../../rest-api/softwaremoduletypes-api-guide.html"></iframe>
\ No newline at end of file
diff --git a/docs/content/apis/mgmt/targetfilters.md b/docs/content/apis/mgmt/targetfilters.md
index 5997669af..7c3e22231 100644
--- a/docs/content/apis/mgmt/targetfilters.md
+++ b/docs/content/apis/mgmt/targetfilters.md
@@ -4,4 +4,4 @@ parent: Management API
 weight: -107
 ---
 
-<iframe width="100%" height="800px" frameborder="0" src="../../../rest-api/targetfilters-api-guide/"></iframe>
\ No newline at end of file
+<iframe width="100%" height="800px" frameborder="0" src="../../../rest-api/targetfilters-api-guide.html"></iframe>
\ No newline at end of file
diff --git a/docs/content/apis/mgmt/targets.md b/docs/content/apis/mgmt/targets.md
index 7bca0eea3..1557cf190 100644
--- a/docs/content/apis/mgmt/targets.md
+++ b/docs/content/apis/mgmt/targets.md
@@ -4,4 +4,4 @@ parent: Management API
 weight: -100
 ---
 
-<iframe width="100%" height="800px" frameborder="0" src="../../../rest-api/targets-api-guide/"></iframe>
\ No newline at end of file
+<iframe width="100%" height="800px" frameborder="0" src="../../../rest-api/targets-api-guide.html"></iframe>
\ No newline at end of file
diff --git a/docs/content/apis/mgmt/targettag.md b/docs/content/apis/mgmt/targettag.md
index 921ff9010..671536304 100644
--- a/docs/content/apis/mgmt/targettag.md
+++ b/docs/content/apis/mgmt/targettag.md
@@ -4,4 +4,4 @@ parent: Management API
 weight: -104
 ---
 
-<iframe width="100%" height="800px" frameborder="0" src="../../../rest-api/targettag-api-guide/"></iframe>
\ No newline at end of file
+<iframe width="100%" height="800px" frameborder="0" src="../../../rest-api/targettag-api-guide.html"></iframe>
\ No newline at end of file
diff --git a/docs/content/apis/mgmt/targettypes.md b/docs/content/apis/mgmt/targettypes.md
index 319d5c65e..a641160a3 100644
--- a/docs/content/apis/mgmt/targettypes.md
+++ b/docs/content/apis/mgmt/targettypes.md
@@ -4,4 +4,4 @@ parent: Management API
 weight: -100
 ---
 
-<iframe width="100%" height="800px" frameborder="0" src="../../../rest-api/targettypes-api-guide/"></iframe>
\ No newline at end of file
+<iframe width="100%" height="800px" frameborder="0" src="../../../rest-api/targettypes-api-guide.html"></iframe>
\ No newline at end of file
diff --git a/docs/content/apis/mgmt/tenant.md b/docs/content/apis/mgmt/tenant.md
index 84d880161..e472cca53 100644
--- a/docs/content/apis/mgmt/tenant.md
+++ b/docs/content/apis/mgmt/tenant.md
@@ -4,4 +4,4 @@ parent: Management API
 weight: -108
 ---
 
-<iframe width="100%" height="800px" frameborder="0" src="../../../rest-api/tenant-api-guide/"></iframe>
\ No newline at end of file
+<iframe width="100%" height="800px" frameborder="0" src="../../../rest-api/tenant-api-guide.html"></iframe>
\ No newline at end of file
diff --git a/docs/themes/hugo-material-docs b/docs/themes/hugo-material-docs
new file mode 160000
index 000000000..9dbd25cf9
--- /dev/null
+++ b/docs/themes/hugo-material-docs
@@ -0,0 +1 @@
+Subproject commit 9dbd25cf9474f3a8bc4c09ec4c7965c8fdee9a5f