diff --git a/grpc-locations/pom.xml b/grpc-locations/pom.xml
index 6841013ef..1e357ef21 100644
--- a/grpc-locations/pom.xml
+++ b/grpc-locations/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.quarkus.sample.super-heroes</groupId>
   <artifactId>grpc-locations</artifactId>
@@ -157,7 +157,6 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <version>${surefire-plugin.version}</version>
         <configuration>
-          <argLine>-Djdk.tracePinnedThreads</argLine>
           <systemPropertyVariables>
             <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
             <maven.home>${maven.home}</maven.home>
diff --git a/grpc-locations/src/main/kotlin/io/quarkus/sample/superheroes/location/grpc/LocationGrpcService.kt b/grpc-locations/src/main/kotlin/io/quarkus/sample/superheroes/location/grpc/LocationGrpcService.kt
index 5125f878d..133fffdff 100644
--- a/grpc-locations/src/main/kotlin/io/quarkus/sample/superheroes/location/grpc/LocationGrpcService.kt
+++ b/grpc-locations/src/main/kotlin/io/quarkus/sample/superheroes/location/grpc/LocationGrpcService.kt
@@ -8,12 +8,10 @@ import io.quarkus.sample.superheroes.location.grpc.LocationsGrpc.LocationsImplBa
 import io.quarkus.sample.superheroes.location.mapping.LocationMapper
 import io.quarkus.sample.superheroes.location.service.LocationService
 import io.smallrye.common.annotation.Blocking
-import io.smallrye.common.annotation.RunOnVirtualThread
 
 @GrpcService
 class LocationGrpcService(private val locationService: LocationService) : LocationsImplBase() {
   @Blocking
-  @RunOnVirtualThread
   override fun getRandomLocation(request: RandomLocationRequest?, responseObserver: StreamObserver<Location>?) {
 		Log.debug("Requesting a random location")
 	  returnLocationOrError(this.locationService.getRandomLocation(), responseObserver)
@@ -21,7 +19,6 @@ class LocationGrpcService(private val locationService: LocationService) : Locati
   }
 
 	@Blocking
-  @RunOnVirtualThread
 	override fun getLocationByName(request: GetLocationRequest?, responseObserver: StreamObserver<Location>?) {
 		if (request != null) {
 			Log.debug("Getting location ${request.name}")
@@ -32,7 +29,6 @@ class LocationGrpcService(private val locationService: LocationService) : Locati
 	}
 
 	@Blocking
-  @RunOnVirtualThread
 	override fun replaceAllLocations(request: LocationsList?, responseObserver: StreamObserver<ReplaceAllLocationsResponse>?) {
 		if (request != null) {
 			Log.debug("Replacing all locations")
@@ -47,7 +43,6 @@ class LocationGrpcService(private val locationService: LocationService) : Locati
 	}
 
 	@Blocking
-  @RunOnVirtualThread
 	override fun getAllLocations(request: AllLocationsRequest?, responseObserver: StreamObserver<LocationsList>?) {
 		val allLocations = this.locationService.getAllLocations()
 		Log.debug("Got all locations: $allLocations")
@@ -60,7 +55,6 @@ class LocationGrpcService(private val locationService: LocationService) : Locati
 	}
 
 	@Blocking
-  @RunOnVirtualThread
 	override fun deleteAllLocations(request: DeleteAllLocationsRequest?, responseObserver: StreamObserver<DeleteAllLocationsResponse>?) {
 		Log.debug("Deleting all locations")