diff --git a/linkerd.io/content/enterprise.md b/linkerd.io/content/enterprise.md
deleted file mode 100644
index cfea1e1641..0000000000
--- a/linkerd.io/content/enterprise.md
+++ /dev/null
@@ -1,25 +0,0 @@
----
-description: Lists companies that provide commercial support for Linkerd.
-title: Enterprise
-layout: enterprise
-type: enterprise
-weight: "1"
-support:
-  bottom_description: Offering Linkerd support? Add your company!
-  description: ''
-  title: 'Companies offering commercial support and other enterprise offerings for
-    Linkerd:'
-  buttons:
-  - caption: Create Pull Request
-    url: https://github.com/linkerd/website/pulls
-  companies:
-  - description: Buoyant is the original creator of Linkerd and provides support,
-      training, and enterprise products.
-    thumbnail: "/uploads/buoyant_logo_icon-only_primary.svg"
-    title: Buoyant
-    url: https://buoyant.io/linkerd-support/
-menu:
-  top:
-    weight: 4
-
----
diff --git a/linkerd.io/content/support-training.md b/linkerd.io/content/support-training.md
new file mode 100644
index 0000000000..0530a06d39
--- /dev/null
+++ b/linkerd.io/content/support-training.md
@@ -0,0 +1,36 @@
+---
+description: Lists of educational resources and companies that provide commercial support for Linkerd.
+title: Support & Training
+layout: enterprise
+type: enterprise
+weight: "1"
+menu:
+  top:
+    weight: 4
+
+support:
+  kinds:
+  - title: 'Courses'
+    entries:
+    - description: Introduction to Service Mesh with Linkerd | edx
+      thumbnail: "/uploads/linux-foundation-logo.svg"
+      title: The Linux Foundation
+      url: https://www.edx.org/course/introduction-to-service-mesh-with-linkerd
+    - description: Introduction to Kubernetes | edx
+      thumbnail: "/uploads/linux-foundation-logo.svg"
+      title: The Linux Foundation
+      url: https://www.edx.org/course/introduction-to-kubernetes
+  - title: 'Commercial support'
+    entries:
+    - description: Buoyant is the original creator of Linkerd and provides support, training, and enterprise products.
+      thumbnail: "/uploads/buoyant_logo_icon-only_primary.svg"
+      title: Buoyant
+      url: https://buoyant.io/linkerd-support/
+
+  bottom_description: Offering Linkerd support? Add your company!
+  description: ''
+  buttons:
+  - caption: Edit this page
+    url: https://github.com/linkerd/website/edit/main/linkerd.io/content/support-training.md
+---
+
diff --git a/linkerd.io/layouts/partials/enterprise/support.html b/linkerd.io/layouts/partials/enterprise/support.html
index 6688fa6991..9fdf8029a0 100644
--- a/linkerd.io/layouts/partials/enterprise/support.html
+++ b/linkerd.io/layouts/partials/enterprise/support.html
@@ -1,9 +1,10 @@
 <div class="wrapper has-background-bright-blue has-text-white has-text-centered is-fullheight hero">
   <div class="container jobs-list-container notification has-background-bright-blue enterprise-top-hero">
+    {{ range .kinds }}
     <h1 class="title is-size-1">{{.title}}</h1>
     <h5 class="title is-size-5">{{.description | markdownify}}</h5>
     <div class="columns jobs-list is-multiline">
-      {{ range .companies }}
+      {{ range .entries }}
       <div class="column is-half job-item">
         <a class="has-text-color box-link" href="{{ .url }}">
           <div class="box">
@@ -29,6 +30,7 @@ <h6 class="is-size-6 has-text-weight-light">{{.description | markdownify}}</h6>
       </div>
       {{ end }}
     </div>
+    {{ end }}
     <h5 class="title is-size-5 has-text-light-green">{{.bottom_description | markdownify}}</h5>
     <div class="columns">
       {{ range .buttons }}
