diff --git a/pluto-interface/pom.xml b/pluto-interface/pom.xml
index 5136b98ff162b570a423b0704ae11dfffce91a69..a9eca783618c4402294aa4237395daadcbf193c1 100644
--- a/pluto-interface/pom.xml
+++ b/pluto-interface/pom.xml
@@ -49,6 +49,7 @@
 		<maven.compiler.source>17</maven.compiler.source>
 		<maven.compiler.target>17</maven.compiler.target>
 
+		<find-and-replace-maven-plugin.version>1.1.0</find-and-replace-maven-plugin.version>
 		<kop.license.version>1.6.0</kop.license.version>
 	</properties>
 
@@ -74,6 +75,10 @@
 			<groupId>io.grpc</groupId>
 			<artifactId>grpc-protobuf</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>jakarta.annotation</groupId>
+			<artifactId>jakarta.annotation-api</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -104,13 +109,35 @@
 								</outputTarget>
 								<outputTarget>
 									<type>grpc-java</type>
-									<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.47.0</pluginArtifact>
+									<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.58.0</pluginArtifact>
 								</outputTarget>
 							</outputTargets>
 						</configuration>
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>io.github.floverfelt</groupId>
+				<artifactId>find-and-replace-maven-plugin</artifactId>
+				<version>${find-and-replace-maven-plugin.version}</version>
+				<executions>
+					<execution>
+						<id>exec</id>
+						<phase>process-sources</phase>
+						<goals>
+							<goal>find-and-replace</goal>
+						</goals>
+						<configuration>
+							<replacementType>file-contents</replacementType>
+							<baseDir>target/generated-sources/</baseDir>
+							<findRegex>javax</findRegex>
+							<replaceValue>jakarta</replaceValue>
+							<recursive>true</recursive>
+							<fileMask>.java</fileMask>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<!-- TODO move to common -->
 			<plugin>
 				<groupId>com.mycila</groupId>