diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d5ea7b8eab..21e4fe1091 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,6 +45,9 @@ generate-templates:
       elif [ "${CI_COMMIT_BRANCH:-}" = "bot/libdatadog-latest" ]; then
         # Feedback run after a bot commit: the submodule already points to the tested SHA.
         # Don't export — generate-common.php must not inject fetch/checkout (no-op anyway).
+        set -x
+        apt update
+        apt install -y git
         LIBDATADOG_SHA=$(git ls-tree HEAD libdatadog | awk '{print $3}')
         printf 'LIBDATADOG_OVERRIDE_SHA=%s\nLIBDATADOG_FEEDBACK_RUN=true\n' "$LIBDATADOG_SHA" >> libdatadog.env
       fi
diff --git a/.gitlab/generate-common.php b/.gitlab/generate-common.php
index a37f3497d8..c0b9871a68 100644
--- a/.gitlab/generate-common.php
+++ b/.gitlab/generate-common.php
@@ -114,6 +114,7 @@ function windows_git_setup_with_packages() {
     }
 
     $step  = <<<STEP
+    - git config --global --add safe.directory "\${CI_PROJECT_DIR}/libdatadog"
     - git -C libdatadog fetch --depth=1 origin "$_libdatadog_sha" 2>&1
     - git -C libdatadog checkout FETCH_HEAD
 STEP;
diff --git a/.gitlab/libdatadog-latest.yml b/.gitlab/libdatadog-latest.yml
index 3bfdde906c..fec2311d2d 100644
--- a/.gitlab/libdatadog-latest.yml
+++ b/.gitlab/libdatadog-latest.yml
@@ -211,10 +211,10 @@ stages:
         # Install Claude (nvm — no root required)
         if ! command -v claude &>/dev/null; then
           export NVM_DIR="${HOME}/.nvm"
-          curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash - 2>&1
-          . "${NVM_DIR}/nvm.sh"
-          nvm install --lts --no-progress 2>&1
-          npm install -g @anthropic-ai/claude-code 2>&1
+          curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash - >/dev/null 2>&1
+          . "${NVM_DIR}/nvm.sh" >/dev/null 2>&1
+          nvm install --lts --no-progress >/dev/null 2>&1
+          npm install -g @anthropic-ai/claude-code >/dev/null 2>&1
         fi
 
         AI_GATEWAY_TOKEN=$(_vault_jwt rapid-ai-platform) || {