diff --git a/includes/include.drupalci.main-d7.yml b/includes/include.drupalci.main-d7.yml
index f7aa2012d75f16585db4356c8921ca9597935223..063acbc0310d4e74e47184a87dd80e1a49d5013d 100644
--- a/includes/include.drupalci.main-d7.yml
+++ b/includes/include.drupalci.main-d7.yml
@@ -304,10 +304,13 @@ stages:
     expose_as: 'web-vendor'
     when: always
     exclude:
-      - .git
-      - .git/**/*
-      - vendor/**/.git
-      - vendor/**/.git/**/*
+      - '.git'
+      - '.git/**/*'
+      - '$_WEB_ROOT/**/.git'
+      - '$_WEB_ROOT/**/.git/**/*'
+      - 'vendor/**/.git'
+      - 'vendor/**/.git/**/*'
+    name: artifacts-$CI_PIPELINE_ID-$CI_JOB_NAME_SLUG
     paths:
       - .
     reports:
diff --git a/includes/include.drupalci.main.yml b/includes/include.drupalci.main.yml
index 930b8330b6bc42a4322c505ab0fa3a690fbbc273..319bccc3ea5f71ae5b40fac41db60b5bc56817e6 100644
--- a/includes/include.drupalci.main.yml
+++ b/includes/include.drupalci.main.yml
@@ -439,8 +439,11 @@ stages:
     exclude:
       - '.git'
       - '.git/**/*'
+      - '$_WEB_ROOT/**/.git'
+      - '$_WEB_ROOT/**/.git/**/*'
       - 'vendor/**/.git'
-      - 'vendor/**/.git/*'
+      - 'vendor/**/.git/**/*'
+    name: artifacts-$CI_PIPELINE_ID-$CI_JOB_NAME_SLUG
     paths:
       - .
     reports:
@@ -833,6 +836,7 @@ upgrade status:
     expose_as: 'upgrade-status-analysis'
     reports:
       codequality: upgrade-status-analysis.json
+    name: artifacts-$CI_PIPELINE_ID-$CI_JOB_NAME_SLUG
     paths:
       - upgrade-status-analysis.json