diff --git a/1.16-rc/alpine3.12/Dockerfile b/1.16-rc/alpine3.12/Dockerfile
index bcb89340..678e9d47 100644
--- a/1.16-rc/alpine3.12/Dockerfile
+++ b/1.16-rc/alpine3.12/Dockerfile
@@ -43,7 +43,7 @@ RUN set -eux; \
 	case "$apkArch" in \
 		armhf) export GOARM='6' ;; \
 		armv7) export GOARM='7' ;; \
-		x86) export GO386='387' ;; \
+		x86) export GO386='softfloat' ;; \
 	esac; \
 	\
 # https://github.com/golang/go/issues/38536#issuecomment-616897960
diff --git a/1.16-rc/alpine3.13/Dockerfile b/1.16-rc/alpine3.13/Dockerfile
index 7f15c1e0..fc28814c 100644
--- a/1.16-rc/alpine3.13/Dockerfile
+++ b/1.16-rc/alpine3.13/Dockerfile
@@ -43,7 +43,7 @@ RUN set -eux; \
 	case "$apkArch" in \
 		armhf) export GOARM='6' ;; \
 		armv7) export GOARM='7' ;; \
-		x86) export GO386='387' ;; \
+		x86) export GO386='softfloat' ;; \
 	esac; \
 	\
 # https://github.com/golang/go/issues/38536#issuecomment-616897960
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index ef90a0b8..55334f39 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -37,7 +37,7 @@ RUN set -eux; \
 	case "$apkArch" in \
 		armhf) export GOARM='6' ;; \
 		armv7) export GOARM='7' ;; \
-		x86) export GO386='387' ;; \
+		x86) export GO386='{{ if env.version == "1.14" or env.version == "1.15" then "387" else "softfloat" end }}' ;; \
 	esac; \
 	\
 # https://github.com/golang/go/issues/38536#issuecomment-616897960