diff --git a/eng/pipelines/templates/jobs/ci.yml b/eng/pipelines/templates/jobs/ci.yml
index 713cf0b689b0..f1ecd540d4bd 100644
--- a/eng/pipelines/templates/jobs/ci.yml
+++ b/eng/pipelines/templates/jobs/ci.yml
@@ -420,11 +420,11 @@ jobs:
         parameters:
           ServiceDirectories: $(PRServiceDirectories)
 
-      # Use BasePathLength of 38 instead of the default 49 as some released files fail when the number is higher.
+      # verify-path-length adds BasePathLength (assumed Windows checkout-root length) to repo-relative paths; set to 18 to allow longer repo-relative paths.
       - template: /eng/common/pipelines/templates/steps/verify-path-length.yml
         parameters:
           SourceDirectory: $(Build.SourcesDirectory)
-          BasePathLength: 38
+          BasePathLength: 18
 
       # Authenticate with Azure Artifacts
       - template: /eng/pipelines/templates/steps/maven-authenticate.yml
diff --git a/eng/pipelines/templates/stages/archetype-sdk-client-patch.yml b/eng/pipelines/templates/stages/archetype-sdk-client-patch.yml
index f8ec5ec5843f..5c14cfe10741 100644
--- a/eng/pipelines/templates/stages/archetype-sdk-client-patch.yml
+++ b/eng/pipelines/templates/stages/archetype-sdk-client-patch.yml
@@ -300,11 +300,11 @@ extends:
               parameters:
                 ServiceDirectories: $(ServiceDirectories)
 
-            # Use BasePathLength of 38 instead of the default 49 as some released files fail when the number is higher.
+            # Use BasePathLength of 18 to allow longer repository-relative paths.
             - template: /eng/common/pipelines/templates/steps/verify-path-length.yml
               parameters:
                 SourceDirectory: $(Build.SourcesDirectory)
-                BasePathLength: 38
+                BasePathLength: 18
 
             - template: /eng/common/pipelines/templates/steps/eng-common-workflow-enforcer.yml