diff --git a/.drone.yml b/.drone.yml
index 5ab4864ac50..f0042bc1c15 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -39,7 +39,7 @@ name: push-build-linux-amd64
 environment:
   BUILDBOX_VERSION: teleport10
   GID: "1000"
-  RUNTIME: go1.17.7
+  RUNTIME: go1.17.9
   UID: "1000"
 trigger:
   event:
@@ -142,7 +142,7 @@ name: push-build-linux-386
 environment:
   BUILDBOX_VERSION: teleport10
   GID: "1000"
-  RUNTIME: go1.17.7
+  RUNTIME: go1.17.9
   UID: "1000"
 trigger:
   event:
@@ -245,7 +245,7 @@ name: push-build-linux-amd64-fips
 environment:
   BUILDBOX_VERSION: teleport10
   GID: "1000"
-  RUNTIME: go1.17.7
+  RUNTIME: go1.17.9
   UID: "1000"
 trigger:
   event:
@@ -352,7 +352,7 @@ name: push-build-windows-amd64
 environment:
   BUILDBOX_VERSION: teleport10
   GID: "1000"
-  RUNTIME: go1.17.7
+  RUNTIME: go1.17.9
   UID: "1000"
 trigger:
   event:
@@ -512,7 +512,7 @@ steps:
   - tar -C  ~/build-$DRONE_BUILD_NUMBER-$DRONE_BUILD_CREATED-toolchains -xzf $RUNTIME.darwin-amd64.tar.gz
   - rm -rf $RUNTIME.darwin-amd64.tar.gz
   environment:
-    RUNTIME: go1.17.7
+    RUNTIME: go1.17.9
 - name: Install Rust Toolchain
   commands:
   - set -u
@@ -597,7 +597,7 @@ name: push-build-linux-arm
 environment:
   BUILDBOX_VERSION: teleport10
   GID: "1000"
-  RUNTIME: go1.17.7
+  RUNTIME: go1.17.9
   UID: "1000"
 trigger:
   event:
@@ -700,7 +700,7 @@ name: push-build-linux-arm64
 environment:
   BUILDBOX_VERSION: teleport10
   GID: "1000"
-  RUNTIME: go1.17.7
+  RUNTIME: go1.17.9
   UID: "1000"
 trigger:
   event:
@@ -1060,7 +1060,7 @@ type: kubernetes
 name: build-linux-amd64-centos7
 environment:
   BUILDBOX_VERSION: teleport10
-  RUNTIME: go1.17.7
+  RUNTIME: go1.17.9
 trigger:
   event:
     include:
@@ -1217,7 +1217,7 @@ type: kubernetes
 name: build-linux-amd64-centos7-fips
 environment:
   BUILDBOX_VERSION: teleport10
-  RUNTIME: go1.17.7
+  RUNTIME: go1.17.9
 trigger:
   event:
     include:
@@ -1373,7 +1373,7 @@ type: kubernetes
 name: build-linux-amd64
 environment:
   BUILDBOX_VERSION: teleport10
-  RUNTIME: go1.17.7
+  RUNTIME: go1.17.9
 trigger:
   event:
     include:
@@ -1527,7 +1527,7 @@ type: kubernetes
 name: build-linux-amd64-fips
 environment:
   BUILDBOX_VERSION: teleport10
-  RUNTIME: go1.17.7
+  RUNTIME: go1.17.9
 trigger:
   event:
     include:
@@ -2371,7 +2371,7 @@ type: kubernetes
 name: build-linux-386
 environment:
   BUILDBOX_VERSION: teleport10
-  RUNTIME: go1.17.7
+  RUNTIME: go1.17.9
 trigger:
   event:
     include:
@@ -2931,7 +2931,7 @@ steps:
   - tar -C  ~/build-$DRONE_BUILD_NUMBER-$DRONE_BUILD_CREATED-toolchains -xzf $RUNTIME.darwin-amd64.tar.gz
   - rm -rf $RUNTIME.darwin-amd64.tar.gz
   environment:
-    RUNTIME: go1.17.7
+    RUNTIME: go1.17.9
 - name: Install Rust Toolchain
   commands:
   - set -u
@@ -3429,7 +3429,7 @@ type: kubernetes
 name: build-linux-arm
 environment:
   BUILDBOX_VERSION: teleport10
-  RUNTIME: go1.17.7
+  RUNTIME: go1.17.9
 trigger:
   event:
     include:
@@ -3583,7 +3583,7 @@ type: kubernetes
 name: build-linux-arm64
 environment:
   BUILDBOX_VERSION: teleport10
-  RUNTIME: go1.17.7
+  RUNTIME: go1.17.9
 trigger:
   event:
     include:
@@ -4433,7 +4433,7 @@ type: kubernetes
 name: build-windows-amd64
 environment:
   BUILDBOX_VERSION: teleport10
-  RUNTIME: go1.17.7
+  RUNTIME: go1.17.9
 trigger:
   event:
     include:
@@ -4585,7 +4585,7 @@ name: build-docker-images
 
 environment:
   BUILDBOX_VERSION: "teleport10"
-  RUNTIME: go1.17.7
+  RUNTIME: go1.17.9
 
 trigger:
   event:
@@ -5388,6 +5388,6 @@ volumes:
       name: drone-s3-debrepo-pvc
 ---
 kind: signature
-hmac: b9ae19a816d40a43d4307cb8395ddbe141b8c2eddb1cc1c905eabc95ff8795a5
+hmac: fce237c39d1cb94d4d9faaa5889b61717068d1602c9c3b9c4fd92ca4054e8569
 
 ...
diff --git a/build.assets/Makefile b/build.assets/Makefile
index 7f6c63b518e..873777f0601 100644
--- a/build.assets/Makefile
+++ b/build.assets/Makefile
@@ -17,7 +17,7 @@ TEST_KUBE ?=
 OS ?= linux
 ARCH ?= amd64
 BUILDBOX_VERSION ?= teleport10
-GOLANG_VERSION ?= go1.17.7
+GOLANG_VERSION ?= go1.17.9
 RUST_VERSION ?= 1.58.1
 BORINGCRYPTO_RUNTIME=$(GOLANG_VERSION)b7
 LIBBPF_VERSION ?= 0.3.1
diff --git a/docker/Dockerfile b/docker/Dockerfile
index b85f581836d..e8cb11a28e0 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,6 +1,6 @@
 # The base image (buildbox:latest) is built by running `make -C build.assets`
 # from the base repo directory $GOPATH/gravitational.com/teleport
-FROM quay.io/gravitational/teleport-buildbox:go1.17.2
+FROM quay.io/gravitational/teleport-buildbox:teleport10
 
 # DEBUG=1 is needed for the Web UI to be loaded from static assets instead
 # of the binary
diff --git a/e b/e
index 8e42bfe0543..013d434cf49 160000
--- a/e
+++ b/e
@@ -1 +1 @@
-Subproject commit 8e42bfe0543b7cda3e87fdbdb60712d2c8cfd47b
+Subproject commit 013d434cf4982289edb6222f45d49deff9da17d2