diff --git a/.gitlab-ci/container/container_job_trampoline.sh b/.gitlab-ci/container/container_job_trampoline.sh
index 78625ad7073..3edbffab4d9 100755
--- a/.gitlab-ci/container/container_job_trampoline.sh
+++ b/.gitlab-ci/container/container_job_trampoline.sh
@@ -19,4 +19,6 @@ CONTAINER_CI_JOB_NAME="$1"
 eval "$S3_JWT_FILE_SCRIPT"
 unset S3_JWT_FILE_SCRIPT
 
+trap 'rm -f ${S3_JWT_FILE}' EXIT INT TERM
+
 bash ".gitlab-ci/container/${CONTAINER_CI_JOB_NAME}.sh"
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index b14b4f46228..60f210361a1 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -16,7 +16,7 @@ variables:
    DEBIAN_BASE_TAG: "20241125-crosvm"
 
    DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
-   DEBIAN_BUILD_TAG: "20241219-android"
+   DEBIAN_BUILD_TAG: "20241219-rm-jwt_file"
 
    DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base"
    DEBIAN_ARM64_TEST_BASE_IMAGE: "debian/arm64_test-base"