diff --git a/otc_metadata/data/documents/apiu-guidelines.yaml b/otc_metadata/data/documents/apiu-guidelines.yaml
index e229b7e7..7ae4f726 100644
--- a/otc_metadata/data/documents/apiu-guidelines.yaml
+++ b/otc_metadata/data/documents/apiu-guidelines.yaml
@@ -1,5 +1,4 @@
 ---
-environment: internal
 hc_location: api-usage/guidelines
 html_location: docs/apiu/guidelines
 link: /api-usage/guidelines/
diff --git a/otc_metadata/data/documents/dbss-api-ref.yaml b/otc_metadata/data/documents/dbss-api-ref.yaml
index 824bb3b0..344c52cb 100644
--- a/otc_metadata/data/documents/dbss-api-ref.yaml
+++ b/otc_metadata/data/documents/dbss-api-ref.yaml
@@ -1,4 +1,5 @@
 ---
+environment: internal
 hc_location: api/dbss
 html_location: docs/dbss/api-ref
 link: /database-security-service/api-ref/
diff --git a/otc_metadata/data/services/apiu.yaml b/otc_metadata/data/services/apiu.yaml
index 9019c794..584c60e0 100644
--- a/otc_metadata/data/services/apiu.yaml
+++ b/otc_metadata/data/services/apiu.yaml
@@ -1,5 +1,5 @@
 ---
-environment: internal
+environment: hidden
 repositories:
 - environment: internal
   repo: docs/api-usage
diff --git a/otc_metadata/data/services/rfs.yaml b/otc_metadata/data/services/rfs.yaml
index de1128b1..04ab1fa8 100644
--- a/otc_metadata/data/services/rfs.yaml
+++ b/otc_metadata/data/services/rfs.yaml
@@ -1,5 +1,5 @@
 ---
-environment: internal
+environment: public
 repositories:
 - environment: internal
   repo: docs/resource-formation-service
diff --git a/tools/generate_doc_confpy.py b/tools/generate_doc_confpy.py
index 385a3c1f..2bd5d8f2 100644
--- a/tools/generate_doc_confpy.py
+++ b/tools/generate_doc_confpy.py
@@ -167,8 +167,17 @@ def process_repositories(args, service):
             context["git_fqdn"] = git_fqdn
         if target_repo.get("type") != "github":
             context["git_type"] = target_repo["type"]
-        if (args.target_environment == "internal"
-           and target_repo["repo"].split("/")[0] == "docs-swiss"):
+        if (args.target_environment == "public"
+           and target_repo["repo"].split("/")[0] == "opentelekomcloud-docs-swiss"):
+            context["html_options"] = dict(
+                logo_url="https://docs.sc.otc.t-systems.com",
+            )
+        elif (args.target_environment == "public"):
+            context["html_options"] = dict(
+                logo_url="https://docs.otc.t-systems.com",
+            )
+        elif (args.target_environment == "internal"
+              and target_repo["repo"].split("/")[0] == "docs-swiss"):
             context["html_options"] = dict(
                 disable_search=True,
                 site_name="Internal Documentation Portal",
@@ -224,8 +233,17 @@ def process_repositories(args, service):
             context["git_fqdn"] = git_fqdn
         if target_repo.get("type") != "github":
             context["git_type"] = target_repo["type"]
-        if (args.target_environment == "internal"
-           and target_repo["repo"].split("/")[0] == "docs-swiss"):
+        if (args.target_environment == "public"
+           and target_repo["repo"].split("/")[0] == "opentelekomcloud-docs-swiss"):
+            context["html_options"] = dict(
+                logo_url="https://docs.sc.otc.t-systems.com",
+            )
+        elif (args.target_environment == "public"):
+            context["html_options"] = dict(
+                logo_url="https://docs.otc.t-systems.com",
+            )
+        elif (args.target_environment == "internal"
+              and target_repo["repo"].split("/")[0] == "docs-swiss"):
             context["html_options"] = dict(
                 disable_search=True,
                 site_name="Internal Documentation Portal",
diff --git a/tox.ini b/tox.ini
index 3b5961d1..74aa87e1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -20,6 +20,6 @@ commands = {posargs}
 [flake8]
 # E123, E125 skipped as they are invalid PEP-8.
 show-source = True
-ignore = E123,E125,W503
+ignore = E123,E125,W503,E501
 builtins = _
 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build