diff --git a/.gitignore b/.gitignore
index 76141c2..c19e2b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,26 @@
-doc/build/**
+_build/
+/AUTHORS
+/ChangeLog
+/dist/
+/otcdocstheme.egg-info/
+.DS_Store
+*.pyc
+doc/build
+doc/source/BBresult
+api-ref/build
+.tox
+/.venv
+*.swp
+*.log
+*.egg*
+
+# Editors
+*~
+
+# Files created by releasenotes build
+releasenotes/build
+
+# Files created by the LaTeX/PDF build
+/.aux
+/.fdb_latexmk
+/texput.fls
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 0000000..1a96af9
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,32 @@
+default_language_version:
+  python: python3
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: 9136088a246768144165fcc3ecc3d31bb686920a # v3.3.0
+    hooks:
+      - id: trailing-whitespace
+      # Replaces or checks mixed line ending
+      - id: mixed-line-ending
+        args: ['--fix', 'lf']
+        exclude: '.*\.(svg)$'
+      # Forbid files which have a UTF-8 byte-order marker
+      - id: check-byte-order-marker
+      # Checks that non-binary executables have a proper shebang
+      - id: check-executables-have-shebangs
+      # Check for files that contain merge conflict strings.
+      - id: check-merge-conflict
+      # Check for debugger imports and py37+ breakpoint()
+      # calls in python source
+      - id: debug-statements
+      - id: check-yaml
+        files: .*\.(yaml|yml)$
+  - repo: local
+    hooks:
+      - id: flake8
+        name: flake8
+        additional_dependencies:
+          - hacking>=3.0.1,<3.1.0
+        language: python
+        entry: flake8
+        files: '^.*\.py$'
+        exclude: '^(doc|releasenotes|tools)/.*$'
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 0528130..5eaa903 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -7,6 +7,6 @@
 # Put them in here will make it clear that those are only needed for
 # docs.
 
-sphinx==4.0.0
+sphinx>=4.0.0
 otcdocstheme
 reno>=3.1.0 # Apache-2.0
diff --git a/doc/source/_ext/__pycache__/cont.cpython-38.pyc b/doc/source/_ext/__pycache__/cont.cpython-38.pyc
index 5d5934f..61fba86 100644
Binary files a/doc/source/_ext/__pycache__/cont.cpython-38.pyc and b/doc/source/_ext/__pycache__/cont.cpython-38.pyc differ
diff --git a/doc/source/_ext/cont.py b/doc/source/_ext/cont.py
index 215bb45..f503780 100644
--- a/doc/source/_ext/cont.py
+++ b/doc/source/_ext/cont.py
@@ -124,7 +124,8 @@ class Navigator(Directive):
 class ContainerItem(Directive):
     node_class = container_item
     option_spec = {
-        'title': directives.unchanged
+        'title': directives.unchanged,
+        'image': directives.unchanged,
     }
 
     has_content = True
@@ -132,18 +133,16 @@ class ContainerItem(Directive):
     def run(self):
         doctree_node = container_item()
         doctree_node['title'] = self.options['title']
+        if 'image' in self.options:
+            doctree_node['image'] = self.options['image']
         services = []
         for ent in self.content:
             _srv = ent.strip('- ')
-            # Split on first ":"
-            srv_parts = _srv.split(':', 1)
-            key = srv_parts[0]
-            data_parts = srv_parts[1].split("|")
+            data_parts = _srv.split("|")
             title = data_parts[0]
-            href = data_parts[1] if len(data_parts) > 1 else key
+            href = data_parts[1] if len(data_parts) > 1 else '#'
             services.append(
                 dict(
-                    key=key,
                     title=title,
                     href=href
                 )
@@ -153,50 +152,64 @@ class ContainerItem(Directive):
 
 
 def container_item_html(self, node):
-    tmpl = """
-        <div class="navigator-item">
-            <h3>%(title)s</h3>
+    tmpl = f"""
+        <div class="col">
+          <div class="card">
+            %(img)s
+            <div class="card-body">
+              <h5 class="card-title">%(title)s</h5>
+            </div>
             %(data)s
+          </div>
         </div>
         """
 
     node['data'] = (
-        "<ul class='service-category'>" +
-        "".join([('<li><a href="%(href)s">'
-                  '<div class="row">'
-                  '<div class="col-md-2">'
-                  '<img src="_static/images/%(key)s.svg">'
-                  '</div>'
+        "<ul class='list-group list-group-flush'>" +
+        "".join([('<li class="list-group-item"><a href="%(href)s">'
                   '<div class="col-md-10">%(title)s</div>'
-                  '</div></a></li>'
+                  '</a></li>'
                   % x)
                  for x in node['services']]) +
         "</ul>")
+    node['img'] = ''
+    if 'image' in node and node['image']:
+        node['img'] = (
+            f'<img src="{node["image"]}" '
+            'class="card-img-top mx-auto">'
+        )
     self.body.append(tmpl % node)
     raise nodes.SkipNode
 
 
 def navigator_html(self, node):
-    data = f'<div class="{node["class"]}">'
+    # This method renders containers of service groups with links to the
+    # document of the specified type
+    data = f'<div class="{node["class"]} row row-cols-1 row-cols-md-3 g-4">'
     for k, v in node['data']['service_categories'].items():
         data += (
-            f'<div class="navigator-item">'
-            f"<h3>{v['title']}</h3><ul class='service-category'>"
+            f'<div class="col"><div class="card">'
+            f'<div class="card-body">'
+            f'<h5 class="card-title">{v["title"]}</h5></div>'
+            f'<ul class="list-group list-group-flush">'
         )
         for srv_k, srv_v in v['services'].items():
-            link = srv_v.get(node["link_type"], srv_k)
+            # if service has no proper link for the type - skip it
+            link = srv_v.get(node["link_type"], None)
+            if not link:
+                continue
             img = srv_k
             title = srv_v["title"]
             data += (
-                f'<li><a href="{link}">'
+                f'<li class="list-group-item"><a href="{link}">'
                 f'<div class="row">'
-                f'<div class="col-md-2 col-sm-2 col-xs-2">'
+                f'<div class="col-2">'
                 f'<img src="_static/images/services/{img}.svg">'
                 f'</div>'
-                f'<div class="col-md-10 col-sm-10 col-xs-10">{title}</div>'
+                f'<div class="col-10">{title}</div>'
                 f'</div></a></li>'
             )
-        data += '</ul></div>'
+        data += '</ul></div></div>'
 
     data += '</div>'
 
@@ -205,47 +218,45 @@ def navigator_html(self, node):
 
 
 def service_group_html(self, node):
-    data = f'<div class={node["class"]}><table class="table table-bordered table-hover">'
+    # This method renders containers per each service of the category with all
+    # links as individual list items
+    data = '<div class="row row-cols-1 row-cols-md-3 g-4">'
     for k, v in node['data']['services'].items():
-        img = k
         title = v["title"]
-        data += '<tr>'
-        # 1st column - title
         data += (
-            f'<td><div class="col-sm-2">'
-            f'<img src="_static/images/services/{img}.svg">'
-            f'</div><div class="col-sm-10">'
-            f'{title}</div>'
-            f'</td>'
-        )
-        # 3rd column - API-Ref
-        link = v.get("api")
-        data += (
-            f'<td>'
-            f'<a href="{link}">API Reference</a>'
-            f'</td>'
-        ) if link else (
-            f'<td></td>'
-        )
-        # 4th column - UMN
-        link = v.get("umn")
-        data += (
-            f'<td>'
-            f'<a href="{link}">User Manual</a>'
-            f'</td>'
-        ) if link else (
-            f'<td></td>'
+            f'<div class="col"><div class="card">'
+            f'<div class="card-body"><h5 class="card-title">'
+            f'{v["title"]}</h5></div>'
+            f'<ul class="list-group list-group-flush">'
         )
+        # API-Ref and UMN
+        # NOTE(gtema): maybe we want some special icons
+        for doc_type in [
+            ('api', 'API Reference'),
+            ('umn', 'User Manual')
+        ]:
+            link = v.get(doc_type[0])
+            if link:
+                title = doc_type[1]
+                data += (
+                    f'<li class="list-group-item"><a href="{link}">'
+                    f'<div class="row">'
+                    f'<div class="col-md-10 col-sm-10 col-xs-10">{title}</div>'
+                    f'</div></a></li>'
+                )
+
         # all other links
         for link in v.get("links", []):
             data += (
-                f'<td>'
-                f'<a href="{link["url"]}">{link["title"]}</a>'
-                f'</td>'
+                f'<li class="list-group-item"><a href="{link["url"]}">'
+                f'<div class="row">'
+                f'<div class="col-md-10 col-sm-10 col-xs-10">{link["title"]}</div>'
+                f'</div></a></li>'
             )
         # Row end
-        data += '</tr>'
-    data += "</table></div>"
+        data += '</ul></div></div>'
+    data += '</div>'
+
     self.body.append(data)
     raise nodes.SkipNode
 
diff --git a/doc/source/_static/css/default.css b/doc/source/_static/css/default.css
index 996f766..9bdd539 100644
--- a/doc/source/_static/css/default.css
+++ b/doc/source/_static/css/default.css
@@ -1,107 +1,49 @@
-.docs-book-wrapper {
-    margin-top: 0 !important;
+/* Limit image in the card title*/
+.card-img-top {
+  max-width: 4rem;
+  height: 4rem;
+  padding-top: 5px;
 }
 
