diff --git a/.gitmodules b/.gitmodules
index a4e47f19f9..8044a68a56 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -9,8 +9,4 @@
 [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 3c97a47a4a..4d12d9f75b 100644
--- a/config.json
+++ b/config.json
@@ -66,15 +66,11 @@
     },
     {
       "name": "15.x",
-      "branch": "branch/v15"
-    },
-    {
-      "name": "16.x",
-      "branch": "branch/v16",
+      "branch": "branch/v15",
       "latest": true
     },
     {
-      "name": "17.x",
+      "name": "16.x",
       "branch": "master"
     }
   ]
diff --git a/content/17.x b/content/17.x
deleted file mode 160000
index a98b0430ad..0000000000
--- a/content/17.x
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a98b0430add9e1cfdff68acf90960aef396d5822