diff --git a/.gitignore b/.gitignore
index db87237c5..4d09ac527 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,6 +31,3 @@ generated
 .bundle
 
 node_modules
-
-!job-dsl-plugin/src/main/webapp/api-viewer/config.json
-job-dsl-plugin/src/main/webapp/api-viewer
diff --git a/job-dsl-plugin/build.gradle b/job-dsl-plugin/build.gradle
index 994ca7d32..492fe9cd6 100644
--- a/job-dsl-plugin/build.gradle
+++ b/job-dsl-plugin/build.gradle
@@ -90,22 +90,16 @@ test {
     systemProperty 'jenkins.test.noSpaceInTmpDirs', 'true'
 }
 
-task copyApiViewer {
-    copy {
-        from(project(':job-dsl-api-viewer').projectDir)
-        include 'index.html'
-        into 'src/main/webapp/api-viewer'
-    }
-    copy {
-        from(project(':job-dsl-api-viewer').buildDir)
-        include 'dist/**'
-        into 'src/main/webapp/api-viewer/build'
+jpi {
+    into('api-viewer') {
+        from(project(':job-dsl-api-viewer').projectDir) {
+            include 'index.html'
+            include 'build/dist/**'
+        }
     }
+    dependsOn tasks.getByPath(':job-dsl-api-viewer:build')
 }
 
-copyApiViewer.dependsOn ':job-dsl-api-viewer:build'
-jpi.dependsOn 'copyApiViewer'
-
 dependencies {
     annotationProcessor 'net.java.sezpoz:sezpoz:1.13'
     annotationProcessor 'org.jenkins-ci:annotation-indexer:1.12'