diff --git a/ci/release/build_docker.sh b/ci/release/build_docker.sh
index f5505b7b7..88aacac87 100755
--- a/ci/release/build_docker.sh
+++ b/ci/release/build_docker.sh
@@ -4,6 +4,7 @@ cd -- "$(dirname "$0")/../.."
 . ./ci/sub/lib.sh
 
 tag="$(sh_c docker build \
+  --build-arg GOVERSION="1.19.3.linux-$ARCH" \
   -qf ./ci/release/builders/Dockerfile ./ci/release/builders )"
 sh_c docker run -it --rm \
   -v "$HOME:$HOME" \
@@ -16,4 +17,5 @@ sh_c docker run -it --rm \
   -e ARCH="$ARCH" \
   -e ARCHIVE="$ARCHIVE" \
   -e TERM="$TERM" \
+  -e HOME="$HOME" \
   "$tag" ./src/d2/ci/release/_build.sh
diff --git a/ci/release/builders/Dockerfile b/ci/release/builders/Dockerfile
index 59dd7f86c..c3d3cc22e 100644
--- a/ci/release/builders/Dockerfile
+++ b/ci/release/builders/Dockerfile
@@ -1,8 +1,8 @@
 FROM centos:7
 
-ARG GOVERSION=1.19.3
+ARG GOVERSION=
 
-RUN curl -fsSL "https://go.dev/dl/go$GOVERSION.linux-amd64.tar.gz" >/tmp/go.tar.gz
+RUN curl -fsSL "https://go.dev/dl/go$GOVERSION.tar.gz" >/tmp/go.tar.gz
 RUN tar -C /usr/local -xzf /tmp/go.tar.gz
 
 ENV PATH="/usr/local/go/bin:$PATH"
diff --git a/ci/release/builders/create_aws.sh b/ci/release/builders/create_aws.sh
index 4d71dc339..dc9eee94c 100755
--- a/ci/release/builders/create_aws.sh
+++ b/ci/release/builders/create_aws.sh
@@ -79,6 +79,16 @@ create_aws() {
       --tag-specifications 'ResourceType=instance,Tags=[{Key=Name,Value=d2-builder-linux-amd64}]' \
         'ResourceType=volume,Tags=[{Key=Name,Value=d2-builder-linux-amd64}]' >/dev/null
   fi
+  while true; do
+    dnsname=$(sh_c aws ec2 describe-instances \
+      --filters 'Name=instance-state-name,Values=pending,running,shutting-down,stopping,stopped' 'Name=tag:Name,Values=d2-builder-linux-amd64' \
+      | jq -r '.Reservations[].Instances[].PublicDnsName')
+    if [ -n "$dnsname" ]; then
+      log "TSTRUCT_LINUX_AMD64_BUILDER=$dnsname"
+      break
+    fi
+    sleep 5
+  done
 
   header linux-arm64
   if ! aws ec2 describe-instances \
@@ -93,6 +103,16 @@ create_aws() {
       --tag-specifications 'ResourceType=instance,Tags=[{Key=Name,Value=d2-builder-linux-arm64}]' \
         'ResourceType=volume,Tags=[{Key=Name,Value=d2-builder-linux-arm64}]' >/dev/null
   fi
+  while true; do
+    dnsname=$(sh_c aws ec2 describe-instances \
+      --filters 'Name=instance-state-name,Values=pending,running,shutting-down,stopping,stopped' 'Name=tag:Name,Values=d2-builder-linux-arm64' \
+      | jq -r '.Reservations[].Instances[].PublicDnsName')
+    if [ -n "$dnsname" ]; then
+      log "TSTRUCT_LINUX_AMD64_BUILDER=$dnsname"
+      break
+    fi
+    sleep 5
+  done
 }
 
 main "$@"