diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 5d766b513..f5b4cfe8b 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -20,7 +20,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: "1.17.6"
+          go-version: "1.17.8"
       - env:
           TARGET: ${{ matrix.target }}
         run: |
diff --git a/.github/workflows/contrib.yaml b/.github/workflows/contrib.yaml
index 612580ce2..bda6686ba 100644
--- a/.github/workflows/contrib.yaml
+++ b/.github/workflows/contrib.yaml
@@ -7,5 +7,5 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-go@v2
       with:
-        go-version: "1.17.6"
+        go-version: "1.17.8"
     - run: make -C contrib/mixin tools test
diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml
index 0bab51853..916920f46 100644
--- a/.github/workflows/coverage.yaml
+++ b/.github/workflows/coverage.yaml
@@ -12,7 +12,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-go@v2
       with:
-        go-version: "1.17.6"
+        go-version: "1.17.8"
     - env:
         TARGET: ${{ matrix.target }}
       run: |
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 940002e2c..0e96cb61b 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -13,7 +13,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-go@v2
       with:
-        go-version: "1.17.6"
+        go-version: "1.17.8"
     - run: date
     - env:
         TARGET: ${{ matrix.target }}
diff --git a/.github/workflows/functional.yaml b/.github/workflows/functional.yaml
index 3aa957266..59dd6452f 100644
--- a/.github/workflows/functional.yaml
+++ b/.github/workflows/functional.yaml
@@ -12,7 +12,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-go@v2
       with:
-        go-version: "1.17.6"
+        go-version: "1.17.8"
     - run: date
     - env:
         TARGET: ${{ matrix.target }}
diff --git a/.github/workflows/grpcproxy.yaml b/.github/workflows/grpcproxy.yaml
index b20d60413..6ef4c389e 100644
--- a/.github/workflows/grpcproxy.yaml
+++ b/.github/workflows/grpcproxy.yaml
@@ -13,7 +13,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-go@v2
       with:
-        go-version: "1.17.6"
+        go-version: "1.17.8"
     - run: date
     - env:
         TARGET: ${{ matrix.target }}
diff --git a/.github/workflows/static-analysis.yaml b/.github/workflows/static-analysis.yaml
index 0f87a5d0f..4bbd50979 100644
--- a/.github/workflows/static-analysis.yaml
+++ b/.github/workflows/static-analysis.yaml
@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: "1.17.6"
+          go-version: "1.17.8"
       - run: date
       - env:
           TARGET: ${{ matrix.target }}
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 2348d0aa7..b3b107dab 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -16,7 +16,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-go@v2
       with:
-        go-version: "1.17.6"
+        go-version: "1.17.8"
     - run: date
     - env:
         TARGET: ${{ matrix.target }}
diff --git a/CHANGELOG/CHANGELOG-3.6.md b/CHANGELOG/CHANGELOG-3.6.md
index 386e2265f..9210d427f 100644
--- a/CHANGELOG/CHANGELOG-3.6.md
+++ b/CHANGELOG/CHANGELOG-3.6.md
@@ -74,6 +74,9 @@ See [List of metrics](https://etcd.io/docs/latest/metrics/) for all metrics per
 
 - Add [`etcd_disk_defrag_inflight`](https://github.com/etcd-io/etcd/pull/13371).
 
+### Go
+- Compile with [Go 1.17+](https://golang.org/doc/devel/release.html#go1.17)
+
 ### Other
 
 - Use Distroless as base image to make the image less vulnerable and reduce image size.
diff --git a/Makefile b/Makefile
index 07f183c74..c6a08e06d 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ clean:
 	rm -rf ./tests/e2e/default.proxy
 	find ./ -name "127.0.0.1:*" -o -name "localhost:*" -o -name "*.log" -o -name "agent-*" -o -name "*.coverprofile" -o -name "testname-proxy-*" | $(XARGS)
 
-GO_VERSION ?= 1.17.6
+GO_VERSION ?= 1.17.8
 ETCD_VERSION ?= $(shell git rev-parse --short HEAD || echo "GitNotFound")
 
 TEST_SUFFIX = $(shell date +%s | base64 | head -c 15)
diff --git a/tests/functional/Dockerfile b/tests/functional/Dockerfile
index 74b6e3775..15b55e9a1 100644
--- a/tests/functional/Dockerfile
+++ b/tests/functional/Dockerfile
@@ -13,7 +13,7 @@ RUN dnf check-update || true \
 ENV GOROOT /usr/local/go
 ENV GOPATH /go
 ENV PATH ${GOPATH}/bin:${GOROOT}/bin:${PATH}
-ENV GO_VERSION 1.17.6
+ENV GO_VERSION 1.17.8
 ENV GO_DOWNLOAD_URL https://storage.googleapis.com/golang
 RUN rm -rf ${GOROOT} \
   && curl -s ${GO_DOWNLOAD_URL}/go${GO_VERSION}.linux-amd64.tar.gz | tar -v -C /usr/local/ -xz \
diff --git a/tests/manual/Makefile b/tests/manual/Makefile
index 4e4f5e84d..d61f82eba 100644
--- a/tests/manual/Makefile
+++ b/tests/manual/Makefile
@@ -1,5 +1,5 @@
 TMP_DOCKERFILE:=$(shell mktemp)
-GO_VERSION ?= 1.17.2
+GO_VERSION ?= 1.17.8
 TMP_DIR_MOUNT_FLAG = --tmpfs=/tmp:exec
 ifdef HOST_TMP_DIR
 	TMP_DIR_MOUNT_FLAG = --mount type=bind,source=$(HOST_TMP_DIR),destination=/tmp