diff --git a/images/basic/fsstress/Dockerfile.x86_64 b/images/basic/fsstress/Dockerfile
similarity index 95%
rename from images/basic/fsstress/Dockerfile.x86_64
rename to images/basic/fsstress/Dockerfile
index 21b86065a..a6222a052 100644
--- a/images/basic/fsstress/Dockerfile.x86_64
+++ b/images/basic/fsstress/Dockerfile
@@ -5,7 +5,7 @@ RUN apk update && apk add git
 RUN git clone https://github.com/linux-test-project/ltp.git --depth 1
 
 WORKDIR /ltp
-RUN ./travis/alpine.sh
+RUN ./ci/alpine.sh
 RUN make autotools && ./configure
 RUN make -C testcases/kernel/fs/fsstress
 RUN cp ./testcases/kernel/fs/fsstress/fsstress /usr/bin
diff --git a/test/packetdrill/packetdrill_test.sh b/test/packetdrill/packetdrill_test.sh
index d25cad83a..77d2cbf30 100755
--- a/test/packetdrill/packetdrill_test.sh
+++ b/test/packetdrill/packetdrill_test.sh
@@ -117,7 +117,7 @@ declare -r CTRL_PORT="40000"
 # Last bits of the test runner's IP address.
 declare -r TEST_RUNNER_NET_SUFFIX=".20"
 declare -r TIMEOUT="60"
-declare -r IMAGE_TAG="gcr.io/gvisor-presubmit/packetdrill"
+declare -r IMAGE_TAG="gvisor.dev/images/packetdrill"
 
 # Make sure that docker is installed.
 docker --version