diff --git a/opencode/Dockerfile b/opencode/Dockerfile
index e5b3ba7..9f21035 100644
--- a/opencode/Dockerfile
+++ b/opencode/Dockerfile
@@ -21,6 +21,8 @@ FROM builder-${TARGETPLATFORM//\//_} AS release
 RUN tar -xvf ./opencode.tgz -C /usr/bin
 RUN rm opencode.tgz
 ADD --chown=opencode:opencode ./opencode.json /etc/opencode/opencode.json
+RUN mkdir -p /usr/lib/opencode/addons
+ADD --chmod=644 https://repo1.maven.org/maven2/org/projectlombok/lombok/1.18.44/lombok-1.18.44.jar /usr/lib/opencode/addons/lombok.jar
 ENV OPENCODE_CONFIG=/etc/opencode/opencode.json
 USER opencode
 WORKDIR /workspace
diff --git a/opencode/opencode.json b/opencode/opencode.json
index 6ee9804..62cc1c5 100644
--- a/opencode/opencode.json
+++ b/opencode/opencode.json
@@ -7,7 +7,10 @@
       ],
       "extensions": [
         ".java"
-      ]
+      ],
+      "env": {
+        "JAVA_TOOL_OPTIONS": "-javaagent:/usr/lib/opencode/addons/lombok.jar"
+      }
     },
     "python": {
       "command": [