diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2930f947c2..7cf1f7cff9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2053,16 +2053,15 @@ respdiff-third-party:
       artifacts: true
   script:
     - cd ${CI_PROJECT_DIR}
-    - mkdir version-under-test
-    - cp -ar bin version-under-test/
     - BASELINE=${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-$BIND_BASELINE_VERSION}
     - git fetch --unshallow origin ${BASELINE}
-    - git checkout FETCH_HEAD
+    - git worktree add baseline-build FETCH_HEAD
+    - cd baseline-build
     - autoreconf -fi
     - *configure
     - make -j${BUILD_PARALLEL_JOBS:-1} V=1
     - cd "$CI_PROJECT_DIR"/bind9-qa/respdiff
-    - bash respdiff.sh -s named -q "${PWD}/100k_mixed.txt" -c 3 -w "${PWD}/rspworkdir" "${CI_PROJECT_DIR}/version-under-test" "${CI_PROJECT_DIR}/bin/named/named"
+    - bash respdiff.sh -s named -q "${PWD}/100k_mixed.txt" -c 3 -w "${PWD}/rspworkdir" "${CI_PROJECT_DIR}" "${CI_PROJECT_DIR}/baseline-build/bin/named/named"
 
 respdiff:recent-named:
   <<: *respdiff_recent_named