-scale-app-shell div.container {
-    margin-left: unset;
-    margin-right: unset;
+/* decorate links in card */
+.card a {
+  text-decoration: none;
+}
+.card li:hover {
+  background: lightgray;
+}
+.card-title {
+  font-weight: unset;
 }
 
-@media (min-width: 1600px) {
-  .container {
-      width: 100% !important;
-      padding-left: 0 !important;
+/* Special boxes for cards */ 
+.card {
+  box-shadow: 0px 2px 10px 1px rgba(0,0,0,0.2);
+  transition: transform .2s;
+}
+
+.card:hover {
+  box-shadow: 0px 2px 15px 1px rgba(0,0,0,0.3);
+}
+
+/* on large screen we want card to be approx of the same size */
+@media (min-width:768px) {
+  .navigator-container .card {
+    min-height: 300px;
   }
+  /* disable push to bottom on the card */
+  .navigator-container .card .card-body {
+    flex: unset;
+  }
+
 }
 
-.service-box {
-  border: 1px solid #E8E8E8;
-  padding: 30px 20px;
-  border-radius: 4px;
-  min-height: 200px;
-  max-width: 300px;
-  margin-right: 20px !important;
-  margin-bottom: 20px;
-  display: flex;
-  justify-content: center;
-}
-
-.service-box:hover {
-    box-shadow: 0 0 6px rgba(35, 173, 278, 1);
-}
-
-.service-box ul {
-    list-style-type: none;
-}
-
-.navigator-container {
-   display: flex;
-   flex-wrap: wrap;
-   flex-direction: row;
-   justify-content: flex-start;
-   padding: 0;
-   margin: 0;
-   list-style: none;
- }
-
-.navigator-item {
-    padding: 10px;
-    margin: 10px;
-    background: white;
-    width: 300px;
-    min-height: 200px;
-    color: #191919;
-    text-align: left;
-    box-shadow: 0px 2px 10px 1px rgba(0,0,0,0.2);
-    transition: transform .2s;
-}
-
-.navigator-item > p {
-    text-align: justify;
-}
-
-.navigator-item > h3 {
-    margin-top: 10px;
-    text-align: right;
-}
-
-.navigator-item > img {
-    height: 4em;
-}
-
-.navigator-item > ul {
-    list-style-type: none;
-    padding-left: 10px;
-}
-
-//.navigator-item > ul > li {
-//    margin-bottom: 10px;
-//    padding: 5px;
-//}
-.navigator-item > ul > li:hover {
-    background: lightgray;
-}
-
-.navigator-item:hover {
-    // transform: scale(1.05);
-    box-shadow: 0px 2px 15px 1px rgba(0,0,0,0.3);
-}
-
-.navigator-item > ul > li > a > div > div > img {
+/* limit icon size in the card li */
+.navigator-container .card > ul > li > a > div > div > img {
     max-height: 20px;
     max-width: 20px;
 }
 
-.navigator-container a {
-    color: #191919 !important;
-}
-
-.navigator-container a:hover {
-    text-decoration: none;
-    background: gray;
-}
-
-.service-group img {
-    max-width: 48px;
-    max-height: 48px;
+.navigator-container .card li {
+  padding: 0.2rem 1rem;
 }
diff --git a/doc/source/_static/images/dt-magenta.svg b/doc/source/_static/images/dt-magenta.svg
new file mode 100755
index 0000000..7fb183d
--- /dev/null
+++ b/doc/source/_static/images/dt-magenta.svg
@@ -0,0 +1,10 @@
+<svg id="Telekom_Logo" data-name="Telekom Logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 840 1000">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #e20074;
+      }
+    </style>
+  </defs>
+  <path class="cls-1" d="M200,660H0V460h200V660z M0,0v340h60v-10c0-160,90-260,260-260h10v720c0,100-40,140-140,140h-30v70h520v-70h-30c-100,0-140-40-140-140V70h10c170,0,260,100,260,260v10h60V0H0z M640,660h200V460H640V660z"/>
+</svg>
diff --git a/doc/source/_static/images/services/sfs.svn b/doc/source/_static/images/services/sfs.svg
similarity index 100%
rename from doc/source/_static/images/services/sfs.svn
rename to doc/source/_static/images/services/sfs.svg
diff --git a/doc/source/api.rst b/doc/source/api.rst
index 3997632..8aa42d7 100644
--- a/doc/source/api.rst
+++ b/doc/source/api.rst
@@ -1,5 +1,5 @@
-API
-===
+REST API
+========
 
 .. navigator::
    :class: navigator-container
diff --git a/doc/source/app.rst b/doc/source/app.rst
new file mode 100644
index 0000000..7b72436
--- /dev/null
+++ b/doc/source/app.rst
@@ -0,0 +1,7 @@
+Application
+===========
+
+.. service_group::
+   :class: service-group
+   :data: services.yaml
+   :category: application_services
diff --git a/doc/source/compute.rst b/doc/source/compute.rst
index 0957a34..10751d5 100644
--- a/doc/source/compute.rst
+++ b/doc/source/compute.rst
@@ -1,5 +1,5 @@
-Compute Services
-================
+Compute
+=======
 
 .. service_group::
    :class: service-group
diff --git a/doc/source/conf.py b/doc/source/conf.py
index fbdb637..2fb3c0c 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -20,6 +20,7 @@ extensions = [
 
 # openstackdocstheme options
 otcdocs_repo_name = 'docs/docsportal'
+site_name = "Internal HelpCenter"
 
 # The suffix of source filenames.
 source_suffix = '.rst'
@@ -58,6 +59,7 @@ html_favicon = '_static/favicon.ico'
 html_theme_options = {
     'show_other_versions': False,
     'sidebar_mode': 'toctree',
+    'site_name': 'Internal HelpCenter',
 }
 
 # Add any paths that contain custom static files (such as style sheets) here,
@@ -86,5 +88,5 @@ latex_documents = [
 
 # -- Intersphinx
 intersphinx_mapping = {
-#    'otce': ('https://docs.otc-service.com/python-otcextensions', None)
+    'security': ('https://docs-beta.otc.t-systems.com/security', None)
 }
diff --git a/doc/source/data_analysis.rst b/doc/source/data_analysis.rst
new file mode 100644
index 0000000..9b3ca5d
--- /dev/null
+++ b/doc/source/data_analysis.rst
@@ -0,0 +1,7 @@
+Data Analysis
+=============
+
+.. service_group::
+   :class: service-group
+   :data: services.yaml
+   :category: data_analysis
diff --git a/doc/source/database.rst b/doc/source/database.rst
new file mode 100644
index 0000000..3cc96d9
--- /dev/null
+++ b/doc/source/database.rst
@@ -0,0 +1,7 @@
+Database
+========
+
+.. service_group::
+   :class: service-group
+   :data: services.yaml
+   :category: database
diff --git a/doc/source/developer.rst b/doc/source/developer.rst
index fc51f4f..491f25b 100644
--- a/doc/source/developer.rst
+++ b/doc/source/developer.rst
@@ -9,3 +9,4 @@ Developer
    sdk
    iac
    drivers
+   Blueprints <https://docs-beta.otc.t-systems.com/blueprints>
diff --git a/doc/source/drivers.rst b/doc/source/drivers.rst
index 35910b1..181f632 100644
--- a/doc/source/drivers.rst
+++ b/doc/source/drivers.rst
@@ -1,19 +1,22 @@
 Drivers and Tools
 =================
 
-.. container:: navigator-container
+.. container:: row row-cols-1 row-cols-md-3 g-4
 
    .. container_item::
       :title: CLI
+      :image: _static/images/openstack-logo-vert.png
 
-      - openstack-logo-vert: OpenStack Client|https://docs.openstack.org/python-openstackclient/
+      - OpenStack Client|https://docs.openstack.org/python-openstackclient/
 
    .. container_item::
       :title: Docker
+      :image: _static/images/docker.svg
 
-      - docker: Docker Machine Driver|https://github.com/opentelekomcloud/docker-machine-opentelekomcloud
+      - Docker Machine Driver|https://github.com/opentelekomcloud/docker-machine-opentelekomcloud
 
    .. container_item::
       :title: Rancher
+      :image: _static/images/rancher.svg
 
-      - rancher: Rancher CCE Driver|https://github.com/opentelekomcloud/kontainer-engine-driver-otc
+      - Rancher CCE Driver|https://github.com/opentelekomcloud/kontainer-engine-driver-otc
diff --git a/doc/source/iac.rst b/doc/source/iac.rst
index 1c1740f..bd99e7f 100644
--- a/doc/source/iac.rst
+++ b/doc/source/iac.rst
@@ -1,14 +1,16 @@
 Infrastructure As a Code
 ========================
 
-.. container:: navigator-container
+.. container:: row row-cols-1 row-cols-md-3 g-4
 
    .. container_item::
       :title: Ansible
+      :image: _static/images/ansible.svg
 
-      - ansible: Ansible Collection|https://docs.otc-service.com/ansible-collection-cloud
+      - Ansible Collection|https://docs.otc-service.com/ansible-collection-cloud
 
    .. container_item::
       :title: Terraform
+      :image: _static/images/terraform.svg
 
-      - terraform: Open Telekom Cloud Provider|https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud/latest/docs
+      - Open Telekom Cloud Provider|https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud/latest/docs
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 3c88261..c7514d7 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -1,6 +1,6 @@
-================================
-Open Telekom Cloud DevOps Portal
-================================
+========================================
+Open Telekom Cloud Service Documentation
+========================================
 
 .. navigator::
    :class: navigator-container
@@ -13,4 +13,3 @@ Open Telekom Cloud DevOps Portal
    services
    developer
    links
-
diff --git a/doc/source/links.rst b/doc/source/links.rst
index 6f20115..6a9129a 100644
--- a/doc/source/links.rst
+++ b/doc/source/links.rst
@@ -4,5 +4,6 @@ Quick Links
 .. toctree::
 
    Console <https://console.otc.t-systems.com>
-   Health Dashboard <https://docs.otc.t-systems.com/sd/index.html>
-   Enterprise Dashboard <https://docs.otc.t-systems.com/ed/index.html>
+   Health Dashboard <https://status.otc-service.com>
+   Enterprise Dashboard <https://enterprise-dashboard.otc-service.com>
+   Security advisory <security/index>
diff --git a/doc/source/md.rst b/doc/source/md.rst
new file mode 100644
index 0000000..ee6d64b
--- /dev/null
+++ b/doc/source/md.rst
@@ -0,0 +1,7 @@
+Management and Deployment
+=========================
+
+.. service_group::
+   :class: service-group
+   :data: services.yaml
+   :category: md
diff --git a/doc/source/network.rst b/doc/source/network.rst
new file mode 100644
index 0000000..4bbb278
--- /dev/null
+++ b/doc/source/network.rst
@@ -0,0 +1,7 @@
+Network
+=======
+
+.. service_group::
+   :class: service-group
+   :data: services.yaml
+   :category: network
diff --git a/doc/source/sdk.rst b/doc/source/sdk.rst
index 8f35d87..2b94972 100644
--- a/doc/source/sdk.rst
+++ b/doc/source/sdk.rst
@@ -1,20 +1,23 @@
 SDK
 ===
 
-.. container:: navigator-container
+.. container:: row row-cols-1 row-cols-md-3 g-4
 
    .. container_item::
       :title: Python
+      :image: _static/images/python.svg
 
-      - python: OTC Extensions|https://docs.otc-service.com/python-otcextensions
+      - OTC Extensions|https://docs.otc-service.com/python-otcextensions
 
    .. container_item::
       :title: Golang
+      :image: _static/images/golang.svg
 
-      - golang: Golang SDK|https://github.com/opentelekomcloud/gophertelekomcloud/
+      - Golang SDK|https://github.com/opentelekomcloud/gophertelekomcloud/
 
    .. container_item::
       :title: JavaScript
+      :image: _static/images/javascript.svg
 
-      - javascript: JavaScript SDK|https://github.com/opentelekomcloud/oms/
+      - JavaScript SDK|https://github.com/opentelekomcloud/oms/
 
diff --git a/doc/source/security.rst b/doc/source/security.rst
new file mode 100644
index 0000000..b83a395
--- /dev/null
+++ b/doc/source/security.rst
@@ -0,0 +1,7 @@
+Security
+========
+
+.. service_group::
+   :class: service-group
+   :data: services.yaml
+   :category: security
diff --git a/doc/source/security/index.rst b/doc/source/security/index.rst
new file mode 100644
index 0000000..738500e
--- /dev/null
+++ b/doc/source/security/index.rst
@@ -0,0 +1,6 @@
+Security Advisory
+=================
+
+This content will never be shown on real deployment, since we only need a
+redirect to /security, which will be processed by the reverse proxy and serve
+corresponding content.
diff --git a/doc/source/services.rst b/doc/source/services.rst
index e87ffa9..a159d2e 100644
--- a/doc/source/services.rst
+++ b/doc/source/services.rst
@@ -4,3 +4,10 @@ Services
 .. toctree::
 
    compute
+   network
+   storage
+   md
+   security
+   app
+   database
+   data_analysis
diff --git a/doc/source/services.yaml b/doc/source/services.yaml
index 51806a0..e5bbd93 100644
--- a/doc/source/services.yaml
+++ b/doc/source/services.yaml
@@ -14,7 +14,6 @@ service_categories:
         title: Bare Metal Server
         api: https://docs.otc.t-systems.com/en-us/api/bms/en-us_topic_0143138428.html
         umn: https://docs.otc.t-systems.com/en-us/usermanual/bms/en-us_topic_0053536919.html
-        dev: https://docs.otc.t-systems.com/en-us/devg/bms/en-us_topic_0113605684.html
         links:
           - url: https://docs.otc.t-systems.com/en-us/devg/bms/en-us_topic_0113605684.html
             title: Developer Guide
@@ -30,10 +29,10 @@ service_categories:
         umn: https://docs.otc.t-systems.com/usermanual/deh/deh_01_0003.html
       ecs:
         title: Elastic Cloud Server
-        api: https://docs.otc.t-systems.com/en-us/api/ecs/en-us_topic_0020805967.html
-        umn: https://docs.otc.t-systems.com/en-us/usermanual/ecs/en-us_topic_0092494580.html
+        api: https://docs-beta.otc.t-systems.com/api-ref/elastic-cloud-server/
+        umn: https://docs-beta.otc.t-systems.com/umn/elastic-cloud-server/
         links:
-          - url: https://docs.otc.t-systems.com/en-us/devg/ecs/en-us_topic_0134192990.html
+          - url: https://docs-beta.otc.t-systems.com/dev/elastic-cloud-server/
             title: Developer Guide
       ims:
         title: Image Management Service
@@ -50,24 +49,44 @@ service_categories:
     services:
       cbr:
         title: Cloud Backup and Recovery
+        api: https://docs.otc.t-systems.com/api/cbr/cbr_04_0001.html
         umn: https://docs.otc.t-systems.com/en-us/usermanual/cbr/cbr_01_0001.html
       csbs:
         title: Cloud Server Backup Service
+        api: https://docs.otc.t-systems.com/en-us/api/csbs/en-us_topic_0061309751.html
         umn: https://docs.otc.t-systems.com/en-us/usermanual/csbs/en-us_topic_0056584625.html
       evs:
         title: Elastic Volume Service
+        api: https://docs.otc.t-systems.com/en-us/api/evs/evs_04_0001.html
         umn: https://docs.otc.t-systems.com/en-us/usermanual/evs/evs_01_0119.html
+        links:
+          - url: https://docs.otc.t-systems.com/en-us/devg/evs/evs_03_0001.html
+            title: Developer Guide
       obs:
         title: Object Storage Service
+        api: https://docs.otc.t-systems.com/api/obs/en-us_topic_0031051947.html
         umn: https://docs.otc.t-systems.com/usermanual/obs/en-us_topic_0045853692.html
+        links:
+          - url: https://docs.otc.t-systems.com/ugs3cmd/obs/en-us_topic_0051518473.html
+            title: Third-party client (s3cmd)
+          - url: https://docs.otc.t-systems.com/api_swift/obs/obs_03_0001.html
+            title: Swift API reference
+          - url: https://docs.otc.t-systems.com/api_obs/obs/en-us_topic_0031665984.html
+            title: S3 API reference
       sdrs:
         title: Storage Disaster Recovery Service
+        api: https://docs.otc.t-systems.com/en-us/api/sdrs/sdrs_01_0000.html
         umn: https://docs.otc.t-systems.com/en-us/usermanual/sdrs/sdrs_pro_0000.html
       sfs:
         title: Scalable File Service
+        api: https://docs.otc.t-systems.com/en-us/api/sfs/sfs_02_0001.html
         umn: https://docs.otc.t-systems.com/en-us/usermanual/sfs/en-us_topic_0034428718.html
+        links:
+          - url: https://docs.otc.t-systems.com/en-us/api_cli/sfs/sfs_04_0001.html
+            title: Manila client reference
       vbs:
         title: Volume Backup Service
+        api: https://docs.otc.t-systems.com/en-us/api/vbs/en-us_topic_0061309333.html
         umn: https://docs.otc.t-systems.com/en-us/usermanual/vbs/en-us_topic_0015667845.html
 
   network:
@@ -75,88 +94,174 @@ service_categories:
     services:
       cdn:
         title: Content Delivery Network (Akamai)
+        umn: https://docs.otc.t-systems.com/cdn/doc/download/pdf/cdn-usermanual.pdf
       dc:
         title: Direct Connect
+        api: https://docs.otc.t-systems.com/api/dc/en-dc_topic_0055025300.html
+        umn: https://docs.otc.t-systems.com/usermanual/dc/en-us_topic_0032025288.html
       dns:
         title: Domain Name Service
+        api: https://docs.otc.t-systems.com/en-us/api/dns/dns_api_50000.html
+        umn: https://docs.otc.t-systems.com/en-us/usermanual/dns/en-us_topic_0035467691.html
       elb:
         title: Elastic Load Balancing
         api: https://docs.otc-service.com/api-ref/elastic-load-balancing/
         umn: https://docs.otc-service.com/umn/elastic-load-balancing/
       eip:
         title: Elastic IP
+        api: https://docs.otc.t-systems.com/api/eip/eip_api01_0000.html
+        umn: https://docs.otc.t-systems.com/usermanual/eip/overview.html
       nat:
         title: NAT Gateway
+        api: https://docs.otc.t-systems.com/api/nat/nat_api_0047.html
+        umn: https://docs.otc.t-systems.com/usermanual/nat/nat_pro_0000.html
       plas:
         title: Private Link Access Service
+        api: https://docs.otc.t-systems.com/en-us/api/plas/en-us_topic_0218811267.html
+        umn: https://docs.otc.t-systems.com/en-us/usermanual/plas/en-us_topic_0218777868.html
+        links:
+          - url: https://docs.otc.t-systems.com/en-us/plas/doc/download/excel/plas-ot.xlsm
+            title: Order form template
       vpc:
         title: Virtual Private Cloud
+        api: https://docs.otc.t-systems.com/api/vpc/en-us_topic_0050065465.html
+        umn: https://docs.otc.t-systems.com/usermanual/vpc/en-us_topic_0013748729.html
       vpc_ep:
         title: VPC Endpoint
+        api: https://docs.otc.t-systems.com/api/vpcep/vpcep_05_0000.html
+        umn: https://docs.otc.t-systems.com/usermanual/vpcep/en-us_topic_0131645194.html
       vpn:
         title: Virtual Private Network
+        api: https://docs.otc.t-systems.com/api/vpn/en_topic_0093011471.html
+        umn: https://docs.otc.t-systems.com/usermanual/vpn/en-us_topic_0035391332.html
 
   md:
     title: Management & Deployment
     services:
       ces:
         title: Cloud Eye
+        api: https://docs.otc.t-systems.com/api/ces/ces_03_0001.html
+        umn: https://docs.otc.t-systems.com/usermanual/ces/en-us_topic_0015479882.html
       cts:
         title: Cloud Trace Service
+        api: https://docs.otc.t-systems.com/en-us/api/cts/en-us_topic_0168602179.html
+        umn: https://docs.otc.t-systems.com/en-us/usermanual/cts/en-us_topic_0030579718.html
       iam:
         title: Identity and Access Management
+        api: https://docs.otc.t-systems.com/en-us/api/iam/iam_02_0017.html
+        umn: https://docs.otc.t-systems.com/en-us/usermanual/iam/iam_01_0026.html
       lts:
         title: Log Tank Service
+        api: https://docs.otc.t-systems.com/api/lts/lts_02_0001.html
+        umn: https://docs.otc.t-systems.com/usermanual/lts/lts_01_0001.html
       rts:
         title: Resource Template Service
+        api: https://docs.otc.t-systems.com/api/rts/en-us_topic_0082242144.html
+        umn: https://docs.otc.t-systems.com/usermanual/rts/rts_01_0001.html
       tms:
         title: Tag Management Service
+        api: https://docs.otc.t-systems.com/api/tms/en-us_topic_0056283725.html
+        umn: https://docs.otc.t-systems.com/usermanual/tms/en-us_topic_0056095606.html
 
   security:
     title: Security
     services:
       anti_ddos:
         title: Anti-DDoS
+        api: https://docs.otc.t-systems.com/en-us/api/antiddos/en-us_topic_0037386201.html
+        umn: https://docs.otc.t-systems.com/en-us/usermanual/antiddos/en-us_topic_0023977447.html
       kms:
         title: Key Management Service
+        api: https://docs.otc.t-systems.com/en-us/api/kms/en-us_topic_00384375969.html
+        umn: https://docs.otc.t-systems.com/en-us/usermanual/kms/en-us_topic_0034324884.html
       vd:
         title: Vulnerability Database
         umn: https://nvd.nist.gov/
       waf:
         title: Web Application Firewall
+        api: https://docs.otc.t-systems.com/api/waf/waf_02_0001.html
+        umn: https://docs.otc.t-systems.com/usermanual/waf/waf_01_0045.html
 
   application_services:
     title: Application Services
     services:
       aom:
         title: Application Operations Management
+        api: https://docs.otc.t-systems.com/api/aom/aom_04_0000.html
+        umn: https://docs.otc.t-systems.com/usermanual/aom/aom_02_1007.html
       dms:
         title: Distributed Message Service
+        api: https://docs.otc.t-systems.com/en-us/api/dms/en-us_topic_0036182510.html
+        umn: https://docs.otc.t-systems.com/en-us/usermanual/dms/en-us_topic_0044827396.html
+        links:
+          - url: https://docs.otc.t-systems.com/en-us/devg/dms/Kafka-summary.html
+            title: Development Guide
       smn:
         title: Simple Message Notification
+        api: https://docs.otc.t-systems.com/api/smn/en-us_topic_0036017316.html
+        umn: https://docs.otc.t-systems.com/usermanual/smn/en-us_topic_0043394885.html
       swr:
         title: Software Repository for Container
+        api: https://docs.otc.t-systems.com/api/swr/swr_02_0078.html
+        umn: https://docs.otc.t-systems.com/usermanual/swr/swr_03_0001.html
 
   database:
     title: Database
     services:
       dcs:
         title: Distributed Cache Service
+        api: https://docs.otc.t-systems.com/api/dcs/dcs-api-0417001.html
+        umn: https://docs.otc.t-systems.com/usermanual/dcs/en-us_topic_0054235826.html
       dds:
         title: Document Database Service
+        api: https://docs.otc.t-systems.com/api/dds/dds_api_reference.html
+        umn: https://docs.otc.t-systems.com/usermanual/dds/en-us_topic_user_guide.html
       rds:
         title: Relational Database Service
+        api: https://docs.otc.t-systems.com/api/rds/en-us_topic_0032347780.html
+        umn: https://docs.otc.t-systems.com/usermanual/rds/rds_01_0000.html
 
   data_analysis:
     title: Data Analysis
     services:
       css:
         title: Cloud Search Service
+        api: https://docs.otc.t-systems.com/api/css/css_03_0001.html
+        umn: https://docs.otc.t-systems.com/usermanual/css/css_04_0001.html
       dis:
         title: Data Ingestion Service
+        api: https://docs.otc.t-systems.com/api/dis/en-us_topic_0057474833.html
+        umn: https://docs.otc.t-systems.com/usermanual/dis/en-us_topic_0033058843.html
       dws:
         title: Data Warehouse Service
+        api: https://docs.otc.t-systems.com/api/dws/dws_02_0033.html
+        umn: https://docs.otc.t-systems.com/usermanual/dws/dws_01_0002.html
+        links:
+          - url: https://docs.otc.t-systems.com/devg/dws/dws_04_0001.html
+            title: Developer Guide
+          - url: https://docs.otc.t-systems.com/tg/dws/dws_07_0001.html
+            title: Tool Guide
+          - url: https://docs.otc.t-systems.com/fcode/dws/dws_08_0001.html
+            title: Error Code Reference
       mrs:
         title: MapReduce Service
+        api: https://docs.otc.t-systems.com/api/mrs/en-us_topic_0037324628.html
+        umn: https://docs.otc.t-systems.com/usermanual/mrs/mrs_08_0001.html
+        links:
+          - url: https://docs.otc.t-systems.com/cmpntguide/mrs/mrs_01_0756.html
+            title: Operation Guide
       ma:
         title: ModelArts
+        api: https://docs-beta.otc.t-systems.com/api-ref/modelarts/
+        umn: https://docs-beta.otc.t-systems.com/umn/modelarts/
+
+  others:
+    title: Others
+    services:
+      psd:
+        title: Status Dashboard
+        umn: https://docs.otc.t-systems.com/sd/index.html
+      edb:
+        title: Enterprise Dashboard
+        api: https://docs-beta.otc.t-systems.com/api-ref/enterprise-dashboard/
+        umn: https://docs-beta.otc.t-systems.com/umn/enterprise-dashboard/
diff --git a/doc/source/storage.rst b/doc/source/storage.rst
new file mode 100644
index 0000000..b4f6f1d
--- /dev/null
+++ b/doc/source/storage.rst
@@ -0,0 +1,7 @@
+Storage
+=======
+
+.. service_group::
+   :class: service-group
+   :data: services.yaml
+   :category: storage
diff --git a/doc/source/templates/header.html b/doc/source/templates/header.html
deleted file mode 100644
index 2c38755..0000000
--- a/doc/source/templates/header.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% if page_source_suffix %}{# an input file was read #}
-<!-- SOURCE_FILE: {% if giturl %}{{giturl}}/{% endif %}{{pagename}}{{page_source_suffix}} -->
-{% else %}{# a template was rendered directly #}
-<!-- TEMPLATE_NAME: {{pagename}} -->
-{% endif %}
-
-<scale-app-shell
-  id="app-shell"
-  claim-lang="en"
-  logo-title="PAGENAME"
-  logo-href="/"
->
-
diff --git a/doc/source/templates/layout.html b/doc/source/templates/layout.html
index 047025b..0325169 100644
--- a/doc/source/templates/layout.html
+++ b/doc/source/templates/layout.html
@@ -13,27 +13,26 @@
   {%- block relbar1 %}{% endblock %}
 
   {%- block content %}
-      <div class="container docs-book-wrapper">
-        <div class="row">
-          <div class="col-lg-9 col-md-8 col-sm-8 col-lg-push-3 col-md-push-4 col-sm-push-4">
-            <div class="row">
-              <div class="col-lg-12">
-                <div class="docs-body" role="main">
-  {% block body %}{% endblock %}
-                </div>
-              </div>
-            </div>
+      <div class="container-xxl my-md-4 docs-book-wrapper">
+	{% include 'sidebartoc.html' %}
+	<div id="content-row" class="row">
+        <main id="docs-main" class="docs-main col-12 col-xl-11" role="main">
+          <div id="docs-content" class="docs-content ps-lg-4">
+            {% block body %}{% endblock %}
           </div>
-  {% include 'sidebartoc.html' %}
-        </div>
+        </main>
+	</div>
       </div>
   {%- endblock %}
 
   {%- block relbar2 %}{% endblock %}
 
+
+
   {%- block footer %}
   {% include 'footer.html' %}
   {% include 'script_footer.html' %}
   {% block script_footer %}{% endblock %}
   {%- endblock %}
 </div>
+
diff --git a/doc/source/templates/sidebartoc.html b/doc/source/templates/sidebartoc.html
index e7ea5dc..80a0099 100644
--- a/doc/source/templates/sidebartoc.html
+++ b/doc/source/templates/sidebartoc.html
@@ -1,15 +1,15 @@
-<div class="col-lg-3 col-md-4 col-sm-4 col-lg-pull-9 col-md-pull-8 col-sm-pull-8 docs-sidebar">
-    <div class="docs-sidebar-toc">
-    {%- if theme_display_global_toc_section %}
-      <div class="docs-sidebar-section" id="table-of-contents">
-        <a href="{{ pathto(master_doc) }}"
-            class="docs-sidebar-section-title"><h4>Open Telekom Cloud Documentation</h4></a>
-        {%- if theme_sidebar_mode == 'toc' %}
-        {{ toc }}
-        {%- elif theme_sidebar_mode == 'toctree' %}
-        {{ toctree(maxdepth=2, includehidden=True, collapse=False) }}
-        {%- endif %}
-      </div>
-    {%- endif %}
+<aside id="left-sidebar" class="docs-sidebar">
+  <div class="docs-sidebar-toc collapse" aria-label="Docs navigation" id="docs-sidebar-nav">
+  {%- if theme_display_global_toc_section %}
+    <div class="docs-sidebar-section" id="table-of-contents">
+      <a href="{{ pathto(master_doc) }}" class="docs-sidebar-section-title"><h4>Open Telekom Cloud Documentation</h4></a>
+      {%- if theme_sidebar_mode == 'toc' %}
+      {{ toc }}
+      {%- elif theme_sidebar_mode == 'toctree' %}
+      {{ toctree(maxdepth=2,includehidden=True, collapse=False) }}
+      {%- endif %}
     </div>
+  {%- endif %}
   </div>
+</aside>
+
diff --git a/setup.cfg b/setup.cfg
index 249becc..6063728 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = docsportal
-summary = OpenTelekomCloud Docs portal
+summary = OpenTelekomCloud Internal Docs portal
 author = Artem Goncharov
 author_email = artem.goncharov@gmail.com
 home_page = https://cloud.otc.com
@@ -19,4 +19,3 @@ classifier =
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Topic :: Documentation
-