diff --git a/.gitpod.yml b/.gitpod.yml
index c1366b310f19ed..bf3c0838e4b800 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -52,7 +52,6 @@ tasks:
           (cd install/installer && make deps)
           exit 0
     - name: Java
-      init: leeway run components/supervisor-api:generate-java
       command: |
           if [ -z "$RUN_GRADLE_TASK" ]; then
             read -r -p "Press enter to continue Java gradle task"
diff --git a/components/supervisor-api/BUILD.yaml b/components/supervisor-api/BUILD.yaml
index 90665f74a7bea6..030d4bc1d565e2 100644
--- a/components/supervisor-api/BUILD.yaml
+++ b/components/supervisor-api/BUILD.yaml
@@ -7,16 +7,3 @@ packages:
     config:
       commands:
         - ["echo"]
-  - name: java
-    type: generic
-    srcs:
-      - "*.proto"
-      - "third_party/**/*.proto"
-      - "generate-java.sh"
-    config:
-      commands:
-        - ["./generate-java.sh"]
-scripts:
-  - name: generate-java
-    description: Generate Java files from Surpervisor API proto files
-    script: ./generate-java.sh
diff --git a/components/supervisor-api/generate.sh b/components/supervisor-api/generate.sh
index 5117a3216839e8..ad12408f30ec32 100755
--- a/components/supervisor-api/generate.sh
+++ b/components/supervisor-api/generate.sh
@@ -47,3 +47,6 @@ local_go_protoc "$COMPONENTS_DIR"
 go_protoc_gateway "$COMPONENTS_DIR"
 ./generate-java.sh
 update_license
+
+# remove trailing whitespace
+find "$COMPONENTS_DIR/supervisor-api/java" -name "*.java" -type f -print0 | xargs -0 pre-commit run trailing-whitespace --files
diff --git a/components/supervisor-api/java/BUILD.yaml b/components/supervisor-api/java/BUILD.yaml
index 22b1fe7b449544..d120d0819216c9 100644
--- a/components/supervisor-api/java/BUILD.yaml
+++ b/components/supervisor-api/java/BUILD.yaml
@@ -1,8 +1,6 @@
 packages:
   - name: lib
     type: generic
-    deps:
-      - components/supervisor-api:java
     srcs:
       - "**/*.java"
       - "build.gradle"
@@ -12,5 +10,4 @@ packages:
       - "settings.gradle"
     config:
       commands:
-        - ["cp", "-r", "components-supervisor-api--java/java/src/main/java", "src/main"]
         - ["./gradlew", "build"]