diff --git a/grpc-locations/src/main/docker-compose/java21.yml b/grpc-locations/src/main/docker-compose/java21.yml
new file mode 100644
index 000000000..8410e4858
--- /dev/null
+++ b/grpc-locations/src/main/docker-compose/java21.yml
@@ -0,0 +1,28 @@
+
+  grpc-locations-java21:
+    image: quay.io/quarkus-super-heroes/grpc-locations:java21-latest
+    container_name: grpc-locations-java21
+    depends_on:
+      - locations-db
+    ports:
+      - "8089:8089"
+    environment:
+      QUARKUS_DATASOURCE_JDBC_URL: jdbc:mariadb://locations-db:3306/locations_database
+      QUARKUS_HIBERNATE_ORM_DATABASE_GENERATION: validate
+      QUARKUS_DATASOURCE_USERNAME: locations
+      QUARKUS_DATASOURCE_PASSWORD: locations
+      QUARKUS_HIBERNATE_ORM_SQL_LOAD_SCRIPT: no-file
+      QUARKUS_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: http://otel-collector:4317
+    restart: on-failure
+    networks:
+      default:
+        aliases:
+          - grpc-locations
+    deploy:
+      resources:
+        limits:
+          memory: 1G
+          cpus: '1'
+        reservations:
+          memory: 256M
+          cpus: '0.5'
diff --git a/grpc-locations/src/main/kubernetes/openshift.yml b/grpc-locations/src/main/kubernetes/openshift.yml
index 48d1555b1..ea162e076 100644
--- a/grpc-locations/src/main/kubernetes/openshift.yml
+++ b/grpc-locations/src/main/kubernetes/openshift.yml
@@ -15,6 +15,14 @@ spec:
       importPolicy: { }
       referencePolicy:
         type: Source
+    - name: java21-latest
+      annotations: null
+      from:
+        kind: DockerImage
+        name: 'quay.io/quarkus-super-heroes/grpc-locations:java21-latest'
+      importPolicy: { }
+      referencePolicy:
+        type: Source
     - name: native-latest
       annotations: null
       from: