diff --git a/api/build.gradle b/api/build.gradle
index a2ea1c568..c8ce5d54c 100644
--- a/api/build.gradle
+++ b/api/build.gradle
@@ -114,6 +114,9 @@ sourceSets {
         java {
             srcDirs += generateGrammarSource.outputDirectory
         }
+        resources {
+            srcDirs += project(":frontend").layout.buildDirectory.dir("vite")
+        }
     }
 }
 
@@ -151,15 +154,7 @@ if (buildDockerImages) {
 }
 
 if (includeFrontend) {
-    tasks.named("build") {
-        dependsOn(":frontend:buildFrontend")
-    }
-
     tasks.named("processResources") {
         dependsOn(":frontend:buildFrontend")
-        from(project(":frontend").layout.buildDirectory.dir("vite")) {
-            into("static")
-        }
-        into("$buildDir/resources/main")
     }
 }
diff --git a/frontend/build.gradle b/frontend/build.gradle
index ba99db763..5375853fa 100644
--- a/frontend/build.gradle
+++ b/frontend/build.gradle
@@ -9,6 +9,17 @@ node {
   nodeProjectDir = project.layout.projectDirectory
 }
 
+tasks.register("clean") {
+  group = "build"
+  description = "Cleans frontend build"
+
+  doFirst {
+    delete(
+      project.layout.buildDirectory,
+      project.layout.projectDirectory.dir("src/generated-sources")
+    )
+  }
+}
 
 tasks.named("pnpmInstall") {
   inputs.files(file("package.json"))
@@ -25,10 +36,10 @@ tasks.register('generateContract', PnpmTask) {
 tasks.register('buildFrontend', PnpmTask) {
   dependsOn generateContract
   inputs.files(fileTree("src/"))
-  outputs.dir(project.layout.buildDirectory.dir("vite"))
+  outputs.dir(project.layout.buildDirectory.dir("vite/static"))
   args = ['build']
   environment = System.getenv() + [
-    "VITE_TAG": project.version,
+    "VITE_TAG"   : project.version,
     "VITE_COMMIT": "git rev-parse --short HEAD".execute().text.trim()
   ]
 }
diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
index da51bb38f..1f573dc98 100644
--- a/frontend/vite.config.ts
+++ b/frontend/vite.config.ts
@@ -35,7 +35,7 @@ export default defineConfig(({ mode }) => {
       port: 3000,
     },
     build: {
-      outDir: 'build/vite',
+      outDir: 'build/vite/static',
       rollupOptions: {
         output: {
           manualChunks(id: string) {