diff --git a/dotCMS/build.gradle b/dotCMS/build.gradle
index 24724673ecbb..37368641a64b 100644
--- a/dotCMS/build.gradle
+++ b/dotCMS/build.gradle
@@ -566,6 +566,8 @@ task cleanDotCmsWebComponents {
     delete './src/main/webapp/dotcms-webcomponents/package'
     delete './src/main/webapp/dotcms-webcomponents/dotcms-webcomponents.js'
     delete './src/main/webapp/dotcms-webcomponents/dotcms-webcomponents.esm.js'
+    //Cleanup for issue #22255 can be removed when no longer required
+    delete './src/main/webapp/dotcms-webcomponents/dotcms-webcomponents'
 }
 
 
@@ -580,7 +582,8 @@ task extractDotCmsWebComponents(type: NpmArtifactExtractTask) {
 
 task copyDotCmsWebComponents(type: Copy) {
     from (extractDotCmsWebComponents.outputDir.dir('package/dist'))
-    into "./src/main/webapp/dotcms-webcomponents"
+    into "./src/main/webapp"
+    include 'dotcms-webcomponents/*'
     dependsOn cleanDotCmsWebComponents
 }