diff --git a/linkerd.io/static/uploads/linux-foundation-logo.svg b/linkerd.io/static/uploads/linux-foundation-logo.svg
new file mode 100644
index 0000000000..d407b8b335
--- /dev/null
+++ b/linkerd.io/static/uploads/linux-foundation-logo.svg
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg5076"
+   width="500"
+   height="500"
+   viewBox="0 0 500 500"
+   sodipodi:docname="linux Foundation.svg"
+   inkscape:version="0.92.1 r15371">
+  <metadata
+     id="metadata5082">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs5080" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     id="namedview5078"
+     showgrid="false"
+     inkscape:zoom="0.35355339"
+     inkscape:cx="-279.86355"
+     inkscape:cy="19.888105"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg5076" />
+  <image
+     width="500"
+     height="500"
+     preserveAspectRatio="none"
+     style="image-rendering:optimizeSpeed"
+     xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAfQAAAH0CAMAAAD8CC+4AAAAA3NCSVQICAjb4U/gAAAAGFBMVEVM
+aXEANmQem94em94AN2QSc6wAN2Qfm94muc+oAAAABnRSTlMA6uCwsGC2lKgnAAAEvUlEQVR4nO3T
+gW3CQBBFQUxw6L/jUAKHlDX2m2lgdf/pbjeCtl9aNtF7RA8SPUj0INGDRA8SPUj0INGDRA8SPUj0
+INGDRA8SPUj0INGDRA8SPUj0INGDRA8SPUj0INGDRA8SPUj0INGDRA8SPUj0INGDRA8SPUj0INGD
+RA8SPUj0INGDRA8SPUj0INGDRA8SPUj0INGDRA8SPUj0INGDRA8SPUj0INGDRA8SPUj0INGDRA8S
+PUj0INGDRA8SPUj0INGDRA8SPUj0INGDRA8SPUj0INGDRA8SPUj0INGDRA8SPUj0INGDRA8SPUj0
+INGDRA8SPUj0INGDRA8SPUj0INGDRA8SPWgm+usKb5rJIfpXET1I9CDRg0QPEj1I9CDRg0QPEj1I
+9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDR
+g0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg2Zy7AOOXvJE/MEg0YNEDxI9SPQg0YNEDxI9SPQg
+0YNEDxI9SPQg0YNEDxI9SPQg0YNEDxI9SPQg0YNEDxI9SPQg0YNEDxI9SPQg0YNEDxI9SPQg0YNE
+DxI9SPQg0YNEDxI9SPQg0YNEDxI9SPQg0YNEDxI9SPSgmej3AUcveSIz0Z8Djl7yREQPEj1I9CDR
+g0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QP
+Ej1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I
+9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDR
+g0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QP
+Ej1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I
+9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDR
+g0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QP
+Ej1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPuk70+zXsywkf26r/bz4V/SI+iD7Q
+cJnoK0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDR
+g0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QP
+Ej1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I
+9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg0QPEj1I9CDRg64T/Yd3rUff
+H99o+Rmc3x9cqVQFVrq+3gAAAABJRU5ErkJggg==
+"
+     id="image5084"
+     x="0"
+     y="0" />
+  <path
+     style="fill:#1f9bde;fill-opacity:1"
+     d="M 1,349.5 V 200 h 50 50 v 99.5 99.5 h 100 100 v 50 50 H 151 1 Z M 350,449 v -50 h 25 25 V 250 101 H 250.5 101 v 25 25 H 51 1 V 76 1 H 250.5 500 v 249 249 h -75 -75 z"
+     id="path5629"
+     inkscape:connector-curvature="0" />
+  <path
+     style="opacity:1;fill:#003764;fill-opacity:1;stroke:none;stroke-width:0.001;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1;stroke-dasharray:none"
+     d="m 1,1 c 0.06656,49.456877 -0.23208744,100.61168 0,150 32.977813,-0.0662 67.090858,0.23208 100,0 l -0.0684,-50.04763 h 299 l 0.0256,291.46195 -0.0256,6.53805 c -16.96486,0.0662 -33.10373,-0.23178 -50,0 0.0662,32.97781 -0.16372,67.13847 0.0684,100.04763 49.95633,-0.0664 100.11231,0.23208 150,0 C 499.9337,333.18999 500.23216,166.74132 500,1 333.69067,1.0663854 167.24067,0.7679231 1,1 Z"
+     id="path6186"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccccccccc" />
+  <path
+     style="opacity:1;fill:#1f9bde;fill-opacity:1;stroke:none;stroke-width:0.001;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1;stroke-dasharray:none"
+     d="m 0.90980496,200.82473 c 0.0664207,99.39385 -0.13259586,198.89766 0.0994836,298.2229 99.8932714,-0.0664 199.8964014,0.13258 299.7210114,-0.0995 -0.0662,-32.97781 0.13258,-66.06543 -0.0995,-98.97459 -66.88231,0 -133.76462,0 -200.646932,0 -0.06651,-66.4023 0.132562,-132.9146 -0.0995,-199.24832 -32.977698,0.0662 -66.065608,-0.13248 -98.97458408,0.0995 z"
+     id="path6188"
+     inkscape:connector-curvature="0" />
+</svg>
diff --git a/netlify.toml b/netlify.toml
index 5aa98611ee..cb79fc1282 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -11,3 +11,8 @@ command = "make preview-build"
 
 [context.branch-deploy]
 command = "make preview-build"
+
+[[redirects]]
+  from = "/enterprise"
+  to = "/support-training/"
+  status = 301