diff --git a/deegree-ogcapi-datasets/src/main/resources/META-INF/schemas/ogcapi/datasets/3.4.0/example.xml b/deegree-ogcapi-datasets/src/main/resources/META-INF/schemas/ogcapi/datasets/3.4.0/example.xml
index c665a2f7..d66671ef 100644
--- a/deegree-ogcapi-datasets/src/main/resources/META-INF/schemas/ogcapi/datasets/3.4.0/example.xml
+++ b/deegree-ogcapi-datasets/src/main/resources/META-INF/schemas/ogcapi/datasets/3.4.0/example.xml
@@ -7,8 +7,8 @@
   <Description>Description of deegree Datasets</Description>
   <Contact>
     <Name>deegree</Name>
-    <Url>https://deegree-enterprise.de</Url>
-    <EMail>info@deegree-enterprise.de</EMail>
+    <Url>https://www.deegree.org</Url>
+    <EMail>info@deegree.org</EMail>
   </Contact>
 
 </Datasets>
\ No newline at end of file
diff --git a/deegree-ogcapi-features/src/main/resources/META-INF/schemas/ogcapi/features/3.4.0/example.xml b/deegree-ogcapi-features/src/main/resources/META-INF/schemas/ogcapi/features/3.4.0/example.xml
index 377f99f3..80a57923 100644
--- a/deegree-ogcapi-features/src/main/resources/META-INF/schemas/ogcapi/features/3.4.0/example.xml
+++ b/deegree-ogcapi-features/src/main/resources/META-INF/schemas/ogcapi/features/3.4.0/example.xml
@@ -28,8 +28,8 @@
     </DatasetLicense>
     <DatasetCreator>
       <Name>Test</Name>
-      <Url>http://deegree-enterprise.de</Url>
-      <EMail>info@deegree-enterprise.de</EMail>
+      <Url>https://www.deegree.org</Url>
+      <EMail>info@deegree.org</EMail>
     </DatasetCreator>
     <MetadataURL format="application/xml">http://metaver?service=CSW&amp;request=GetRecordById&amp;version=2.0.2&amp;id=89362</MetadataURL>
     <MetadataURL format="text/html">http://localhost:8080/linkZuHTml/89362</MetadataURL>
diff --git a/deegree-ogcapi-features/src/main/resources/collection.html b/deegree-ogcapi-features/src/main/resources/collection.html
index 07a0535e..48f17091 100644
--- a/deegree-ogcapi-features/src/main/resources/collection.html
+++ b/deegree-ogcapi-features/src/main/resources/collection.html
@@ -153,7 +153,7 @@ <h1 v-cloak class="mt-5">{{ title }}</h1>
                 <a v-cloak v-bind:href="legalNoticeUrl" target="_blank" class="legalNotice"> Legal Notice</a>
             </span>
             <span v-else>
-                <a href="https://deegree-enterprise.de" target="_blank" class="legalNotice"> deegree Enterprise Edition</a>
+                <a href="https://www.deegree.org" target="_blank" class="legalNotice"> deegree</a>
             </span>
             <span v-if="privacyUrl && privacyUrl.length > 0">
                <span> | </span>
