diff --git a/.mdox.yaml b/.mdox.yaml
index 4f8a0be006..1c9c4dd589 100644
--- a/.mdox.yaml
+++ b/.mdox.yaml
@@ -72,6 +72,10 @@ transformations:
     backMatter: *docBackMatter
 
   # Non-versioned element: Blog.
+
+  - glob: "support/*"
+    path: /../support/*
+
   - glob: "blog/*"
     path: /../blog/*
 
diff --git a/docs/support/welcome.md b/docs/support/welcome.md
new file mode 100644
index 0000000000..c4e48c5582
--- /dev/null
+++ b/docs/support/welcome.md
@@ -0,0 +1,6 @@
+---
+title: Welcome to Support and Training!
+author: Thanos Team
+---
+
+Anyone who has developed a Thanos training program or offers related services can add themselves to this page by opening a pull request against it.
diff --git a/website/data/adopters.yml b/website/data/adopters.yml
index 5b2ad40aeb..0a306c768e 100644
--- a/website/data/adopters.yml
+++ b/website/data/adopters.yml
@@ -236,4 +236,4 @@ adopters:
   logo: grupo-olx.png
 - name: TrueLayer
   url: https://truelayer.com/
-  logo: truelayer.png
+  logo: truelayer.png
\ No newline at end of file
diff --git a/website/layouts/_default/baseof.html b/website/layouts/_default/baseof.html
index 4fd3803768..83b539295b 100644
--- a/website/layouts/_default/baseof.html
+++ b/website/layouts/_default/baseof.html
@@ -46,6 +46,9 @@
                         <button type="submit" class="searchbtn"><i class="fas fa-search"></i></button>
                     </div>
                 </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="/support">Support and Training</a>
+                </li>
                 <li class="nav-item">
                     <a class="nav-link" href="https://github.com/{{ .Site.Params.GithubUser }}/{{ .Site.Params.GithubProject }}/releases">Releases</a>
                 </li>
diff --git a/website/layouts/partials/versioning/version-picker.html b/website/layouts/partials/versioning/version-picker.html
index 732afd453d..f2f4fa9c1e 100644
--- a/website/layouts/partials/versioning/version-picker.html
+++ b/website/layouts/partials/versioning/version-picker.html
@@ -4,6 +4,7 @@
         {{- range .Site.Sections.Reverse }}
       {{- $version := .Section }}
       {{- if eq $version "blog" }}{{continue}}{{end}}
+      {{- if eq $version "support" }}{{continue}}{{end}}
       <a class="dropdown-item" href="{{ printf "../../../../%s" $version }}/thanos/getting-started.md">
         {{ $version }}
       </a>
diff --git a/website/layouts/support/list.html b/website/layouts/support/list.html
new file mode 100644
index 0000000000..84057b7ef6
--- /dev/null
+++ b/website/layouts/support/list.html
@@ -0,0 +1,28 @@
+{{ define "main" }}
+ <div class="container">
+     <div class="row py-5">
+         <div class="col col-12">
+             {{ range .Paginator.Pages }}
+                 <div class="mb-5 container">
+                     <h2><a href="{{ .Permalink }}">Support and Training</a></h2>
+                     <p class ="text-muted" style="margin-bottom: 5rem;">Firms that offer consultancy and enterprise support.</p>
+                     <div class="d-flex justify-content-around">
+                         <a href="https://www.cloudraft.io">
+                             <img src="{{ "/cloudraft.png" | relURL }}"  alt="" style="width: auto; height: auto; border-color: #ccc; margin-top: 2rem">
+                         </a>
+                         <a href="https://o11y.eu">
+                             <img src="{{ "/o11y.svg" | relURL }}"  alt="" style="width: auto; height: auto; border-color: #ccc;">
+                         </a>
+                     </div>
+                     <hr>
+                     {{ .Summary }}
+                 </div>
+                 <div class="d-flex align-items-center justify-content-center mb-5">
+                     <a href="https://github.com/thanos-io/thanos" target="_blank" class="btn btn-primary btn-lg">Add your company</a>
+                 </div>
+             {{ end}}
+             {{ template "_internal/pagination.html" . }}
+         </div>
+     </div>
+ </div>
+ {{ end }} 
\ No newline at end of file
diff --git a/website/layouts/support/single.html b/website/layouts/support/single.html
new file mode 100644
index 0000000000..f0a955227e
--- /dev/null
+++ b/website/layouts/support/single.html
@@ -0,0 +1,14 @@
+{{ define "main" }}
+ <div class="container">
+     <div class="row py-5">
+         <div class="col col-12">
+             <div class="mb-5">
+                 <h2><a href="{{ .Permalink }}">{{ .Title }}</a></h2>
+                 <p class="text-muted"></p>
+                 <hr>
+                 {{ .Content }}
+             </div>
+         </div>
+     </div>
+ </div>
+ {{ end }} 
\ No newline at end of file
diff --git a/website/static/cloudraft.png b/website/static/cloudraft.png
new file mode 100644
index 0000000000..c76ca7987f
Binary files /dev/null and b/website/static/cloudraft.png differ
diff --git a/website/static/o11y.svg b/website/static/o11y.svg
new file mode 100644
index 0000000000..2163d8cf1b
--- /dev/null
+++ b/website/static/o11y.svg
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="270px"
+   height="96px"
+   viewBox="0 0 270 96"
+   version="1.1"
+   id="svg61"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs65" />
+  <g
+     aria-label="O11y"
+     id="text809"
+     style="font-size:81.8749px;line-height:125%;font-family:'Geometr415 Lt BT';-inkscape-font-specification:'Geometr415 Lt BT';letter-spacing:0px;word-spacing:0px;stroke-width:2.04687px">
+    <g
+       id="g16741"
+       transform="translate(7.2690765,-0.2609725)">
+      <path
+         d="m 65.833587,70.530946 q -7.041241,0 -13.018109,-2.210623 -5.894993,-2.210622 -10.234362,-6.222492 -4.33937,-4.093745 -6.795617,-9.579364 -2.374372,-5.485618 -2.374372,-11.953735 0,-6.549992 2.374372,-11.953736 2.456247,-5.485618 6.795617,-9.497488 4.339369,-4.093745 10.234362,-6.304367 5.976868,-2.210623 12.936235,-2.210623 7.041241,0 12.936234,2.210623 5.894993,2.210622 10.234362,6.304367 4.33937,4.01187 6.713742,9.497488 2.456247,5.403744 2.456247,11.953736 0,6.468117 -2.456247,11.953735 -2.374372,5.485619 -6.713742,9.579364 -4.339369,4.01187 -10.234362,6.222492 -5.894993,2.210623 -12.85436,2.210623 z M 65.751713,54.89284 q 2.701871,0 4.994369,-0.982499 2.374372,-0.982499 4.093745,-2.783747 1.801247,-1.883123 2.783746,-4.503119 0.982499,-2.701872 0.982499,-6.058743 0,-3.356871 -0.982499,-5.976868 -0.982499,-2.701872 -2.783746,-4.503119 -1.719373,-1.883123 -4.093745,-2.865622 -2.292498,-0.982499 -4.994369,-0.982499 -2.701872,0 -5.076244,0.982499 -2.292498,0.982499 -4.093745,2.865622 -1.719373,1.801247 -2.701872,4.503119 -0.982499,2.619997 -0.982499,5.976868 0,3.356871 0.982499,6.058743 0.982499,2.619996 2.701872,4.503119 1.801247,1.801248 4.093745,2.783747 2.374372,0.982499 5.076244,0.982499 z"
+         style="font-weight:900;font-family:Montserrat;-inkscape-font-specification:'Montserrat Heavy';fill:#ff0044;fill-opacity:1"
+         id="path15863" />
+      <path
+         d="M 109.88223,69.220947 V 18.622259 l 8.26937,7.85999 H 100.05724 V 11.908517 h 29.14747 v 57.31243 z"
+         style="font-weight:900;font-family:Montserrat;-inkscape-font-specification:'Montserrat Heavy';fill:#ff0044;fill-opacity:1"
+         id="path15865" />
+      <path
+         d="M 144.10588,69.220947 V 18.622259 l 8.26936,7.85999 H 134.28089 V 11.908517 h 29.14747 v 57.31243 z"
+         style="font-weight:900;font-family:Montserrat;-inkscape-font-specification:'Montserrat Heavy';fill:#ff0044;fill-opacity:1"
+         id="path15867" />
+      <path
+         d="m 182.0139,85.923427 q -3.68437,0 -7.53249,-1.146249 -3.76625,-1.064373 -6.05875,-2.865621 l 6.14062,-12.69061 q 1.39188,1.064374 3.11125,1.719373 1.80125,0.654999 3.43874,0.654999 2.45625,0 3.76625,-1.064373 1.31,-0.982499 2.12875,-3.029372 l 1.88312,-4.748744 1.31,-1.801248 14.32811,-36.516205 h 17.52122 l -18.42185,45.686194 q -2.45624,6.140618 -5.73124,9.579364 -3.19312,3.438745 -7.20499,4.830619 -3.93,1.391873 -8.67874,1.391873 z M 186.35327,71.26782 166.86704,24.435377 h 18.99498 l 13.42748,34.878707 z"
+         style="font-weight:900;font-family:Montserrat;-inkscape-font-specification:'Montserrat Heavy';fill:#ff0044;fill-opacity:1"
+         id="path15869" />
+    </g>
+  </g>
+</svg>