diff --git a/1.18/alpine3.16/Dockerfile b/1.18/alpine3.16/Dockerfile
index 6068d40a..e2eff2d0 100644
--- a/1.18/alpine3.16/Dockerfile
+++ b/1.18/alpine3.16/Dockerfile
@@ -8,16 +8,6 @@ FROM alpine:3.16
 
 RUN apk add --no-cache ca-certificates
 
-# ensure that nsswitch.conf is set up for Go's "netgo" implementation
-# - https://github.com/golang/go/blob/go1.19.3/src/net/conf.go#L227-L303
-# - docker run --rm debian grep '^hosts:' /etc/nsswitch.conf
-# Alpine 3.16 includes nsswitch.conf
-RUN set -eux; \
-	if [ -e /etc/nsswitch.conf ]; then \
-		grep '^hosts: files dns' /etc/nsswitch.conf; \
-	else \
-		echo 'hosts: files dns' > /etc/nsswitch.conf; \
-	fi
 
 ENV PATH /usr/local/go/bin:$PATH
 
diff --git a/1.18/alpine3.15/Dockerfile b/1.18/alpine3.17/Dockerfile
similarity index 87%
rename from 1.18/alpine3.15/Dockerfile
rename to 1.18/alpine3.17/Dockerfile
index 85bcb0d8..59d6ab08 100644
--- a/1.18/alpine3.15/Dockerfile
+++ b/1.18/alpine3.17/Dockerfile
@@ -4,20 +4,10 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.15
+FROM alpine:3.17
 
 RUN apk add --no-cache ca-certificates
 
-# ensure that nsswitch.conf is set up for Go's "netgo" implementation
-# - https://github.com/golang/go/blob/go1.19.3/src/net/conf.go#L227-L303
-# - docker run --rm debian grep '^hosts:' /etc/nsswitch.conf
-# Alpine 3.16 includes nsswitch.conf
-RUN set -eux; \
-	if [ -e /etc/nsswitch.conf ]; then \
-		grep '^hosts: files dns' /etc/nsswitch.conf; \
-	else \
-		echo 'hosts: files dns' > /etc/nsswitch.conf; \
-	fi
 
 ENV PATH /usr/local/go/bin:$PATH
 
diff --git a/1.19/alpine3.16/Dockerfile b/1.19/alpine3.16/Dockerfile
index 13414f17..a9e033f8 100644
--- a/1.19/alpine3.16/Dockerfile
+++ b/1.19/alpine3.16/Dockerfile
@@ -8,16 +8,6 @@ FROM alpine:3.16
 
 RUN apk add --no-cache ca-certificates
 
-# ensure that nsswitch.conf is set up for Go's "netgo" implementation
-# - https://github.com/golang/go/blob/go1.19.3/src/net/conf.go#L227-L303
-# - docker run --rm debian grep '^hosts:' /etc/nsswitch.conf
-# Alpine 3.16 includes nsswitch.conf
-RUN set -eux; \
-	if [ -e /etc/nsswitch.conf ]; then \
-		grep '^hosts: files dns' /etc/nsswitch.conf; \
-	else \
-		echo 'hosts: files dns' > /etc/nsswitch.conf; \
-	fi
 
 ENV PATH /usr/local/go/bin:$PATH
 
diff --git a/1.19/alpine3.15/Dockerfile b/1.19/alpine3.17/Dockerfile
similarity index 88%
rename from 1.19/alpine3.15/Dockerfile
rename to 1.19/alpine3.17/Dockerfile
index 2cfe9d22..7429437e 100644
--- a/1.19/alpine3.15/Dockerfile
+++ b/1.19/alpine3.17/Dockerfile
@@ -4,20 +4,10 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.15
+FROM alpine:3.17
 
 RUN apk add --no-cache ca-certificates
 
-# ensure that nsswitch.conf is set up for Go's "netgo" implementation
-# - https://github.com/golang/go/blob/go1.19.3/src/net/conf.go#L227-L303
-# - docker run --rm debian grep '^hosts:' /etc/nsswitch.conf
-# Alpine 3.16 includes nsswitch.conf
-RUN set -eux; \
-	if [ -e /etc/nsswitch.conf ]; then \
-		grep '^hosts: files dns' /etc/nsswitch.conf; \
-	else \
-		echo 'hosts: files dns' > /etc/nsswitch.conf; \
-	fi
 
 ENV PATH /usr/local/go/bin:$PATH
 
diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template
index 8215bacf..65ce7d91 100644
--- a/Dockerfile-linux.template
+++ b/Dockerfile-linux.template
@@ -10,16 +10,6 @@ FROM alpine:{{ alpine_version }}
 
 RUN apk add --no-cache ca-certificates
 
-# ensure that nsswitch.conf is set up for Go's "netgo" implementation
-# - https://github.com/golang/go/blob/go1.19.3/src/net/conf.go#L227-L303
-# - docker run --rm debian grep '^hosts:' /etc/nsswitch.conf
-# Alpine 3.16 includes nsswitch.conf
-RUN set -eux; \
-	if [ -e /etc/nsswitch.conf ]; then \
-		grep '^hosts: files dns' /etc/nsswitch.conf; \
-	else \
-		echo 'hosts: files dns' > /etc/nsswitch.conf; \
-	fi
 {{ ) else ( -}}
 FROM buildpack-deps:{{ env.variant }}-scm
 
diff --git a/versions.json b/versions.json
index 17e39c37..c5057f44 100644
--- a/versions.json
+++ b/versions.json
@@ -155,8 +155,8 @@
     "variants": [
       "bullseye",
       "buster",
+      "alpine3.17",
       "alpine3.16",
-      "alpine3.15",
       "windows/windowsservercore-ltsc2022",
       "windows/windowsservercore-1809",
       "windows/nanoserver-ltsc2022",
@@ -320,8 +320,8 @@
     "variants": [
       "bullseye",
       "buster",
+      "alpine3.17",
       "alpine3.16",
-      "alpine3.15",
       "windows/windowsservercore-ltsc2022",
       "windows/windowsservercore-1809",
       "windows/nanoserver-ltsc2022",
diff --git a/versions.sh b/versions.sh
index 9fc938d4..cffa2176 100755
--- a/versions.sh
+++ b/versions.sh
@@ -144,8 +144,8 @@ for version in "${versions[@]}"; do
 			"bullseye",
 			"buster",
 			(
-				"3.16",
-				"3.15"
+				"3.17",
+				"3.16"
 			| "alpine" + .),
 			if .arches | has("windows-amd64") then
 				(