diff --git a/test/images/httpd-new/Dockerfile_windows b/test/images/httpd-new/Dockerfile_windows
index 1511ebe4e5f..57d35bf8673 100644
--- a/test/images/httpd-new/Dockerfile_windows
+++ b/test/images/httpd-new/Dockerfile_windows
@@ -19,27 +19,27 @@ ARG REGISTRY
 FROM --platform=linux/amd64 alpine:3.6 as prep
 
 ADD https://home.apache.org/~steffenal/VC15/binaries/httpd-2.4.46-win64-VC15.zip /httpd.zip
-ADD https://windows.php.net/downloads/releases/archives/php-7.4.14-Win32-vc15-x86.zip /php.zip
+ADD https://windows.php.net/downloads/releases/archives/php-7.4.14-Win32-vc15-x64.zip /php.zip
+ADD https://windows.php.net/downloads/nano/crt/crt-vc15-x64.zip /crt-vc15-x64.zip
 
 RUN unzip /httpd.zip &&\
     mv ReadMe.txt /Apache24/DistributionReadMe.txt &&\
     mkdir /php &&\
-    unzip /php.zip -d /php/
+    unzip /php.zip -d /php/ &&\
+    unzip /crt-vc15-x64.zip -d /
 
-FROM e2eteam/busybox-helper:1.29.0 as busybox-helper
 FROM $BASEIMAGE
 
-# NOTE(claudiub): httpd requires vcruntime140.dll, which is already included in the
-# busybox-helper image (it is also needed by dig).
-COPY --from=busybox-helper /dig/vcruntime140.dll /Windows/System32/
 COPY --from=prep /Apache24 /usr/local/apache2
 COPY --from=prep /php /tools/php74
+COPY --from=prep /vcruntime140.dll /Windows/System32/
+COPY --from=prep /msvcp140.dll /Windows/System32/
 
 COPY httpd.conf /usr/local/apache2/conf/httpd.conf
 COPY index.html /usr/local/apache2/htdocs/index.html
 
 # NOTE(claudiub): docker buildx sets the PATH env variable to a Linux-like PATH, which is not desirable.
-ENV PATH="C:\bin;C:\curl;C:\Windows\System32;C:\Windows;C:\Program Files\PowerShell;C:\tools\php74\;C:\usr\local\apache2\bin\;"
+ENV PATH="C:\dig;C:\bin;C:\curl;C:\Windows\System32;C:\Windows;C:\Program Files\PowerShell;C:\tools\php74\;C:\usr\local\apache2\bin\;"
 
 USER ContainerAdministrator
 EXPOSE 80
diff --git a/test/images/httpd-new/VERSION b/test/images/httpd-new/VERSION
index 1831734640a..722fb737d9a 100644
--- a/test/images/httpd-new/VERSION
+++ b/test/images/httpd-new/VERSION
@@ -1 +1 @@
-2.4.39-alpine
+2.4.39-1
diff --git a/test/images/httpd/Dockerfile_windows b/test/images/httpd/Dockerfile_windows
index 45d52a6d898..b7ebb8d9bd3 100644
--- a/test/images/httpd/Dockerfile_windows
+++ b/test/images/httpd/Dockerfile_windows
@@ -19,27 +19,27 @@ ARG REGISTRY
 FROM --platform=linux/amd64 alpine:3.6 as prep
 
 ADD https://home.apache.org/~steffenal/VC14/binaries/httpd-2.4.41-win64-VC14.zip /httpd.zip
-ADD https://windows.php.net/downloads/releases/archives/php-7.4.14-Win32-vc15-x86.zip /php.zip
+ADD https://windows.php.net/downloads/releases/archives/php-7.4.14-Win32-vc15-x64.zip /php.zip
+ADD https://windows.php.net/downloads/nano/crt/crt-vc15-x64.zip /crt-vc15-x64.zip
 
 RUN unzip /httpd.zip &&\
     mv ReadMe.txt /Apache24/DistributionReadMe.txt &&\
     mkdir /php &&\
-    unzip /php.zip -d /php/
+    unzip /php.zip -d /php/ &&\
+    unzip /crt-vc15-x64.zip -d /
 
-FROM e2eteam/busybox-helper:1.29.0 as busybox-helper
 FROM $BASEIMAGE
 
-# NOTE(claudiub): httpd requires vcruntime140.dll, which is already included in the
-# busybox-helper image (it is also needed by dig).
-COPY --from=busybox-helper /dig/vcruntime140.dll /Windows/System32/
 COPY --from=prep /Apache24 /usr/local/apache2
 COPY --from=prep /php /tools/php74
+COPY --from=prep /vcruntime140.dll /Windows/System32/
+COPY --from=prep /msvcp140.dll /Windows/System32/
 
 COPY httpd.conf /usr/local/apache2/conf/httpd.conf
 COPY index.html /usr/local/apache2/htdocs/index.html
 
 # NOTE(claudiub): docker buildx sets the PATH env variable to a Linux-like PATH, which is not desirable.
-ENV PATH="C:\bin;C:\curl;C:\Windows\System32;C:\Windows;C:\Program Files\PowerShell;C:\tools\php74\;C:\usr\local\apache2\bin\;"
+ENV PATH="C:\dig;C:\bin;C:\curl;C:\Windows\System32;C:\Windows;C:\Program Files\PowerShell;C:\tools\php74\;C:\usr\local\apache2\bin\;"
 
 USER ContainerAdministrator
 EXPOSE 80
diff --git a/test/images/httpd/VERSION b/test/images/httpd/VERSION
index 3e6d74f5e3a..8de44c87057 100644
--- a/test/images/httpd/VERSION
+++ b/test/images/httpd/VERSION
@@ -1 +1 @@
-2.4.38-alpine
+2.4.38-1