diff --git a/.gitmodules b/.gitmodules
index 8044a68a56..a4e47f19f9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -9,4 +9,8 @@
 [submodule "content/16.x"]
 	path = content/16.x
 	url = https://github.com/gravitational/teleport
+	branch = branch/v16
+[submodule "content/17.x"]
+	path = content/17.x
+	url = https://github.com/gravitational/teleport
 	branch = master
diff --git a/config.json b/config.json
index 4d12d9f75b..3c97a47a4a 100644
--- a/config.json
+++ b/config.json
@@ -66,11 +66,15 @@
     },
     {
       "name": "15.x",
-      "branch": "branch/v15",
-      "latest": true
+      "branch": "branch/v15"
     },
     {
       "name": "16.x",
+      "branch": "branch/v16",
+      "latest": true
+    },
+    {
+      "name": "17.x",
       "branch": "master"
     }
   ]
diff --git a/content/17.x b/content/17.x
new file mode 160000
index 0000000000..a98b0430ad
--- /dev/null
+++ b/content/17.x
@@ -0,0 +1 @@
+Subproject commit a98b0430add9e1cfdff68acf90960aef396d5822