@@ -238,7 +238,7 @@ <h1 v-cloak class="mt-5">{{ title }}</h1>
 var footerApp = new Vue({
   el: '#footer',
   data: {
-    helpUrl: '',
+    helpUrl: createDocumentationUrl(),
     legalNoticeUrl: '',
     privacyUrl: ''
   },
@@ -251,7 +251,9 @@ <h1 v-cloak class="mt-5">{{ title }}</h1>
       dataType: "json",
       url: createHtmlConfigUrl(),
       success: function(data) {
-        self.helpUrl = data.documentationUrl ? data.documentationUrl : createDocumentationUrl();
+        if ( data.documentationUrl ) {
+          self.helpUrl = data.documentationUrl;
+        }
         self.legalNoticeUrl = data.legalNoticeUrl;
         self.privacyUrl = data.privacyUrl;
       }
diff --git a/deegree-ogcapi-features/src/main/resources/collections.html b/deegree-ogcapi-features/src/main/resources/collections.html
index 1e1e4745..274eb6ef 100644
--- a/deegree-ogcapi-features/src/main/resources/collections.html
+++ b/deegree-ogcapi-features/src/main/resources/collections.html
@@ -145,7 +145,7 @@ <h5 v-cloak>{{ collection.title }}</h5>
                 <a v-cloak v-bind:href="legalNoticeUrl" target="_blank" class="legalNotice"> Legal Notice</a>
             </span>
             <span v-else>
-                <a href="https://deegree-enterprise.de" target="_blank" class="legalNotice"> deegree Enterprise Edition</a>
+                <a href="https://www.deegree.org" target="_blank" class="legalNotice"> deegree</a>
             </span>
             <span v-if="privacyUrl && privacyUrl.length > 0">
                <span> | </span>
@@ -219,7 +219,7 @@ <h5 v-cloak>{{ collection.title }}</h5>
 var footerApp = new Vue({
   el: '#footer',
   data: {
-    helpUrl: '',
+    helpUrl: createDocumentationUrl(),
     legalNoticeUrl: '',
     privacyUrl: ''
   },
@@ -232,7 +232,9 @@ <h5 v-cloak>{{ collection.title }}</h5>
       dataType: "json",
       url: createHtmlConfigUrl(),
       success: function(data) {
-        self.helpUrl = data.documentationUrl ? data.documentationUrl : createDocumentationUrl();
+        if ( data.documentationUrl ) {
+          self.helpUrl = data.documentationUrl;
+        }
         self.legalNoticeUrl = data.legalNoticeUrl;
         self.privacyUrl = data.privacyUrl;
       }
diff --git a/deegree-ogcapi-features/src/main/resources/conformance.html b/deegree-ogcapi-features/src/main/resources/conformance.html
index d3bff56a..68a87b53 100644
--- a/deegree-ogcapi-features/src/main/resources/conformance.html
+++ b/deegree-ogcapi-features/src/main/resources/conformance.html
@@ -107,7 +107,7 @@ <h1 class="mt-5">Conformance Classes</h1>
                 <a v-cloak v-bind:href="legalNoticeUrl" target="_blank" class="legalNotice"> Legal Notice</a>
             </span>
             <span v-else>
-                <a href="https://deegree-enterprise.de" target="_blank" class="legalNotice"> deegree Enterprise Edition</a>
+                <a href="https://www.deegree.org" target="_blank" class="legalNotice"> deegree</a>
             </span>
             <span v-if="privacyUrl && privacyUrl.length > 0">
                <span> | </span>
@@ -162,7 +162,7 @@ <h1 class="mt-5">Conformance Classes</h1>
 var footerApp = new Vue({
   el: '#footer',
   data: {
-    helpUrl: '',
+    helpUrl: createDocumentationUrl(),
     legalNoticeUrl: '',
     privacyUrl: ''
   },
@@ -175,7 +175,9 @@ <h1 class="mt-5">Conformance Classes</h1>
       dataType: "json",
       url: createHtmlConfigUrl(),
       success: function(data) {
-        self.helpUrl = data.documentationUrl ? data.documentationUrl : createDocumentationUrl();
+        if ( data.documentationUrl ) {
+          self.helpUrl = data.documentationUrl;
+        }
         self.legalNoticeUrl = data.legalNoticeUrl;
         self.privacyUrl = data.privacyUrl;
       }
diff --git a/deegree-ogcapi-features/src/main/resources/datasets.html b/deegree-ogcapi-features/src/main/resources/datasets.html
index 2050d058..def9b749 100644
--- a/deegree-ogcapi-features/src/main/resources/datasets.html
+++ b/deegree-ogcapi-features/src/main/resources/datasets.html
@@ -117,7 +117,7 @@ <h3 class="mt-5" >Contact</h3>
                 <a v-cloak v-bind:href="legalNoticeUrl" target="_blank" class="legalNotice"> Legal Notice</a>
             </span>
             <span v-else>
-                <a href="https://deegree-enterprise.de" target="_blank" class="legalNotice"> deegree Enterprise Edition</a>
+                <a href="https://www.deegree.org" target="_blank" class="legalNotice"> deegree</a>
             </span>
             <span v-if="privacyUrl && privacyUrl.length > 0">
                <span> | </span>
@@ -174,7 +174,7 @@ <h3 class="mt-5" >Contact</h3>
 var footerApp = new Vue({
   el: '#footer',
   data: {
-    helpUrl: '',
+    helpUrl: createDocumentationUrl(),
     legalNoticeUrl: '',
     privacyUrl: ''
   },
@@ -187,7 +187,9 @@ <h3 class="mt-5" >Contact</h3>
       dataType: "json",
       url: createHtmlConfigUrl(),
       success: function(data) {
-        self.helpUrl = data.documentationUrl ? data.documentationUrl : createDocumentationUrl();
+        if ( data.documentationUrl ) {
+          self.helpUrl = data.documentationUrl;
+        }
         self.legalNoticeUrl = data.legalNoticeUrl;
         self.privacyUrl = data.privacyUrl;
       }
diff --git a/deegree-ogcapi-features/src/main/resources/feature.html b/deegree-ogcapi-features/src/main/resources/feature.html
index 43faafbd..6cf242a0 100644
--- a/deegree-ogcapi-features/src/main/resources/feature.html
+++ b/deegree-ogcapi-features/src/main/resources/feature.html
@@ -234,7 +234,7 @@ <h3 v-cloak class="mt-5">Error retrieving feature with ID {{ featureId }}</h3>
                 <a v-cloak v-bind:href="legalNoticeUrl" target="_blank" class="legalNotice"> Legal Notice</a>
             </span>
             <span v-else>
-                <a href="https://deegree-enterprise.de" target="_blank" class="legalNotice"> deegree Enterprise Edition</a>
+                <a href="https://www.deegree.org" target="_blank" class="legalNotice"> deegree</a>
             </span>
             <span v-if="privacyUrl && privacyUrl.length > 0">
                <span> | </span>
@@ -327,7 +327,7 @@ <h3 v-cloak class="mt-5">Error retrieving feature with ID {{ featureId }}</h3>
 var footerApp = new Vue({
   el: '#footer',
   data: {
-    helpUrl: '',
+    helpUrl: createDocumentationUrl(),
     legalNoticeUrl: '',
     privacyUrl: ''
   },
@@ -340,7 +340,9 @@ <h3 v-cloak class="mt-5">Error retrieving feature with ID {{ featureId }}</h3>
       dataType: "json",
       url: createHtmlConfigUrl(),
       success: function(data) {
-        self.helpUrl = data.documentationUrl ? data.documentationUrl : createDocumentationUrl();
+        if ( data.documentationUrl ) {
+          self.helpUrl = data.documentationUrl;
+        }
         self.legalNoticeUrl = data.legalNoticeUrl;
         self.privacyUrl = data.privacyUrl;
       }
diff --git a/deegree-ogcapi-features/src/main/resources/features.html b/deegree-ogcapi-features/src/main/resources/features.html
index ff1dbdb9..26d9ddac 100644
--- a/deegree-ogcapi-features/src/main/resources/features.html
+++ b/deegree-ogcapi-features/src/main/resources/features.html
@@ -373,7 +373,7 @@ <h5 class="filter-header">End Period</h5>
                 <a v-cloak v-bind:href="legalNoticeUrl" target="_blank" class="legalNotice"> Legal Notice</a>
             </span>
             <span v-else>
-                <a href="https://deegree-enterprise.de" target="_blank" class="legalNotice"> deegree Enterprise Edition</a>
+                <a href="https://www.deegree.org" target="_blank" class="legalNotice"> deegree</a>
             </span>
             <span v-if="privacyUrl && privacyUrl.length > 0">
                <span> | </span>
@@ -691,7 +691,7 @@ <h5 class="filter-header">End Period</h5>
 var footerApp = new Vue({
   el: '#footer',
   data: {
-    helpUrl: '',
+    helpUrl: createDocumentationUrl(),
     legalNoticeUrl: '',
     privacyUrl: ''
   },
@@ -704,7 +704,9 @@ <h5 class="filter-header">End Period</h5>
       dataType: "json",
       url: createHtmlConfigUrl(),
       success: function(data) {
-        self.helpUrl = data.documentationUrl ? data.documentationUrl : createDocumentationUrl();
+        if ( data.documentationUrl ) {
+          self.helpUrl = data.documentationUrl;
+        }
         self.legalNoticeUrl = data.legalNoticeUrl;
         self.privacyUrl = data.privacyUrl;
       }
diff --git a/deegree-ogcapi-features/src/main/resources/landingpage.html b/deegree-ogcapi-features/src/main/resources/landingpage.html
index 04c88b08..ba8db875 100644
--- a/deegree-ogcapi-features/src/main/resources/landingpage.html
+++ b/deegree-ogcapi-features/src/main/resources/landingpage.html
@@ -137,7 +137,7 @@ <h1 v-cloak class="mt-5">{{ title }}</h1>
                 <a v-cloak v-bind:href="legalNoticeUrl" target="_blank" class="legalNotice"> Legal Notice</a>
             </span>
             <span v-else>
-                <a href="https://deegree-enterprise.de" target="_blank" class="legalNotice"> deegree Enterprise Edition</a>
+                <a href="https://www.deegree.org" target="_blank" class="legalNotice"> deegree</a>
             </span>
             <span v-if="privacyUrl && privacyUrl.length > 0">
                <span> | </span>
@@ -212,7 +212,7 @@ <h1 v-cloak class="mt-5">{{ title }}</h1>
 var footerApp = new Vue({
   el: '#footer',
   data: {
-    helpUrl: '',
+    helpUrl: createDocumentationUrl(),
     legalNoticeUrl: '',
     privacyUrl: ''
   },
@@ -225,7 +225,9 @@ <h1 v-cloak class="mt-5">{{ title }}</h1>
       dataType: "json",
       url: createHtmlConfigUrl(),
       success: function(data) {
-        self.helpUrl = data.documentationUrl ? data.documentationUrl : createDocumentationUrl();
+        if ( data.documentationUrl ) {
+          self.helpUrl = data.documentationUrl;
+        }
         self.legalNoticeUrl = data.legalNoticeUrl;
         self.privacyUrl = data.privacyUrl;
       }