diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 261347c979..6a274830c1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1174,27 +1174,25 @@ release:
 
 # Coverity Scan analysis upload
 
-.coverity_cache_prep: &coverity_cache_prep
-  - test -f cov-analysis-linux64.md5 && test -f cov-analysis-linux64.tgz || (
-    curl --output cov-analysis-linux64.md5 https://scan.coverity.com/download/linux64
+.coverity_prep: &coverity_prep
+  - curl --output /tmp/cov-analysis-linux64.md5 https://scan.coverity.com/download/linux64
          --form project=$COVERITY_SCAN_PROJECT_NAME
          --form token=$COVERITY_SCAN_TOKEN
-         --form md5=1;
-    curl --output cov-analysis-linux64.tgz https://scan.coverity.com/download/linux64
+         --form md5=1
+  - curl --output /tmp/cov-analysis-linux64.tgz https://scan.coverity.com/download/linux64
          --form project=$COVERITY_SCAN_PROJECT_NAME
-         --form token=$COVERITY_SCAN_TOKEN;
-    )
-  - test "$(md5sum cov-analysis-linux64.tgz | awk '{ print $1 }')" = "$(cat cov-analysis-linux64.md5)"
-  - tar --extract --gzip --file=cov-analysis-linux64.tgz
-  - test -d cov-analysis-linux64-2021.12.1
+         --form token=$COVERITY_SCAN_TOKEN
+  - test "$(md5sum /tmp/cov-analysis-linux64.tgz | awk '{ print $1 }')" = "$(cat /tmp/cov-analysis-linux64.md5)"
+  - tar --extract --gzip --file=/tmp/cov-analysis-linux64.tgz --directory=/tmp
+  - test -d /tmp/cov-analysis-linux64-2021.12.1
 
 .coverity_build: &coverity_build
-  - cov-analysis-linux64-2021.12.1/bin/cov-build --dir cov-int sh -c 'make -j${BUILD_PARALLEL_JOBS:-1} -k all V=1'
-  - tar --create --gzip --file=cov-int.tar.gz cov-int/
+  - /tmp/cov-analysis-linux64-2021.12.1/bin/cov-build --dir /tmp/cov-int --fs-capture-search . sh -c 'make -j${BUILD_PARALLEL_JOBS:-1} -k all V=1'
+  - tar --create --gzip --file=/tmp/cov-int.tar.gz --directory /tmp cov-int
   - curl -v https://scan.coverity.com/builds?project=$COVERITY_SCAN_PROJECT_NAME
         --form token=$COVERITY_SCAN_TOKEN
         --form email=bind-changes@isc.org
-        --form file=@cov-int.tar.gz
+        --form file=@/tmp/cov-int.tar.gz
         --form version="$(git rev-parse --short HEAD)"
         --form description="$(git rev-parse --short HEAD) / $CI_COMMIT_TITLE / $CI_COMMIT_REF_NAME:$CI_PIPELINE_ID" 2>&1
         | tee curl-response.txt
@@ -1208,9 +1206,11 @@ coverity:
     CFLAGS: "${CFLAGS_COMMON} -Og"
     EXTRA_CONFIGURE: "--with-libidn2"
   script:
-    - *coverity_cache_prep
+    - *coverity_prep
     - *configure
     - *coverity_build
+  after_script:
+    - mv -v /tmp/cov-int.tar.gz ${CI_PROJECT_DIR}/
   needs:
     - job: autoreconf
       artifacts: true
@@ -1224,11 +1224,6 @@ coverity:
     variables:
       - $COVERITY_SCAN_PROJECT_NAME
       - $COVERITY_SCAN_TOKEN
-  cache:
-    key: cov-analysis-linux64-2021.12.1
-    paths:
-      - cov-analysis-linux64.md5
-      - cov-analysis-linux64.tgz
 
 # Respdiff tests