diff --git a/deploy/k8s/java11-knative.yml b/deploy/k8s/java11-knative.yml
index f4b879839..2a2fc98a9 100644
--- a/deploy/k8s/java11-knative.yml
+++ b/deploy/k8s/java11-knative.yml
@@ -20,8 +20,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:20:34 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:32 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -31,8 +31,8 @@ metadata:
     app.openshift.io/runtime: quarkus
     application: villains-service
     system: quarkus-super-heroes
-    app.kubernetes.io/version: java11-latest
     app.kubernetes.io/part-of: villains-service
+    app.kubernetes.io/version: java11-latest
     app.kubernetes.io/name: rest-villains
   name: rest-villains
 spec:
@@ -42,8 +42,8 @@ spec:
         app.openshift.io/connects-to: villains-db
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:20:34 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:32 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -53,8 +53,8 @@ spec:
         app.openshift.io/runtime: quarkus
         application: villains-service
         system: quarkus-super-heroes
-        app.kubernetes.io/version: java11-latest
         app.kubernetes.io/part-of: villains-service
+        app.kubernetes.io/version: java11-latest
         app.kubernetes.io/name: rest-villains
     spec:
       containers:
@@ -195,8 +195,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:20:47 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:45 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -217,8 +217,8 @@ spec:
         app.openshift.io/connects-to: heroes-db
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:20:47 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:45 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
@@ -345,8 +345,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:21:01 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:58 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -356,9 +356,9 @@ metadata:
     app.openshift.io/runtime: quarkus
     application: fights-service
     system: quarkus-super-heroes
+    app.kubernetes.io/version: java11-latest
     app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/name: rest-fights
-    app.kubernetes.io/version: java11-latest
   name: rest-fights
 spec:
   template:
@@ -367,8 +367,8 @@ spec:
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:21:01 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:58 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
@@ -378,9 +378,9 @@ spec:
         app.openshift.io/runtime: quarkus
         application: fights-service
         system: quarkus-super-heroes
+        app.kubernetes.io/version: java11-latest
         app.kubernetes.io/part-of: fights-service
         app.kubernetes.io/name: rest-fights
-        app.kubernetes.io/version: java11-latest
     spec:
       containers:
         - envFrom:
@@ -634,8 +634,8 @@ metadata:
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:21:14 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:39:11 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
@@ -645,8 +645,8 @@ metadata:
     app.openshift.io/runtime: quarkus
     application: event-stats
     system: quarkus-super-heroes
-    app.kubernetes.io/name: event-statistics
     app.kubernetes.io/version: java11-latest
+    app.kubernetes.io/name: event-statistics
     app.kubernetes.io/part-of: event-stats
   name: event-statistics
 spec:
@@ -656,8 +656,8 @@ spec:
         app.openshift.io/connects-to: "fights-kafka,apicurio"
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:21:14 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:39:11 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8085"
@@ -667,8 +667,8 @@ spec:
         app.openshift.io/runtime: quarkus
         application: event-stats
         system: quarkus-super-heroes
-        app.kubernetes.io/name: event-statistics
         app.kubernetes.io/version: java11-latest
+        app.kubernetes.io/name: event-statistics
         app.kubernetes.io/part-of: event-stats
     spec:
       containers:
diff --git a/deploy/k8s/java11-kubernetes.yml b/deploy/k8s/java11-kubernetes.yml
index c425cff50..aae9c7c31 100644
--- a/deploy/k8s/java11-kubernetes.yml
+++ b/deploy/k8s/java11-kubernetes.yml
@@ -20,8 +20,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:17:56 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:35:51 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -96,8 +96,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:17:56 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:35:51 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -106,25 +106,25 @@ metadata:
     app: rest-villains
     application: villains-service
     system: quarkus-super-heroes
-    app.kubernetes.io/name: rest-villains
-    app.kubernetes.io/part-of: villains-service
     app.kubernetes.io/version: java11-latest
+    app.kubernetes.io/part-of: villains-service
+    app.kubernetes.io/name: rest-villains
   name: rest-villains
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: rest-villains
-      app.kubernetes.io/part-of: villains-service
       app.kubernetes.io/version: java11-latest
+      app.kubernetes.io/part-of: villains-service
+      app.kubernetes.io/name: rest-villains
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: villains-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:17:56 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:35:51 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -133,9 +133,9 @@ spec:
         app: rest-villains
         application: villains-service
         system: quarkus-super-heroes
-        app.kubernetes.io/name: rest-villains
-        app.kubernetes.io/part-of: villains-service
         app.kubernetes.io/version: java11-latest
+        app.kubernetes.io/part-of: villains-service
+        app.kubernetes.io/name: rest-villains
     spec:
       containers:
         - env:
@@ -263,8 +263,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:18:08 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:36:03 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -369,8 +369,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:18:08 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:36:03 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -380,24 +380,24 @@ metadata:
     application: heroes-service
     system: quarkus-super-heroes
     app.kubernetes.io/version: java11-latest
-    app.kubernetes.io/name: rest-heroes
     app.kubernetes.io/part-of: heroes-service
+    app.kubernetes.io/name: rest-heroes
   name: rest-heroes
 spec:
   replicas: 1
   selector:
     matchLabels:
       app.kubernetes.io/version: java11-latest
-      app.kubernetes.io/name: rest-heroes
       app.kubernetes.io/part-of: heroes-service
+      app.kubernetes.io/name: rest-heroes
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: heroes-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:18:08 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:36:03 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
@@ -407,8 +407,8 @@ spec:
         application: heroes-service
         system: quarkus-super-heroes
         app.kubernetes.io/version: java11-latest
-        app.kubernetes.io/name: rest-heroes
         app.kubernetes.io/part-of: heroes-service
+        app.kubernetes.io/name: rest-heroes
     spec:
       containers:
         - env:
@@ -524,8 +524,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:18:28 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:36:24 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -743,8 +743,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:18:28 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:36:24 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -754,24 +754,24 @@ metadata:
     application: fights-service
     system: quarkus-super-heroes
     app.kubernetes.io/name: rest-fights
-    app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/version: java11-latest
+    app.kubernetes.io/part-of: fights-service
   name: rest-fights
 spec:
   replicas: 1
   selector:
     matchLabels:
       app.kubernetes.io/name: rest-fights
-      app.kubernetes.io/part-of: fights-service
       app.kubernetes.io/version: java11-latest
+      app.kubernetes.io/part-of: fights-service
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:18:28 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:36:24 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
@@ -781,8 +781,8 @@ spec:
         application: fights-service
         system: quarkus-super-heroes
         app.kubernetes.io/name: rest-fights
-        app.kubernetes.io/part-of: fights-service
         app.kubernetes.io/version: java11-latest
+        app.kubernetes.io/part-of: fights-service
     spec:
       containers:
         - env:
@@ -850,8 +850,8 @@ metadata:
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:18:41 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:36:37 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
@@ -976,8 +976,8 @@ metadata:
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:18:41 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:36:37 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
@@ -987,24 +987,24 @@ metadata:
     application: event-stats
     system: quarkus-super-heroes
     app.kubernetes.io/part-of: event-stats
-    app.kubernetes.io/version: java11-latest
     app.kubernetes.io/name: event-statistics
+    app.kubernetes.io/version: java11-latest
   name: event-statistics
 spec:
   replicas: 1
   selector:
     matchLabels:
       app.kubernetes.io/part-of: event-stats
-      app.kubernetes.io/version: java11-latest
       app.kubernetes.io/name: event-statistics
+      app.kubernetes.io/version: java11-latest
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: "fights-kafka,apicurio"
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:18:41 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:36:37 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8085"
@@ -1014,8 +1014,8 @@ spec:
         application: event-stats
         system: quarkus-super-heroes
         app.kubernetes.io/part-of: event-stats
-        app.kubernetes.io/version: java11-latest
         app.kubernetes.io/name: event-statistics
+        app.kubernetes.io/version: java11-latest
     spec:
       containers:
         - env:
diff --git a/deploy/k8s/java11-minikube.yml b/deploy/k8s/java11-minikube.yml
index f546c89ea..6d9b7fcc7 100644
--- a/deploy/k8s/java11-minikube.yml
+++ b/deploy/k8s/java11-minikube.yml
@@ -20,8 +20,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:18:53 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:36:49 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -97,8 +97,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:18:53 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:36:49 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -124,8 +124,8 @@ spec:
         app.openshift.io/connects-to: villains-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:18:53 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:36:49 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -261,15 +261,15 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
+    app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.openshift.io/connects-to: heroes-db
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:06 +0000
-    prometheus.io/scrape: "true"
-    prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
     prometheus.io/scheme: http
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:01 +0000
+    prometheus.io/scrape: "true"
+    prometheus.io/path: /q/metrics
   labels:
     app.kubernetes.io/name: rest-heroes
     app.kubernetes.io/part-of: heroes-service
@@ -368,15 +368,15 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
+    app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.openshift.io/connects-to: heroes-db
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:06 +0000
-    prometheus.io/scrape: "true"
-    prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
     prometheus.io/scheme: http
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:01 +0000
+    prometheus.io/scrape: "true"
+    prometheus.io/path: /q/metrics
   labels:
     app.kubernetes.io/name: rest-heroes
     app.kubernetes.io/part-of: heroes-service
@@ -395,15 +395,15 @@ spec:
   template:
     metadata:
       annotations:
+        app.openshift.io/connects-to: heroes-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.openshift.io/connects-to: heroes-db
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:06 +0000
-        prometheus.io/scrape: "true"
-        prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
         prometheus.io/scheme: http
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:01 +0000
+        prometheus.io/scrape: "true"
+        prometheus.io/path: /q/metrics
       labels:
         app.kubernetes.io/name: rest-heroes
         app.kubernetes.io/part-of: heroes-service
@@ -526,12 +526,12 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    prometheus.io/port: "8082"
-    prometheus.io/scheme: http
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:19 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:15 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
+    prometheus.io/port: "8082"
+    prometheus.io/scheme: http
   labels:
     app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
@@ -746,12 +746,12 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    prometheus.io/port: "8082"
-    prometheus.io/scheme: http
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:19 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:15 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
+    prometheus.io/port: "8082"
+    prometheus.io/scheme: http
   labels:
     app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
@@ -773,12 +773,12 @@ spec:
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        prometheus.io/port: "8082"
-        prometheus.io/scheme: http
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:19 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:15 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
+        prometheus.io/port: "8082"
+        prometheus.io/scheme: http
       labels:
         app.kubernetes.io/name: rest-fights
         app.kubernetes.io/part-of: fights-service
@@ -850,15 +850,15 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    prometheus.io/port: "8085"
-    prometheus.io/scheme: http
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:32 +0000
+    app.openshift.io/connects-to: "fights-kafka,apicurio"
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:28 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
+    prometheus.io/port: "8085"
+    prometheus.io/scheme: http
   labels:
     app.kubernetes.io/name: event-statistics
     app.kubernetes.io/part-of: event-stats
@@ -977,15 +977,15 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
-    app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    prometheus.io/port: "8085"
-    prometheus.io/scheme: http
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:32 +0000
+    app.openshift.io/connects-to: "fights-kafka,apicurio"
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:28 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
+    prometheus.io/port: "8085"
+    prometheus.io/scheme: http
   labels:
     app.kubernetes.io/name: event-statistics
     app.kubernetes.io/part-of: event-stats
@@ -1004,15 +1004,15 @@ spec:
   template:
     metadata:
       annotations:
-        app.openshift.io/connects-to: "fights-kafka,apicurio"
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        prometheus.io/port: "8085"
-        prometheus.io/scheme: http
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:32 +0000
+        app.openshift.io/connects-to: "fights-kafka,apicurio"
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:28 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
+        prometheus.io/port: "8085"
+        prometheus.io/scheme: http
       labels:
         app.kubernetes.io/name: event-statistics
         app.kubernetes.io/part-of: event-stats
diff --git a/deploy/k8s/java11-openshift.yml b/deploy/k8s/java11-openshift.yml
index cf4ffb44d..eefd06136 100644
--- a/deploy/k8s/java11-openshift.yml
+++ b/deploy/k8s/java11-openshift.yml
@@ -20,8 +20,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:44 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:40 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -70,17 +70,17 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:44 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:40 +0000
   labels:
     name: villains-db
     application: villains-service
     system: quarkus-super-heroes
     app: rest-villains
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/version: java11-latest
     app.kubernetes.io/part-of: villains-service
     app.kubernetes.io/name: rest-villains
+    app.kubernetes.io/version: java11-latest
   name: rest-villains
 spec:
   dockerImageRepository: quay.io/quarkus-super-heroes/rest-villains
@@ -165,8 +165,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:44 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:40 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -176,24 +176,24 @@ metadata:
     application: villains-service
     system: quarkus-super-heroes
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/version: java11-latest
     app.kubernetes.io/part-of: villains-service
     app.kubernetes.io/name: rest-villains
+    app.kubernetes.io/version: java11-latest
   name: rest-villains
 spec:
   replicas: 1
   selector:
-    app.kubernetes.io/version: java11-latest
     app.kubernetes.io/part-of: villains-service
     app.kubernetes.io/name: rest-villains
+    app.kubernetes.io/version: java11-latest
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: villains-db
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:44 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:40 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -203,9 +203,9 @@ spec:
         application: villains-service
         system: quarkus-super-heroes
         app.openshift.io/runtime: quarkus
-        app.kubernetes.io/version: java11-latest
         app.kubernetes.io/part-of: villains-service
         app.kubernetes.io/name: rest-villains
+        app.kubernetes.io/version: java11-latest
     spec:
       containers:
         - env:
@@ -256,8 +256,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:44 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:40 +0000
   labels:
     app.kubernetes.io/name: rest-villains
     app.kubernetes.io/part-of: villains-service
@@ -309,11 +309,11 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:56 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:53 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -342,11 +342,11 @@ apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:56 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:53 +0000
   labels:
     name: heroes-db
     application: heroes-service
@@ -438,11 +438,11 @@ apiVersion: apps.openshift.io/v1
 kind: DeploymentConfig
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:56 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:53 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -465,11 +465,11 @@ spec:
   template:
     metadata:
       annotations:
-        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
         app.openshift.io/connects-to: heroes-db
         app.openshift.io/vcs-ref: main
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:56 +0000
+        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:53 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
@@ -524,25 +524,16 @@ spec:
               memory: 768Mi
             requests:
               memory: 256Mi
-  triggers:
-    - imageChangeParams:
-        automatic: true
-        containerNames:
-          - rest-heroes
-        from:
-          kind: ImageStreamTag
-          name: rest-heroes:java11-latest
-      type: ImageChange
 ---
 apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:56 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:53 +0000
   labels:
     app.kubernetes.io/name: rest-heroes
     app.kubernetes.io/part-of: heroes-service
@@ -628,11 +619,11 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:20:10 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:07 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -661,19 +652,19 @@ apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:20:10 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:07 +0000
   labels:
     name: apicurio
     application: fights-service
     system: quarkus-super-heroes
     app: rest-fights
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/name: rest-fights
+    app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/version: java11-latest
   name: rest-fights
 spec:
@@ -870,11 +861,11 @@ apiVersion: apps.openshift.io/v1
 kind: DeploymentConfig
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:20:10 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:07 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -884,24 +875,24 @@ metadata:
     application: fights-service
     system: quarkus-super-heroes
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/name: rest-fights
+    app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/version: java11-latest
   name: rest-fights
 spec:
   replicas: 1
   selector:
-    app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/name: rest-fights
+    app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/version: java11-latest
   template:
     metadata:
       annotations:
-        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.openshift.io/vcs-ref: main
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:20:10 +0000
+        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:07 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
@@ -911,8 +902,8 @@ spec:
         application: fights-service
         system: quarkus-super-heroes
         app.openshift.io/runtime: quarkus
-        app.kubernetes.io/part-of: fights-service
         app.kubernetes.io/name: rest-fights
+        app.kubernetes.io/part-of: fights-service
         app.kubernetes.io/version: java11-latest
     spec:
       containers:
@@ -956,15 +947,6 @@ spec:
               memory: 768Mi
             requests:
               memory: 256Mi
-  triggers:
-    - imageChangeParams:
-        automatic: true
-        containerNames:
-          - rest-fights
-        from:
-          kind: ImageStreamTag
-          name: rest-fights:java11-latest
-      type: ImageChange
 ---
 apiVersion: route.openshift.io/v1
 kind: Route
@@ -986,11 +968,11 @@ apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:20:10 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:07 +0000
   labels:
     app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
@@ -1028,11 +1010,11 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:20:23 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:20 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
@@ -1078,20 +1060,20 @@ apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:20:23 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:20 +0000
   labels:
     name: apicurio
     application: event-stats
     system: quarkus-super-heroes
     app: event-statistics
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/name: event-statistics
     app.kubernetes.io/version: java11-latest
     app.kubernetes.io/part-of: event-stats
+    app.kubernetes.io/name: event-statistics
   name: event-statistics
 spec:
   dockerImageRepository: quay.io/quarkus-super-heroes/event-statistics
@@ -1221,11 +1203,11 @@ apiVersion: apps.openshift.io/v1
 kind: DeploymentConfig
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:20:23 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:20 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
@@ -1235,24 +1217,24 @@ metadata:
     application: event-stats
     system: quarkus-super-heroes
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/name: event-statistics
     app.kubernetes.io/version: java11-latest
     app.kubernetes.io/part-of: event-stats
+    app.kubernetes.io/name: event-statistics
   name: event-statistics
 spec:
   replicas: 1
   selector:
-    app.kubernetes.io/name: event-statistics
     app.kubernetes.io/version: java11-latest
     app.kubernetes.io/part-of: event-stats
+    app.kubernetes.io/name: event-statistics
   template:
     metadata:
       annotations:
-        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
         app.openshift.io/connects-to: "fights-kafka,apicurio"
         app.openshift.io/vcs-ref: main
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:20:23 +0000
+        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:20 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8085"
@@ -1262,9 +1244,9 @@ spec:
         application: event-stats
         system: quarkus-super-heroes
         app.openshift.io/runtime: quarkus
-        app.kubernetes.io/name: event-statistics
         app.kubernetes.io/version: java11-latest
         app.kubernetes.io/part-of: event-stats
+        app.kubernetes.io/name: event-statistics
     spec:
       containers:
         - env:
@@ -1307,15 +1289,6 @@ spec:
               memory: 768Mi
             requests:
               memory: 256Mi
-  triggers:
-    - imageChangeParams:
-        automatic: true
-        containerNames:
-          - event-statistics
-        from:
-          kind: ImageStreamTag
-          name: event-statistics:java11-latest
-      type: ImageChange
 ---
 apiVersion: route.openshift.io/v1
 kind: Route
@@ -1337,11 +1310,11 @@ apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:20:23 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:20 +0000
   labels:
     app.kubernetes.io/name: event-statistics
     app.kubernetes.io/part-of: event-stats
diff --git a/deploy/k8s/java17-knative.yml b/deploy/k8s/java17-knative.yml
index 5f761fdbe..d3b453c05 100644
--- a/deploy/k8s/java17-knative.yml
+++ b/deploy/k8s/java17-knative.yml
@@ -20,8 +20,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:27:21 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:45:08 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -31,9 +31,9 @@ metadata:
     app.openshift.io/runtime: quarkus
     application: villains-service
     system: quarkus-super-heroes
-    app.kubernetes.io/version: java17-latest
-    app.kubernetes.io/name: rest-villains
     app.kubernetes.io/part-of: villains-service
+    app.kubernetes.io/name: rest-villains
+    app.kubernetes.io/version: java17-latest
   name: rest-villains
 spec:
   template:
@@ -42,8 +42,8 @@ spec:
         app.openshift.io/connects-to: villains-db
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:27:21 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:45:08 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -53,9 +53,9 @@ spec:
         app.openshift.io/runtime: quarkus
         application: villains-service
         system: quarkus-super-heroes
-        app.kubernetes.io/version: java17-latest
-        app.kubernetes.io/name: rest-villains
         app.kubernetes.io/part-of: villains-service
+        app.kubernetes.io/name: rest-villains
+        app.kubernetes.io/version: java17-latest
     spec:
       containers:
         - envFrom:
@@ -195,8 +195,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:27:33 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:45:20 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -206,9 +206,9 @@ metadata:
     app.openshift.io/runtime: quarkus
     application: heroes-service
     system: quarkus-super-heroes
-    app.kubernetes.io/part-of: heroes-service
-    app.kubernetes.io/version: java17-latest
     app.kubernetes.io/name: rest-heroes
+    app.kubernetes.io/version: java17-latest
+    app.kubernetes.io/part-of: heroes-service
   name: rest-heroes
 spec:
   template:
@@ -217,8 +217,8 @@ spec:
         app.openshift.io/connects-to: heroes-db
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:27:33 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:45:20 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
@@ -228,9 +228,9 @@ spec:
         app.openshift.io/runtime: quarkus
         application: heroes-service
         system: quarkus-super-heroes
-        app.kubernetes.io/part-of: heroes-service
-        app.kubernetes.io/version: java17-latest
         app.kubernetes.io/name: rest-heroes
+        app.kubernetes.io/version: java17-latest
+        app.kubernetes.io/part-of: heroes-service
     spec:
       containers:
         - envFrom:
@@ -345,8 +345,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:27:47 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:45:33 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -356,9 +356,9 @@ metadata:
     app.openshift.io/runtime: quarkus
     application: fights-service
     system: quarkus-super-heroes
-    app.kubernetes.io/version: java17-latest
-    app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
+    app.kubernetes.io/name: rest-fights
+    app.kubernetes.io/version: java17-latest
   name: rest-fights
 spec:
   template:
@@ -367,8 +367,8 @@ spec:
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:27:47 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:45:33 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
@@ -378,9 +378,9 @@ spec:
         app.openshift.io/runtime: quarkus
         application: fights-service
         system: quarkus-super-heroes
-        app.kubernetes.io/version: java17-latest
-        app.kubernetes.io/name: rest-fights
         app.kubernetes.io/part-of: fights-service
+        app.kubernetes.io/name: rest-fights
+        app.kubernetes.io/version: java17-latest
     spec:
       containers:
         - envFrom:
@@ -634,8 +634,8 @@ metadata:
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:27:59 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:45:45 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
@@ -645,9 +645,9 @@ metadata:
     app.openshift.io/runtime: quarkus
     application: event-stats
     system: quarkus-super-heroes
-    app.kubernetes.io/version: java17-latest
-    app.kubernetes.io/name: event-statistics
     app.kubernetes.io/part-of: event-stats
+    app.kubernetes.io/name: event-statistics
+    app.kubernetes.io/version: java17-latest
   name: event-statistics
 spec:
   template:
@@ -656,8 +656,8 @@ spec:
         app.openshift.io/connects-to: "fights-kafka,apicurio"
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:27:59 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:45:45 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8085"
@@ -667,9 +667,9 @@ spec:
         app.openshift.io/runtime: quarkus
         application: event-stats
         system: quarkus-super-heroes
-        app.kubernetes.io/version: java17-latest
-        app.kubernetes.io/name: event-statistics
         app.kubernetes.io/part-of: event-stats
+        app.kubernetes.io/name: event-statistics
+        app.kubernetes.io/version: java17-latest
     spec:
       containers:
         - envFrom:
diff --git a/deploy/k8s/java17-kubernetes.yml b/deploy/k8s/java17-kubernetes.yml
index eb4c67e41..74fb90878 100644
--- a/deploy/k8s/java17-kubernetes.yml
+++ b/deploy/k8s/java17-kubernetes.yml
@@ -20,8 +20,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:24:48 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:42:42 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -96,8 +96,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:24:48 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:42:42 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -107,24 +107,24 @@ metadata:
     application: villains-service
     system: quarkus-super-heroes
     app.kubernetes.io/name: rest-villains
-    app.kubernetes.io/part-of: villains-service
     app.kubernetes.io/version: java17-latest
+    app.kubernetes.io/part-of: villains-service
   name: rest-villains
 spec:
   replicas: 1
   selector:
     matchLabels:
       app.kubernetes.io/name: rest-villains
-      app.kubernetes.io/part-of: villains-service
       app.kubernetes.io/version: java17-latest
+      app.kubernetes.io/part-of: villains-service
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: villains-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:24:48 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:42:42 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -134,8 +134,8 @@ spec:
         application: villains-service
         system: quarkus-super-heroes
         app.kubernetes.io/name: rest-villains
-        app.kubernetes.io/part-of: villains-service
         app.kubernetes.io/version: java17-latest
+        app.kubernetes.io/part-of: villains-service
     spec:
       containers:
         - env:
@@ -263,8 +263,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:01 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:42:54 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -369,8 +369,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:01 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:42:54 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -379,25 +379,25 @@ metadata:
     app: rest-heroes
     application: heroes-service
     system: quarkus-super-heroes
-    app.kubernetes.io/name: rest-heroes
     app.kubernetes.io/version: java17-latest
     app.kubernetes.io/part-of: heroes-service
+    app.kubernetes.io/name: rest-heroes
   name: rest-heroes
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: rest-heroes
       app.kubernetes.io/version: java17-latest
       app.kubernetes.io/part-of: heroes-service
+      app.kubernetes.io/name: rest-heroes
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: heroes-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:01 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:42:54 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
@@ -406,9 +406,9 @@ spec:
         app: rest-heroes
         application: heroes-service
         system: quarkus-super-heroes
-        app.kubernetes.io/name: rest-heroes
         app.kubernetes.io/version: java17-latest
         app.kubernetes.io/part-of: heroes-service
+        app.kubernetes.io/name: rest-heroes
     spec:
       containers:
         - env:
@@ -524,8 +524,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:15 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:08 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -743,8 +743,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:15 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:08 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -753,25 +753,25 @@ metadata:
     app: rest-fights
     application: fights-service
     system: quarkus-super-heroes
+    app.kubernetes.io/version: java17-latest
     app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/name: rest-fights
-    app.kubernetes.io/version: java17-latest
   name: rest-fights
 spec:
   replicas: 1
   selector:
     matchLabels:
+      app.kubernetes.io/version: java17-latest
       app.kubernetes.io/part-of: fights-service
       app.kubernetes.io/name: rest-fights
-      app.kubernetes.io/version: java17-latest
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:15 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:08 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
@@ -780,9 +780,9 @@ spec:
         app: rest-fights
         application: fights-service
         system: quarkus-super-heroes
+        app.kubernetes.io/version: java17-latest
         app.kubernetes.io/part-of: fights-service
         app.kubernetes.io/name: rest-fights
-        app.kubernetes.io/version: java17-latest
     spec:
       containers:
         - env:
@@ -850,8 +850,8 @@ metadata:
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:28 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:21 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
@@ -976,8 +976,8 @@ metadata:
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:28 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:21 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
@@ -986,16 +986,16 @@ metadata:
     app: event-statistics
     application: event-stats
     system: quarkus-super-heroes
-    app.kubernetes.io/name: event-statistics
     app.kubernetes.io/version: java17-latest
+    app.kubernetes.io/name: event-statistics
     app.kubernetes.io/part-of: event-stats
   name: event-statistics
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: event-statistics
       app.kubernetes.io/version: java17-latest
+      app.kubernetes.io/name: event-statistics
       app.kubernetes.io/part-of: event-stats
   template:
     metadata:
@@ -1003,8 +1003,8 @@ spec:
         app.openshift.io/connects-to: "fights-kafka,apicurio"
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:28 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:21 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8085"
@@ -1013,8 +1013,8 @@ spec:
         app: event-statistics
         application: event-stats
         system: quarkus-super-heroes
-        app.kubernetes.io/name: event-statistics
         app.kubernetes.io/version: java17-latest
+        app.kubernetes.io/name: event-statistics
         app.kubernetes.io/part-of: event-stats
     spec:
       containers:
diff --git a/deploy/k8s/java17-minikube.yml b/deploy/k8s/java17-minikube.yml
index 986e85add..e13e1cf36 100644
--- a/deploy/k8s/java17-minikube.yml
+++ b/deploy/k8s/java17-minikube.yml
@@ -20,12 +20,12 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:39 +0000
-    prometheus.io/scrape: "true"
-    prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
     prometheus.io/scheme: http
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:33 +0000
+    prometheus.io/scrape: "true"
+    prometheus.io/path: /q/metrics
   labels:
     app.kubernetes.io/name: rest-villains
     app.kubernetes.io/part-of: villains-service
@@ -97,12 +97,12 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:39 +0000
-    prometheus.io/scrape: "true"
-    prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
     prometheus.io/scheme: http
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:33 +0000
+    prometheus.io/scrape: "true"
+    prometheus.io/path: /q/metrics
   labels:
     app.kubernetes.io/name: rest-villains
     app.kubernetes.io/part-of: villains-service
@@ -124,12 +124,12 @@ spec:
         app.openshift.io/connects-to: villains-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:39 +0000
-        prometheus.io/scrape: "true"
-        prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
         prometheus.io/scheme: http
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:33 +0000
+        prometheus.io/scrape: "true"
+        prometheus.io/path: /q/metrics
       labels:
         app.kubernetes.io/name: rest-villains
         app.kubernetes.io/part-of: villains-service
@@ -264,8 +264,8 @@ metadata:
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: heroes-db
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:51 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:45 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -371,8 +371,8 @@ metadata:
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: heroes-db
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:51 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:45 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -398,8 +398,8 @@ spec:
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
         app.openshift.io/connects-to: heroes-db
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:51 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:45 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
@@ -523,15 +523,15 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    prometheus.io/port: "8082"
-    prometheus.io/scheme: http
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:05 +0000
+    app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:58 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
+    prometheus.io/port: "8082"
+    prometheus.io/scheme: http
   labels:
     app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
@@ -743,15 +743,15 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
-    app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    prometheus.io/port: "8082"
-    prometheus.io/scheme: http
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:05 +0000
+    app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:58 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
+    prometheus.io/port: "8082"
+    prometheus.io/scheme: http
   labels:
     app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
@@ -770,15 +770,15 @@ spec:
   template:
     metadata:
       annotations:
-        app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        prometheus.io/port: "8082"
-        prometheus.io/scheme: http
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:05 +0000
+        app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:58 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
+        prometheus.io/port: "8082"
+        prometheus.io/scheme: http
       labels:
         app.kubernetes.io/name: rest-fights
         app.kubernetes.io/part-of: fights-service
@@ -850,15 +850,15 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
+    app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.openshift.io/connects-to: "fights-kafka,apicurio"
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:18 +0000
-    prometheus.io/scrape: "true"
-    prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
     prometheus.io/scheme: http
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:10 +0000
+    prometheus.io/scrape: "true"
+    prometheus.io/path: /q/metrics
   labels:
     app.kubernetes.io/name: event-statistics
     app.kubernetes.io/part-of: event-stats
@@ -977,15 +977,15 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
+    app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.openshift.io/connects-to: "fights-kafka,apicurio"
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:18 +0000
-    prometheus.io/scrape: "true"
-    prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
     prometheus.io/scheme: http
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:10 +0000
+    prometheus.io/scrape: "true"
+    prometheus.io/path: /q/metrics
   labels:
     app.kubernetes.io/name: event-statistics
     app.kubernetes.io/part-of: event-stats
@@ -1004,15 +1004,15 @@ spec:
   template:
     metadata:
       annotations:
+        app.openshift.io/connects-to: "fights-kafka,apicurio"
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.openshift.io/connects-to: "fights-kafka,apicurio"
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:18 +0000
-        prometheus.io/scrape: "true"
-        prometheus.io/path: /q/metrics
         prometheus.io/port: "8085"
         prometheus.io/scheme: http
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:10 +0000
+        prometheus.io/scrape: "true"
+        prometheus.io/path: /q/metrics
       labels:
         app.kubernetes.io/name: event-statistics
         app.kubernetes.io/part-of: event-stats
diff --git a/deploy/k8s/java17-openshift.yml b/deploy/k8s/java17-openshift.yml
index d58574368..476e28dbb 100644
--- a/deploy/k8s/java17-openshift.yml
+++ b/deploy/k8s/java17-openshift.yml
@@ -17,11 +17,11 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:30 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:21 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -67,20 +67,20 @@ apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:30 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:21 +0000
   labels:
     name: villains-db
     application: villains-service
     system: quarkus-super-heroes
     app: rest-villains
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/name: rest-villains
     app.kubernetes.io/version: java17-latest
     app.kubernetes.io/part-of: villains-service
+    app.kubernetes.io/name: rest-villains
   name: rest-villains
 spec:
   dockerImageRepository: quay.io/quarkus-super-heroes/rest-villains
@@ -162,11 +162,11 @@ apiVersion: apps.openshift.io/v1
 kind: DeploymentConfig
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:30 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:21 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -176,24 +176,24 @@ metadata:
     application: villains-service
     system: quarkus-super-heroes
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/name: rest-villains
     app.kubernetes.io/version: java17-latest
     app.kubernetes.io/part-of: villains-service
+    app.kubernetes.io/name: rest-villains
   name: rest-villains
 spec:
   replicas: 1
   selector:
-    app.kubernetes.io/name: rest-villains
     app.kubernetes.io/version: java17-latest
     app.kubernetes.io/part-of: villains-service
+    app.kubernetes.io/name: rest-villains
   template:
     metadata:
       annotations:
-        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
         app.openshift.io/connects-to: villains-db
         app.openshift.io/vcs-ref: main
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:30 +0000
+        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:21 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -203,9 +203,9 @@ spec:
         application: villains-service
         system: quarkus-super-heroes
         app.openshift.io/runtime: quarkus
-        app.kubernetes.io/name: rest-villains
         app.kubernetes.io/version: java17-latest
         app.kubernetes.io/part-of: villains-service
+        app.kubernetes.io/name: rest-villains
     spec:
       containers:
         - env:
@@ -248,25 +248,16 @@ spec:
               memory: 768Mi
             requests:
               memory: 256Mi
-  triggers:
-    - imageChangeParams:
-        automatic: true
-        containerNames:
-          - rest-villains
-        from:
-          kind: ImageStreamTag
-          name: rest-villains:java17-latest
-      type: ImageChange
 ---
 apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:30 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:21 +0000
   labels:
     app.kubernetes.io/name: rest-villains
     app.kubernetes.io/part-of: villains-service
@@ -318,11 +309,11 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:42 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:33 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -351,11 +342,11 @@ apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
   annotations:
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:42 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:33 +0000
   labels:
     name: heroes-db
     application: heroes-service
@@ -447,11 +438,11 @@ apiVersion: apps.openshift.io/v1
 kind: DeploymentConfig
 metadata:
   annotations:
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:42 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:33 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -474,11 +465,11 @@ spec:
   template:
     metadata:
       annotations:
+        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
         app.openshift.io/connects-to: heroes-db
         app.openshift.io/vcs-ref: main
-        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:42 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:33 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
@@ -533,16 +524,25 @@ spec:
               memory: 768Mi
             requests:
               memory: 256Mi
+  triggers:
+    - imageChangeParams:
+        automatic: true
+        containerNames:
+          - rest-heroes
+        from:
+          kind: ImageStreamTag
+          name: rest-heroes:java17-latest
+      type: ImageChange
 ---
 apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
   annotations:
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:42 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:33 +0000
   labels:
     app.kubernetes.io/name: rest-heroes
     app.kubernetes.io/part-of: heroes-service
@@ -628,11 +628,11 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:56 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:45 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -661,20 +661,20 @@ apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:56 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:45 +0000
   labels:
     name: apicurio
     application: fights-service
     system: quarkus-super-heroes
     app: rest-fights
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/version: java17-latest
+    app.kubernetes.io/name: rest-fights
   name: rest-fights
 spec:
   dockerImageRepository: quay.io/quarkus-super-heroes/rest-fights
@@ -870,11 +870,11 @@ apiVersion: apps.openshift.io/v1
 kind: DeploymentConfig
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:56 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:45 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -884,24 +884,24 @@ metadata:
     application: fights-service
     system: quarkus-super-heroes
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/version: java17-latest
+    app.kubernetes.io/name: rest-fights
   name: rest-fights
 spec:
   replicas: 1
   selector:
-    app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/version: java17-latest
+    app.kubernetes.io/name: rest-fights
   template:
     metadata:
       annotations:
-        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.openshift.io/vcs-ref: main
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:56 +0000
+        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:45 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
@@ -911,9 +911,9 @@ spec:
         application: fights-service
         system: quarkus-super-heroes
         app.openshift.io/runtime: quarkus
-        app.kubernetes.io/name: rest-fights
         app.kubernetes.io/part-of: fights-service
         app.kubernetes.io/version: java17-latest
+        app.kubernetes.io/name: rest-fights
     spec:
       containers:
         - env:
@@ -956,15 +956,6 @@ spec:
               memory: 768Mi
             requests:
               memory: 256Mi
-  triggers:
-    - imageChangeParams:
-        automatic: true
-        containerNames:
-          - rest-fights
-        from:
-          kind: ImageStreamTag
-          name: rest-fights:java17-latest
-      type: ImageChange
 ---
 apiVersion: route.openshift.io/v1
 kind: Route
@@ -986,11 +977,11 @@ apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:56 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:45 +0000
   labels:
     app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
@@ -1031,8 +1022,8 @@ metadata:
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:27:09 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:57 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
@@ -1081,17 +1072,17 @@ metadata:
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:27:09 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:57 +0000
   labels:
     name: apicurio
     application: event-stats
     system: quarkus-super-heroes
     app: event-statistics
     app.openshift.io/runtime: quarkus
+    app.kubernetes.io/part-of: event-stats
     app.kubernetes.io/version: java17-latest
     app.kubernetes.io/name: event-statistics
-    app.kubernetes.io/part-of: event-stats
   name: event-statistics
 spec:
   dockerImageRepository: quay.io/quarkus-super-heroes/event-statistics
@@ -1224,8 +1215,8 @@ metadata:
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:27:09 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:57 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
@@ -1235,24 +1226,24 @@ metadata:
     application: event-stats
     system: quarkus-super-heroes
     app.openshift.io/runtime: quarkus
+    app.kubernetes.io/part-of: event-stats
     app.kubernetes.io/version: java17-latest
     app.kubernetes.io/name: event-statistics
-    app.kubernetes.io/part-of: event-stats
   name: event-statistics
 spec:
   replicas: 1
   selector:
+    app.kubernetes.io/part-of: event-stats
     app.kubernetes.io/version: java17-latest
     app.kubernetes.io/name: event-statistics
-    app.kubernetes.io/part-of: event-stats
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: "fights-kafka,apicurio"
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:27:09 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:57 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8085"
@@ -1262,9 +1253,9 @@ spec:
         application: event-stats
         system: quarkus-super-heroes
         app.openshift.io/runtime: quarkus
+        app.kubernetes.io/part-of: event-stats
         app.kubernetes.io/version: java17-latest
         app.kubernetes.io/name: event-statistics
-        app.kubernetes.io/part-of: event-stats
     spec:
       containers:
         - env:
@@ -1331,8 +1322,8 @@ metadata:
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:27:09 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:57 +0000
   labels:
     app.kubernetes.io/name: event-statistics
     app.kubernetes.io/part-of: event-stats
diff --git a/deploy/k8s/native-java11-knative.yml b/deploy/k8s/native-java11-knative.yml
index c68d5df32..7df425963 100644
--- a/deploy/k8s/native-java11-knative.yml
+++ b/deploy/k8s/native-java11-knative.yml
@@ -20,8 +20,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:58 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:53 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -31,8 +31,8 @@ metadata:
     app.openshift.io/runtime: quarkus
     application: villains-service
     system: quarkus-super-heroes
-    app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/name: rest-villains
+    app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/part-of: villains-service
   name: rest-villains
 spec:
@@ -42,8 +42,8 @@ spec:
         app.openshift.io/connects-to: villains-db
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:58 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:53 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -53,8 +53,8 @@ spec:
         app.openshift.io/runtime: quarkus
         application: villains-service
         system: quarkus-super-heroes
-        app.kubernetes.io/version: native-java11-latest
         app.kubernetes.io/name: rest-villains
+        app.kubernetes.io/version: native-java11-latest
         app.kubernetes.io/part-of: villains-service
     spec:
       containers:
@@ -195,8 +195,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:24:10 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:42:04 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -206,8 +206,8 @@ metadata:
     app.openshift.io/runtime: quarkus
     application: heroes-service
     system: quarkus-super-heroes
-    app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/part-of: heroes-service
+    app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/name: rest-heroes
   name: rest-heroes
 spec:
@@ -217,8 +217,8 @@ spec:
         app.openshift.io/connects-to: heroes-db
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:24:10 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:42:04 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
@@ -228,8 +228,8 @@ spec:
         app.openshift.io/runtime: quarkus
         application: heroes-service
         system: quarkus-super-heroes
-        app.kubernetes.io/version: native-java11-latest
         app.kubernetes.io/part-of: heroes-service
+        app.kubernetes.io/version: native-java11-latest
         app.kubernetes.io/name: rest-heroes
     spec:
       containers:
@@ -345,8 +345,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:24:24 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:42:17 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -356,9 +356,9 @@ metadata:
     app.openshift.io/runtime: quarkus
     application: fights-service
     system: quarkus-super-heroes
-    app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/name: rest-fights
+    app.kubernetes.io/version: native-java11-latest
   name: rest-fights
 spec:
   template:
@@ -367,8 +367,8 @@ spec:
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:24:24 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:42:17 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
@@ -378,9 +378,9 @@ spec:
         app.openshift.io/runtime: quarkus
         application: fights-service
         system: quarkus-super-heroes
-        app.kubernetes.io/version: native-java11-latest
         app.kubernetes.io/part-of: fights-service
         app.kubernetes.io/name: rest-fights
+        app.kubernetes.io/version: native-java11-latest
     spec:
       containers:
         - envFrom:
@@ -634,8 +634,8 @@ metadata:
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:24:36 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:42:30 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
@@ -656,8 +656,8 @@ spec:
         app.openshift.io/connects-to: "fights-kafka,apicurio"
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:24:36 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:42:30 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8085"
diff --git a/deploy/k8s/native-java11-kubernetes.yml b/deploy/k8s/native-java11-kubernetes.yml
index 21d6a3698..099915232 100644
--- a/deploy/k8s/native-java11-kubernetes.yml
+++ b/deploy/k8s/native-java11-kubernetes.yml
@@ -20,8 +20,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:21:26 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:39:23 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -96,8 +96,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:21:26 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:39:23 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -106,16 +106,16 @@ metadata:
     app: rest-villains
     application: villains-service
     system: quarkus-super-heroes
-    app.kubernetes.io/name: rest-villains
     app.kubernetes.io/part-of: villains-service
+    app.kubernetes.io/name: rest-villains
     app.kubernetes.io/version: native-java11-latest
   name: rest-villains
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: rest-villains
       app.kubernetes.io/part-of: villains-service
+      app.kubernetes.io/name: rest-villains
       app.kubernetes.io/version: native-java11-latest
   template:
     metadata:
@@ -123,8 +123,8 @@ spec:
         app.openshift.io/connects-to: villains-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:21:26 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:39:23 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -133,8 +133,8 @@ spec:
         app: rest-villains
         application: villains-service
         system: quarkus-super-heroes
-        app.kubernetes.io/name: rest-villains
         app.kubernetes.io/part-of: villains-service
+        app.kubernetes.io/name: rest-villains
         app.kubernetes.io/version: native-java11-latest
     spec:
       containers:
@@ -263,8 +263,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:21:38 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:39:35 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -369,8 +369,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:21:38 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:39:35 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -396,8 +396,8 @@ spec:
         app.openshift.io/connects-to: heroes-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:21:38 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:39:35 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
@@ -524,8 +524,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:21:52 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:39:48 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -743,8 +743,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:21:52 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:39:48 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -770,8 +770,8 @@ spec:
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:21:52 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:39:48 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
@@ -850,8 +850,8 @@ metadata:
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:22:05 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:40:00 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
@@ -976,8 +976,8 @@ metadata:
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:22:05 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:40:00 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
@@ -986,25 +986,25 @@ metadata:
     app: event-statistics
     application: event-stats
     system: quarkus-super-heroes
-    app.kubernetes.io/name: event-statistics
-    app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/part-of: event-stats
+    app.kubernetes.io/version: native-java11-latest
+    app.kubernetes.io/name: event-statistics
   name: event-statistics
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: event-statistics
-      app.kubernetes.io/version: native-java11-latest
       app.kubernetes.io/part-of: event-stats
+      app.kubernetes.io/version: native-java11-latest
+      app.kubernetes.io/name: event-statistics
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: "fights-kafka,apicurio"
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:22:05 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:40:00 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8085"
@@ -1013,9 +1013,9 @@ spec:
         app: event-statistics
         application: event-stats
         system: quarkus-super-heroes
-        app.kubernetes.io/name: event-statistics
-        app.kubernetes.io/version: native-java11-latest
         app.kubernetes.io/part-of: event-stats
+        app.kubernetes.io/version: native-java11-latest
+        app.kubernetes.io/name: event-statistics
     spec:
       containers:
         - env:
diff --git a/deploy/k8s/native-java11-minikube.yml b/deploy/k8s/native-java11-minikube.yml
index f2d7e690c..c94484959 100644
--- a/deploy/k8s/native-java11-minikube.yml
+++ b/deploy/k8s/native-java11-minikube.yml
@@ -20,8 +20,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:22:17 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:40:12 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -97,8 +97,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:22:17 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:40:12 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -124,8 +124,8 @@ spec:
         app.openshift.io/connects-to: villains-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:22:17 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:40:12 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -261,11 +261,11 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
+    app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.openshift.io/connects-to: heroes-db
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:22:29 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:40:24 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -368,11 +368,11 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
+    app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.openshift.io/connects-to: heroes-db
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:22:29 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:40:24 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -395,11 +395,11 @@ spec:
   template:
     metadata:
       annotations:
+        app.openshift.io/connects-to: heroes-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.openshift.io/connects-to: heroes-db
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:22:29 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:40:24 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
@@ -526,8 +526,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:22:43 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:40:37 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -746,8 +746,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:22:43 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:40:37 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -773,8 +773,8 @@ spec:
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:22:43 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:40:37 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
@@ -853,12 +853,12 @@ metadata:
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    prometheus.io/port: "8085"
-    prometheus.io/scheme: http
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:22:56 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:40:51 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
+    prometheus.io/port: "8085"
+    prometheus.io/scheme: http
   labels:
     app.kubernetes.io/name: event-statistics
     app.kubernetes.io/part-of: event-stats
@@ -980,12 +980,12 @@ metadata:
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    prometheus.io/port: "8085"
-    prometheus.io/scheme: http
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:22:56 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:40:51 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
+    prometheus.io/port: "8085"
+    prometheus.io/scheme: http
   labels:
     app.kubernetes.io/name: event-statistics
     app.kubernetes.io/part-of: event-stats
@@ -1007,12 +1007,12 @@ spec:
         app.openshift.io/connects-to: "fights-kafka,apicurio"
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        prometheus.io/port: "8085"
-        prometheus.io/scheme: http
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:22:56 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:40:51 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
+        prometheus.io/port: "8085"
+        prometheus.io/scheme: http
       labels:
         app.kubernetes.io/name: event-statistics
         app.kubernetes.io/part-of: event-stats
diff --git a/deploy/k8s/native-java11-openshift.yml b/deploy/k8s/native-java11-openshift.yml
index d219ffd98..25ea6354b 100644
--- a/deploy/k8s/native-java11-openshift.yml
+++ b/deploy/k8s/native-java11-openshift.yml
@@ -17,11 +17,11 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:07 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:04 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -67,19 +67,19 @@ apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:07 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:04 +0000
   labels:
     name: villains-db
     application: villains-service
     system: quarkus-super-heroes
     app: rest-villains
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/name: rest-villains
+    app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/part-of: villains-service
   name: rest-villains
 spec:
@@ -162,11 +162,11 @@ apiVersion: apps.openshift.io/v1
 kind: DeploymentConfig
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:07 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:04 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -176,24 +176,24 @@ metadata:
     application: villains-service
     system: quarkus-super-heroes
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/name: rest-villains
+    app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/part-of: villains-service
   name: rest-villains
 spec:
   replicas: 1
   selector:
-    app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/name: rest-villains
+    app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/part-of: villains-service
   template:
     metadata:
       annotations:
-        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
         app.openshift.io/connects-to: villains-db
         app.openshift.io/vcs-ref: main
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:07 +0000
+        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:04 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -203,8 +203,8 @@ spec:
         application: villains-service
         system: quarkus-super-heroes
         app.openshift.io/runtime: quarkus
-        app.kubernetes.io/version: native-java11-latest
         app.kubernetes.io/name: rest-villains
+        app.kubernetes.io/version: native-java11-latest
         app.kubernetes.io/part-of: villains-service
     spec:
       containers:
@@ -248,25 +248,16 @@ spec:
               memory: 128Mi
             requests:
               memory: 32Mi
-  triggers:
-    - imageChangeParams:
-        automatic: true
-        containerNames:
-          - rest-villains
-        from:
-          kind: ImageStreamTag
-          name: rest-villains:native-java11-latest
-      type: ImageChange
 ---
 apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:07 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:04 +0000
   labels:
     app.kubernetes.io/name: rest-villains
     app.kubernetes.io/part-of: villains-service
@@ -321,8 +312,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:19 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:16 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -354,8 +345,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:19 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:16 +0000
   labels:
     name: heroes-db
     application: heroes-service
@@ -363,8 +354,8 @@ metadata:
     app: rest-heroes
     app.openshift.io/runtime: quarkus
     app.kubernetes.io/name: rest-heroes
-    app.kubernetes.io/part-of: heroes-service
     app.kubernetes.io/version: native-java11-latest
+    app.kubernetes.io/part-of: heroes-service
   name: rest-heroes
 spec:
   dockerImageRepository: quay.io/quarkus-super-heroes/rest-heroes
@@ -450,8 +441,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:19 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:16 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -462,23 +453,23 @@ metadata:
     system: quarkus-super-heroes
     app.openshift.io/runtime: quarkus
     app.kubernetes.io/name: rest-heroes
-    app.kubernetes.io/part-of: heroes-service
     app.kubernetes.io/version: native-java11-latest
+    app.kubernetes.io/part-of: heroes-service
   name: rest-heroes
 spec:
   replicas: 1
   selector:
     app.kubernetes.io/name: rest-heroes
-    app.kubernetes.io/part-of: heroes-service
     app.kubernetes.io/version: native-java11-latest
+    app.kubernetes.io/part-of: heroes-service
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: heroes-db
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:19 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:16 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
@@ -489,8 +480,8 @@ spec:
         system: quarkus-super-heroes
         app.openshift.io/runtime: quarkus
         app.kubernetes.io/name: rest-heroes
-        app.kubernetes.io/part-of: heroes-service
         app.kubernetes.io/version: native-java11-latest
+        app.kubernetes.io/part-of: heroes-service
     spec:
       containers:
         - env:
@@ -541,8 +532,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:19 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:16 +0000
   labels:
     app.kubernetes.io/name: rest-heroes
     app.kubernetes.io/part-of: heroes-service
@@ -631,8 +622,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:33 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:30 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -664,17 +655,17 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:33 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:30 +0000
   labels:
     name: apicurio
     application: fights-service
     system: quarkus-super-heroes
     app: rest-fights
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/name: rest-fights
+    app.kubernetes.io/part-of: fights-service
   name: rest-fights
 spec:
   dockerImageRepository: quay.io/quarkus-super-heroes/rest-fights
@@ -873,8 +864,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:33 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:30 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -884,24 +875,24 @@ metadata:
     application: fights-service
     system: quarkus-super-heroes
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/name: rest-fights
+    app.kubernetes.io/part-of: fights-service
   name: rest-fights
 spec:
   replicas: 1
   selector:
-    app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/name: rest-fights
+    app.kubernetes.io/part-of: fights-service
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:33 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:30 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
@@ -911,9 +902,9 @@ spec:
         application: fights-service
         system: quarkus-super-heroes
         app.openshift.io/runtime: quarkus
-        app.kubernetes.io/part-of: fights-service
         app.kubernetes.io/version: native-java11-latest
         app.kubernetes.io/name: rest-fights
+        app.kubernetes.io/part-of: fights-service
     spec:
       containers:
         - env:
@@ -980,8 +971,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:33 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:30 +0000
   labels:
     app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
@@ -1019,11 +1010,11 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:46 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:42 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
@@ -1069,11 +1060,11 @@ apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:46 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:42 +0000
   labels:
     name: apicurio
     application: event-stats
@@ -1212,11 +1203,11 @@ apiVersion: apps.openshift.io/v1
 kind: DeploymentConfig
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:46 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:42 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
@@ -1239,11 +1230,11 @@ spec:
   template:
     metadata:
       annotations:
-        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
         app.openshift.io/connects-to: "fights-kafka,apicurio"
         app.openshift.io/vcs-ref: main
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:46 +0000
+        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:42 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8085"
@@ -1298,15 +1289,6 @@ spec:
               memory: 128Mi
             requests:
               memory: 32Mi
-  triggers:
-    - imageChangeParams:
-        automatic: true
-        containerNames:
-          - event-statistics
-        from:
-          kind: ImageStreamTag
-          name: event-statistics:native-java11-latest
-      type: ImageChange
 ---
 apiVersion: route.openshift.io/v1
 kind: Route
@@ -1328,11 +1310,11 @@ apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:46 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:42 +0000
   labels:
     app.kubernetes.io/name: event-statistics
     app.kubernetes.io/part-of: event-stats
diff --git a/deploy/k8s/native-java17-knative.yml b/deploy/k8s/native-java17-knative.yml
index 25d8177ec..40a86b475 100644
--- a/deploy/k8s/native-java17-knative.yml
+++ b/deploy/k8s/native-java17-knative.yml
@@ -20,8 +20,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:44 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:28 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -31,9 +31,9 @@ metadata:
     app.openshift.io/runtime: quarkus
     application: villains-service
     system: quarkus-super-heroes
+    app.kubernetes.io/name: rest-villains
     app.kubernetes.io/version: native-java17-latest
     app.kubernetes.io/part-of: villains-service
-    app.kubernetes.io/name: rest-villains
   name: rest-villains
 spec:
   template:
@@ -42,8 +42,8 @@ spec:
         app.openshift.io/connects-to: villains-db
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:44 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:28 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -53,9 +53,9 @@ spec:
         app.openshift.io/runtime: quarkus
         application: villains-service
         system: quarkus-super-heroes
+        app.kubernetes.io/name: rest-villains
         app.kubernetes.io/version: native-java17-latest
         app.kubernetes.io/part-of: villains-service
-        app.kubernetes.io/name: rest-villains
     spec:
       containers:
         - envFrom:
@@ -195,8 +195,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:56 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:40 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -206,9 +206,9 @@ metadata:
     app.openshift.io/runtime: quarkus
     application: heroes-service
     system: quarkus-super-heroes
+    app.kubernetes.io/version: native-java17-latest
     app.kubernetes.io/part-of: heroes-service
     app.kubernetes.io/name: rest-heroes
-    app.kubernetes.io/version: native-java17-latest
   name: rest-heroes
 spec:
   template:
@@ -217,8 +217,8 @@ spec:
         app.openshift.io/connects-to: heroes-db
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:56 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:40 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
@@ -228,9 +228,9 @@ spec:
         app.openshift.io/runtime: quarkus
         application: heroes-service
         system: quarkus-super-heroes
+        app.kubernetes.io/version: native-java17-latest
         app.kubernetes.io/part-of: heroes-service
         app.kubernetes.io/name: rest-heroes
-        app.kubernetes.io/version: native-java17-latest
     spec:
       containers:
         - envFrom:
@@ -345,8 +345,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:31:10 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:53 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -356,9 +356,9 @@ metadata:
     app.openshift.io/runtime: quarkus
     application: fights-service
     system: quarkus-super-heroes
+    app.kubernetes.io/version: native-java17-latest
     app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/name: rest-fights
-    app.kubernetes.io/version: native-java17-latest
   name: rest-fights
 spec:
   template:
@@ -367,8 +367,8 @@ spec:
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:31:10 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:53 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
@@ -378,9 +378,9 @@ spec:
         app.openshift.io/runtime: quarkus
         application: fights-service
         system: quarkus-super-heroes
+        app.kubernetes.io/version: native-java17-latest
         app.kubernetes.io/part-of: fights-service
         app.kubernetes.io/name: rest-fights
-        app.kubernetes.io/version: native-java17-latest
     spec:
       containers:
         - envFrom:
@@ -634,8 +634,8 @@ metadata:
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:31:22 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:49:06 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
@@ -645,9 +645,9 @@ metadata:
     app.openshift.io/runtime: quarkus
     application: event-stats
     system: quarkus-super-heroes
+    app.kubernetes.io/name: event-statistics
     app.kubernetes.io/version: native-java17-latest
     app.kubernetes.io/part-of: event-stats
-    app.kubernetes.io/name: event-statistics
   name: event-statistics
 spec:
   template:
@@ -656,8 +656,8 @@ spec:
         app.openshift.io/connects-to: "fights-kafka,apicurio"
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:31:22 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:49:06 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8085"
@@ -667,9 +667,9 @@ spec:
         app.openshift.io/runtime: quarkus
         application: event-stats
         system: quarkus-super-heroes
+        app.kubernetes.io/name: event-statistics
         app.kubernetes.io/version: native-java17-latest
         app.kubernetes.io/part-of: event-stats
-        app.kubernetes.io/name: event-statistics
     spec:
       containers:
         - envFrom:
diff --git a/deploy/k8s/native-java17-kubernetes.yml b/deploy/k8s/native-java17-kubernetes.yml
index ef31c0cf8..6093ec0cb 100644
--- a/deploy/k8s/native-java17-kubernetes.yml
+++ b/deploy/k8s/native-java17-kubernetes.yml
@@ -20,8 +20,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:28:11 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:45:57 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -96,8 +96,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:28:11 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:45:57 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -106,25 +106,25 @@ metadata:
     app: rest-villains
     application: villains-service
     system: quarkus-super-heroes
-    app.kubernetes.io/version: native-java17-latest
     app.kubernetes.io/part-of: villains-service
     app.kubernetes.io/name: rest-villains
+    app.kubernetes.io/version: native-java17-latest
   name: rest-villains
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/version: native-java17-latest
       app.kubernetes.io/part-of: villains-service
       app.kubernetes.io/name: rest-villains
+      app.kubernetes.io/version: native-java17-latest
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: villains-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:28:11 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:45:57 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -133,9 +133,9 @@ spec:
         app: rest-villains
         application: villains-service
         system: quarkus-super-heroes
-        app.kubernetes.io/version: native-java17-latest
         app.kubernetes.io/part-of: villains-service
         app.kubernetes.io/name: rest-villains
+        app.kubernetes.io/version: native-java17-latest
     spec:
       containers:
         - env:
@@ -263,8 +263,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:28:24 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:08 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -369,8 +369,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:28:24 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:08 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -380,24 +380,24 @@ metadata:
     application: heroes-service
     system: quarkus-super-heroes
     app.kubernetes.io/part-of: heroes-service
-    app.kubernetes.io/version: native-java17-latest
     app.kubernetes.io/name: rest-heroes
+    app.kubernetes.io/version: native-java17-latest
   name: rest-heroes
 spec:
   replicas: 1
   selector:
     matchLabels:
       app.kubernetes.io/part-of: heroes-service
-      app.kubernetes.io/version: native-java17-latest
       app.kubernetes.io/name: rest-heroes
+      app.kubernetes.io/version: native-java17-latest
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: heroes-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:28:24 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:08 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
@@ -407,8 +407,8 @@ spec:
         application: heroes-service
         system: quarkus-super-heroes
         app.kubernetes.io/part-of: heroes-service
-        app.kubernetes.io/version: native-java17-latest
         app.kubernetes.io/name: rest-heroes
+        app.kubernetes.io/version: native-java17-latest
     spec:
       containers:
         - env:
@@ -524,8 +524,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:28:37 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:21 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -743,8 +743,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:28:37 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:21 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -753,16 +753,16 @@ metadata:
     app: rest-fights
     application: fights-service
     system: quarkus-super-heroes
-    app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
+    app.kubernetes.io/name: rest-fights
     app.kubernetes.io/version: native-java17-latest
   name: rest-fights
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: rest-fights
       app.kubernetes.io/part-of: fights-service
+      app.kubernetes.io/name: rest-fights
       app.kubernetes.io/version: native-java17-latest
   template:
     metadata:
@@ -770,8 +770,8 @@ spec:
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:28:37 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:21 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
@@ -780,8 +780,8 @@ spec:
         app: rest-fights
         application: fights-service
         system: quarkus-super-heroes
-        app.kubernetes.io/name: rest-fights
         app.kubernetes.io/part-of: fights-service
+        app.kubernetes.io/name: rest-fights
         app.kubernetes.io/version: native-java17-latest
     spec:
       containers:
@@ -850,8 +850,8 @@ metadata:
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:28:50 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:34 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
@@ -976,8 +976,8 @@ metadata:
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:28:50 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:34 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
@@ -1003,8 +1003,8 @@ spec:
         app.openshift.io/connects-to: "fights-kafka,apicurio"
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:28:50 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:34 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8085"
diff --git a/deploy/k8s/native-java17-minikube.yml b/deploy/k8s/native-java17-minikube.yml
index 8dcd4f5a7..41032cff2 100644
--- a/deploy/k8s/native-java17-minikube.yml
+++ b/deploy/k8s/native-java17-minikube.yml
@@ -17,11 +17,11 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:02 +0000
+    app.openshift.io/connects-to: villains-db
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:46 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -94,11 +94,11 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
-    app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:02 +0000
+    app.openshift.io/connects-to: villains-db
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:46 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -121,11 +121,11 @@ spec:
   template:
     metadata:
       annotations:
-        app.openshift.io/connects-to: villains-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:02 +0000
+        app.openshift.io/connects-to: villains-db
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:46 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -261,11 +261,11 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
+    app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.openshift.io/connects-to: heroes-db
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:15 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:58 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -368,11 +368,11 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
+    app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.openshift.io/connects-to: heroes-db
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:15 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:58 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -395,11 +395,11 @@ spec:
   template:
     metadata:
       annotations:
+        app.openshift.io/connects-to: heroes-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.openshift.io/connects-to: heroes-db
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:15 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:58 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
@@ -523,15 +523,15 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
+    app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:29 +0000
-    prometheus.io/scrape: "true"
-    prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
     prometheus.io/scheme: http
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:13 +0000
+    prometheus.io/scrape: "true"
+    prometheus.io/path: /q/metrics
   labels:
     app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
@@ -743,15 +743,15 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
+    app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:29 +0000
-    prometheus.io/scrape: "true"
-    prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
     prometheus.io/scheme: http
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:13 +0000
+    prometheus.io/scrape: "true"
+    prometheus.io/path: /q/metrics
   labels:
     app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
@@ -770,15 +770,15 @@ spec:
   template:
     metadata:
       annotations:
+        app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:29 +0000
-        prometheus.io/scrape: "true"
-        prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
         prometheus.io/scheme: http
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:13 +0000
+        prometheus.io/scrape: "true"
+        prometheus.io/path: /q/metrics
       labels:
         app.kubernetes.io/name: rest-fights
         app.kubernetes.io/part-of: fights-service
@@ -853,12 +853,12 @@ metadata:
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:41 +0000
-    prometheus.io/scrape: "true"
-    prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
     prometheus.io/scheme: http
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:25 +0000
+    prometheus.io/scrape: "true"
+    prometheus.io/path: /q/metrics
   labels:
     app.kubernetes.io/name: event-statistics
     app.kubernetes.io/part-of: event-stats
@@ -980,12 +980,12 @@ metadata:
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:41 +0000
-    prometheus.io/scrape: "true"
-    prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
     prometheus.io/scheme: http
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:25 +0000
+    prometheus.io/scrape: "true"
+    prometheus.io/path: /q/metrics
   labels:
     app.kubernetes.io/name: event-statistics
     app.kubernetes.io/part-of: event-stats
@@ -1007,12 +1007,12 @@ spec:
         app.openshift.io/connects-to: "fights-kafka,apicurio"
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:41 +0000
-        prometheus.io/scrape: "true"
-        prometheus.io/path: /q/metrics
         prometheus.io/port: "8085"
         prometheus.io/scheme: http
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:25 +0000
+        prometheus.io/scrape: "true"
+        prometheus.io/path: /q/metrics
       labels:
         app.kubernetes.io/name: event-statistics
         app.kubernetes.io/part-of: event-stats
diff --git a/deploy/k8s/native-java17-openshift.yml b/deploy/k8s/native-java17-openshift.yml
index 69b6eb072..ffdca75a0 100644
--- a/deploy/k8s/native-java17-openshift.yml
+++ b/deploy/k8s/native-java17-openshift.yml
@@ -17,11 +17,11 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:53 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:37 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -67,20 +67,20 @@ apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
   annotations:
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:53 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:37 +0000
   labels:
     name: villains-db
     application: villains-service
     system: quarkus-super-heroes
     app: rest-villains
     app.openshift.io/runtime: quarkus
+    app.kubernetes.io/version: native-java17-latest
     app.kubernetes.io/part-of: villains-service
     app.kubernetes.io/name: rest-villains
-    app.kubernetes.io/version: native-java17-latest
   name: rest-villains
 spec:
   dockerImageRepository: quay.io/quarkus-super-heroes/rest-villains
@@ -162,11 +162,11 @@ apiVersion: apps.openshift.io/v1
 kind: DeploymentConfig
 metadata:
   annotations:
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:53 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:37 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -176,24 +176,24 @@ metadata:
     application: villains-service
     system: quarkus-super-heroes
     app.openshift.io/runtime: quarkus
+    app.kubernetes.io/version: native-java17-latest
     app.kubernetes.io/part-of: villains-service
     app.kubernetes.io/name: rest-villains
-    app.kubernetes.io/version: native-java17-latest
   name: rest-villains
 spec:
   replicas: 1
   selector:
+    app.kubernetes.io/version: native-java17-latest
     app.kubernetes.io/part-of: villains-service
     app.kubernetes.io/name: rest-villains
-    app.kubernetes.io/version: native-java17-latest
   template:
     metadata:
       annotations:
+        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
         app.openshift.io/connects-to: villains-db
         app.openshift.io/vcs-ref: main
-        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:53 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:37 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -203,9 +203,9 @@ spec:
         application: villains-service
         system: quarkus-super-heroes
         app.openshift.io/runtime: quarkus
+        app.kubernetes.io/version: native-java17-latest
         app.kubernetes.io/part-of: villains-service
         app.kubernetes.io/name: rest-villains
-        app.kubernetes.io/version: native-java17-latest
     spec:
       containers:
         - env:
@@ -248,16 +248,25 @@ spec:
               memory: 128Mi
             requests:
               memory: 32Mi
+  triggers:
+    - imageChangeParams:
+        automatic: true
+        containerNames:
+          - rest-villains
+        from:
+          kind: ImageStreamTag
+          name: rest-villains:native-java17-latest
+      type: ImageChange
 ---
 apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
   annotations:
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:53 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:37 +0000
   labels:
     app.kubernetes.io/name: rest-villains
     app.kubernetes.io/part-of: villains-service
@@ -312,8 +321,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:05 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:50 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -345,17 +354,17 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:05 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:50 +0000
   labels:
     name: heroes-db
     application: heroes-service
     system: quarkus-super-heroes
     app: rest-heroes
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/version: native-java17-latest
-    app.kubernetes.io/name: rest-heroes
     app.kubernetes.io/part-of: heroes-service
+    app.kubernetes.io/name: rest-heroes
+    app.kubernetes.io/version: native-java17-latest
   name: rest-heroes
 spec:
   dockerImageRepository: quay.io/quarkus-super-heroes/rest-heroes
@@ -441,8 +450,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:05 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:50 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -452,24 +461,24 @@ metadata:
     application: heroes-service
     system: quarkus-super-heroes
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/version: native-java17-latest
-    app.kubernetes.io/name: rest-heroes
     app.kubernetes.io/part-of: heroes-service
+    app.kubernetes.io/name: rest-heroes
+    app.kubernetes.io/version: native-java17-latest
   name: rest-heroes
 spec:
   replicas: 1
   selector:
-    app.kubernetes.io/version: native-java17-latest
-    app.kubernetes.io/name: rest-heroes
     app.kubernetes.io/part-of: heroes-service
+    app.kubernetes.io/name: rest-heroes
+    app.kubernetes.io/version: native-java17-latest
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: heroes-db
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:05 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:50 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
@@ -479,9 +488,9 @@ spec:
         application: heroes-service
         system: quarkus-super-heroes
         app.openshift.io/runtime: quarkus
-        app.kubernetes.io/version: native-java17-latest
-        app.kubernetes.io/name: rest-heroes
         app.kubernetes.io/part-of: heroes-service
+        app.kubernetes.io/name: rest-heroes
+        app.kubernetes.io/version: native-java17-latest
     spec:
       containers:
         - env:
@@ -532,8 +541,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:05 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:50 +0000
   labels:
     app.kubernetes.io/name: rest-heroes
     app.kubernetes.io/part-of: heroes-service
@@ -622,8 +631,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:19 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:04 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -655,17 +664,17 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:19 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:04 +0000
   labels:
     name: apicurio
     application: fights-service
     system: quarkus-super-heroes
     app: rest-fights
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/part-of: fights-service
-    app.kubernetes.io/name: rest-fights
     app.kubernetes.io/version: native-java17-latest
+    app.kubernetes.io/name: rest-fights
+    app.kubernetes.io/part-of: fights-service
   name: rest-fights
 spec:
   dockerImageRepository: quay.io/quarkus-super-heroes/rest-fights
@@ -864,8 +873,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:19 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:04 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -875,24 +884,24 @@ metadata:
     application: fights-service
     system: quarkus-super-heroes
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/part-of: fights-service
-    app.kubernetes.io/name: rest-fights
     app.kubernetes.io/version: native-java17-latest
+    app.kubernetes.io/name: rest-fights
+    app.kubernetes.io/part-of: fights-service
   name: rest-fights
 spec:
   replicas: 1
   selector:
-    app.kubernetes.io/part-of: fights-service
-    app.kubernetes.io/name: rest-fights
     app.kubernetes.io/version: native-java17-latest
+    app.kubernetes.io/name: rest-fights
+    app.kubernetes.io/part-of: fights-service
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:19 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:04 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
@@ -902,9 +911,9 @@ spec:
         application: fights-service
         system: quarkus-super-heroes
         app.openshift.io/runtime: quarkus
-        app.kubernetes.io/part-of: fights-service
-        app.kubernetes.io/name: rest-fights
         app.kubernetes.io/version: native-java17-latest
+        app.kubernetes.io/name: rest-fights
+        app.kubernetes.io/part-of: fights-service
     spec:
       containers:
         - env:
@@ -971,8 +980,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:19 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:04 +0000
   labels:
     app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
@@ -1010,11 +1019,11 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.openshift.io/vcs-ref: main
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:32 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:16 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
@@ -1060,11 +1069,11 @@ apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
   annotations:
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.openshift.io/vcs-ref: main
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:32 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:16 +0000
   labels:
     name: apicurio
     application: event-stats
@@ -1072,8 +1081,8 @@ metadata:
     app: event-statistics
     app.openshift.io/runtime: quarkus
     app.kubernetes.io/name: event-statistics
-    app.kubernetes.io/version: native-java17-latest
     app.kubernetes.io/part-of: event-stats
+    app.kubernetes.io/version: native-java17-latest
   name: event-statistics
 spec:
   dockerImageRepository: quay.io/quarkus-super-heroes/event-statistics
@@ -1203,11 +1212,11 @@ apiVersion: apps.openshift.io/v1
 kind: DeploymentConfig
 metadata:
   annotations:
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.openshift.io/vcs-ref: main
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:32 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:16 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
@@ -1218,23 +1227,23 @@ metadata:
     system: quarkus-super-heroes
     app.openshift.io/runtime: quarkus
     app.kubernetes.io/name: event-statistics
-    app.kubernetes.io/version: native-java17-latest
     app.kubernetes.io/part-of: event-stats
+    app.kubernetes.io/version: native-java17-latest
   name: event-statistics
 spec:
   replicas: 1
   selector:
     app.kubernetes.io/name: event-statistics
-    app.kubernetes.io/version: native-java17-latest
     app.kubernetes.io/part-of: event-stats
+    app.kubernetes.io/version: native-java17-latest
   template:
     metadata:
       annotations:
+        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
         app.openshift.io/connects-to: "fights-kafka,apicurio"
         app.openshift.io/vcs-ref: main
-        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:32 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:16 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8085"
@@ -1245,8 +1254,8 @@ spec:
         system: quarkus-super-heroes
         app.openshift.io/runtime: quarkus
         app.kubernetes.io/name: event-statistics
-        app.kubernetes.io/version: native-java17-latest
         app.kubernetes.io/part-of: event-stats
+        app.kubernetes.io/version: native-java17-latest
     spec:
       containers:
         - env:
@@ -1289,6 +1298,15 @@ spec:
               memory: 128Mi
             requests:
               memory: 32Mi
+  triggers:
+    - imageChangeParams:
+        automatic: true
+        containerNames:
+          - event-statistics
+        from:
+          kind: ImageStreamTag
+          name: event-statistics:native-java17-latest
+      type: ImageChange
 ---
 apiVersion: route.openshift.io/v1
 kind: Route
@@ -1310,11 +1328,11 @@ apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
   annotations:
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.openshift.io/vcs-ref: main
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:32 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:16 +0000
   labels:
     app.kubernetes.io/name: event-statistics
     app.kubernetes.io/part-of: event-stats
diff --git a/event-statistics/deploy/k8s/java11-knative.yml b/event-statistics/deploy/k8s/java11-knative.yml
index b2f5f6689..cf160ff0d 100644
--- a/event-statistics/deploy/k8s/java11-knative.yml
+++ b/event-statistics/deploy/k8s/java11-knative.yml
@@ -23,8 +23,8 @@ metadata:
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:21:14 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:39:11 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
@@ -34,8 +34,8 @@ metadata:
     app.openshift.io/runtime: quarkus
     application: event-stats
     system: quarkus-super-heroes
-    app.kubernetes.io/name: event-statistics
     app.kubernetes.io/version: java11-latest
+    app.kubernetes.io/name: event-statistics
     app.kubernetes.io/part-of: event-stats
   name: event-statistics
 spec:
@@ -45,8 +45,8 @@ spec:
         app.openshift.io/connects-to: "fights-kafka,apicurio"
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:21:14 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:39:11 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8085"
@@ -56,8 +56,8 @@ spec:
         app.openshift.io/runtime: quarkus
         application: event-stats
         system: quarkus-super-heroes
-        app.kubernetes.io/name: event-statistics
         app.kubernetes.io/version: java11-latest
+        app.kubernetes.io/name: event-statistics
         app.kubernetes.io/part-of: event-stats
     spec:
       containers:
diff --git a/event-statistics/deploy/k8s/java11-kubernetes.yml b/event-statistics/deploy/k8s/java11-kubernetes.yml
index 29b2439a7..1430a87f0 100644
--- a/event-statistics/deploy/k8s/java11-kubernetes.yml
+++ b/event-statistics/deploy/k8s/java11-kubernetes.yml
@@ -23,8 +23,8 @@ metadata:
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:18:41 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:36:37 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
@@ -149,8 +149,8 @@ metadata:
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:18:41 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:36:37 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
@@ -160,24 +160,24 @@ metadata:
     application: event-stats
     system: quarkus-super-heroes
     app.kubernetes.io/part-of: event-stats
-    app.kubernetes.io/version: java11-latest
     app.kubernetes.io/name: event-statistics
+    app.kubernetes.io/version: java11-latest
   name: event-statistics
 spec:
   replicas: 1
   selector:
     matchLabels:
       app.kubernetes.io/part-of: event-stats
-      app.kubernetes.io/version: java11-latest
       app.kubernetes.io/name: event-statistics
+      app.kubernetes.io/version: java11-latest
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: "fights-kafka,apicurio"
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:18:41 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:36:37 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8085"
@@ -187,8 +187,8 @@ spec:
         application: event-stats
         system: quarkus-super-heroes
         app.kubernetes.io/part-of: event-stats
-        app.kubernetes.io/version: java11-latest
         app.kubernetes.io/name: event-statistics
+        app.kubernetes.io/version: java11-latest
     spec:
       containers:
         - env:
diff --git a/event-statistics/deploy/k8s/java11-minikube.yml b/event-statistics/deploy/k8s/java11-minikube.yml
index ac12abdc1..2e346902b 100644
--- a/event-statistics/deploy/k8s/java11-minikube.yml
+++ b/event-statistics/deploy/k8s/java11-minikube.yml
@@ -20,15 +20,15 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    prometheus.io/port: "8085"
-    prometheus.io/scheme: http
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:32 +0000
+    app.openshift.io/connects-to: "fights-kafka,apicurio"
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:28 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
+    prometheus.io/port: "8085"
+    prometheus.io/scheme: http
   labels:
     app.kubernetes.io/name: event-statistics
     app.kubernetes.io/part-of: event-stats
@@ -147,15 +147,15 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
-    app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    prometheus.io/port: "8085"
-    prometheus.io/scheme: http
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:32 +0000
+    app.openshift.io/connects-to: "fights-kafka,apicurio"
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:28 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
+    prometheus.io/port: "8085"
+    prometheus.io/scheme: http
   labels:
     app.kubernetes.io/name: event-statistics
     app.kubernetes.io/part-of: event-stats
@@ -174,15 +174,15 @@ spec:
   template:
     metadata:
       annotations:
-        app.openshift.io/connects-to: "fights-kafka,apicurio"
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        prometheus.io/port: "8085"
-        prometheus.io/scheme: http
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:32 +0000
+        app.openshift.io/connects-to: "fights-kafka,apicurio"
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:28 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
+        prometheus.io/port: "8085"
+        prometheus.io/scheme: http
       labels:
         app.kubernetes.io/name: event-statistics
         app.kubernetes.io/part-of: event-stats
diff --git a/event-statistics/deploy/k8s/java11-openshift.yml b/event-statistics/deploy/k8s/java11-openshift.yml
index 117629aa1..299a3ec53 100644
--- a/event-statistics/deploy/k8s/java11-openshift.yml
+++ b/event-statistics/deploy/k8s/java11-openshift.yml
@@ -20,11 +20,11 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:20:23 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:20 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
@@ -70,20 +70,20 @@ apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:20:23 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:20 +0000
   labels:
     name: apicurio
     application: event-stats
     system: quarkus-super-heroes
     app: event-statistics
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/name: event-statistics
     app.kubernetes.io/version: java11-latest
     app.kubernetes.io/part-of: event-stats
+    app.kubernetes.io/name: event-statistics
   name: event-statistics
 spec:
   dockerImageRepository: quay.io/quarkus-super-heroes/event-statistics
@@ -213,11 +213,11 @@ apiVersion: apps.openshift.io/v1
 kind: DeploymentConfig
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:20:23 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:20 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
@@ -227,24 +227,24 @@ metadata:
     application: event-stats
     system: quarkus-super-heroes
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/name: event-statistics
     app.kubernetes.io/version: java11-latest
     app.kubernetes.io/part-of: event-stats
+    app.kubernetes.io/name: event-statistics
   name: event-statistics
 spec:
   replicas: 1
   selector:
-    app.kubernetes.io/name: event-statistics
     app.kubernetes.io/version: java11-latest
     app.kubernetes.io/part-of: event-stats
+    app.kubernetes.io/name: event-statistics
   template:
     metadata:
       annotations:
-        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
         app.openshift.io/connects-to: "fights-kafka,apicurio"
         app.openshift.io/vcs-ref: main
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:20:23 +0000
+        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:20 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8085"
@@ -254,9 +254,9 @@ spec:
         application: event-stats
         system: quarkus-super-heroes
         app.openshift.io/runtime: quarkus
-        app.kubernetes.io/name: event-statistics
         app.kubernetes.io/version: java11-latest
         app.kubernetes.io/part-of: event-stats
+        app.kubernetes.io/name: event-statistics
     spec:
       containers:
         - env:
@@ -299,15 +299,6 @@ spec:
               memory: 768Mi
             requests:
               memory: 256Mi
-  triggers:
-    - imageChangeParams:
-        automatic: true
-        containerNames:
-          - event-statistics
-        from:
-          kind: ImageStreamTag
-          name: event-statistics:java11-latest
-      type: ImageChange
 ---
 apiVersion: route.openshift.io/v1
 kind: Route
@@ -329,11 +320,11 @@ apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:20:23 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:20 +0000
   labels:
     app.kubernetes.io/name: event-statistics
     app.kubernetes.io/part-of: event-stats
diff --git a/event-statistics/deploy/k8s/java17-knative.yml b/event-statistics/deploy/k8s/java17-knative.yml
index 09419319d..e5500830f 100644
--- a/event-statistics/deploy/k8s/java17-knative.yml
+++ b/event-statistics/deploy/k8s/java17-knative.yml
@@ -23,8 +23,8 @@ metadata:
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:27:59 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:45:45 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
@@ -34,9 +34,9 @@ metadata:
     app.openshift.io/runtime: quarkus
     application: event-stats
     system: quarkus-super-heroes
-    app.kubernetes.io/version: java17-latest
-    app.kubernetes.io/name: event-statistics
     app.kubernetes.io/part-of: event-stats
+    app.kubernetes.io/name: event-statistics
+    app.kubernetes.io/version: java17-latest
   name: event-statistics
 spec:
   template:
@@ -45,8 +45,8 @@ spec:
         app.openshift.io/connects-to: "fights-kafka,apicurio"
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:27:59 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:45:45 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8085"
@@ -56,9 +56,9 @@ spec:
         app.openshift.io/runtime: quarkus
         application: event-stats
         system: quarkus-super-heroes
-        app.kubernetes.io/version: java17-latest
-        app.kubernetes.io/name: event-statistics
         app.kubernetes.io/part-of: event-stats
+        app.kubernetes.io/name: event-statistics
+        app.kubernetes.io/version: java17-latest
     spec:
       containers:
         - envFrom:
diff --git a/event-statistics/deploy/k8s/java17-kubernetes.yml b/event-statistics/deploy/k8s/java17-kubernetes.yml
index e8138ba17..af4751789 100644
--- a/event-statistics/deploy/k8s/java17-kubernetes.yml
+++ b/event-statistics/deploy/k8s/java17-kubernetes.yml
@@ -23,8 +23,8 @@ metadata:
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:28 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:21 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
@@ -149,8 +149,8 @@ metadata:
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:28 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:21 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
@@ -159,16 +159,16 @@ metadata:
     app: event-statistics
     application: event-stats
     system: quarkus-super-heroes
-    app.kubernetes.io/name: event-statistics
     app.kubernetes.io/version: java17-latest
+    app.kubernetes.io/name: event-statistics
     app.kubernetes.io/part-of: event-stats
   name: event-statistics
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: event-statistics
       app.kubernetes.io/version: java17-latest
+      app.kubernetes.io/name: event-statistics
       app.kubernetes.io/part-of: event-stats
   template:
     metadata:
@@ -176,8 +176,8 @@ spec:
         app.openshift.io/connects-to: "fights-kafka,apicurio"
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:28 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:21 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8085"
@@ -186,8 +186,8 @@ spec:
         app: event-statistics
         application: event-stats
         system: quarkus-super-heroes
-        app.kubernetes.io/name: event-statistics
         app.kubernetes.io/version: java17-latest
+        app.kubernetes.io/name: event-statistics
         app.kubernetes.io/part-of: event-stats
     spec:
       containers:
diff --git a/event-statistics/deploy/k8s/java17-minikube.yml b/event-statistics/deploy/k8s/java17-minikube.yml
index ef53b7fca..7a5939afd 100644
--- a/event-statistics/deploy/k8s/java17-minikube.yml
+++ b/event-statistics/deploy/k8s/java17-minikube.yml
@@ -20,15 +20,15 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
+    app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.openshift.io/connects-to: "fights-kafka,apicurio"
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:18 +0000
-    prometheus.io/scrape: "true"
-    prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
     prometheus.io/scheme: http
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:10 +0000
+    prometheus.io/scrape: "true"
+    prometheus.io/path: /q/metrics
   labels:
     app.kubernetes.io/name: event-statistics
     app.kubernetes.io/part-of: event-stats
@@ -147,15 +147,15 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
+    app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.openshift.io/connects-to: "fights-kafka,apicurio"
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:18 +0000
-    prometheus.io/scrape: "true"
-    prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
     prometheus.io/scheme: http
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:10 +0000
+    prometheus.io/scrape: "true"
+    prometheus.io/path: /q/metrics
   labels:
     app.kubernetes.io/name: event-statistics
     app.kubernetes.io/part-of: event-stats
@@ -174,15 +174,15 @@ spec:
   template:
     metadata:
       annotations:
+        app.openshift.io/connects-to: "fights-kafka,apicurio"
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.openshift.io/connects-to: "fights-kafka,apicurio"
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:18 +0000
-        prometheus.io/scrape: "true"
-        prometheus.io/path: /q/metrics
         prometheus.io/port: "8085"
         prometheus.io/scheme: http
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:10 +0000
+        prometheus.io/scrape: "true"
+        prometheus.io/path: /q/metrics
       labels:
         app.kubernetes.io/name: event-statistics
         app.kubernetes.io/part-of: event-stats
diff --git a/event-statistics/deploy/k8s/java17-openshift.yml b/event-statistics/deploy/k8s/java17-openshift.yml
index 7112bcbb8..423576dbd 100644
--- a/event-statistics/deploy/k8s/java17-openshift.yml
+++ b/event-statistics/deploy/k8s/java17-openshift.yml
@@ -23,8 +23,8 @@ metadata:
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:27:09 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:57 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
@@ -73,17 +73,17 @@ metadata:
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:27:09 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:57 +0000
   labels:
     name: apicurio
     application: event-stats
     system: quarkus-super-heroes
     app: event-statistics
     app.openshift.io/runtime: quarkus
+    app.kubernetes.io/part-of: event-stats
     app.kubernetes.io/version: java17-latest
     app.kubernetes.io/name: event-statistics
-    app.kubernetes.io/part-of: event-stats
   name: event-statistics
 spec:
   dockerImageRepository: quay.io/quarkus-super-heroes/event-statistics
@@ -216,8 +216,8 @@ metadata:
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:27:09 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:57 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
@@ -227,24 +227,24 @@ metadata:
     application: event-stats
     system: quarkus-super-heroes
     app.openshift.io/runtime: quarkus
+    app.kubernetes.io/part-of: event-stats
     app.kubernetes.io/version: java17-latest
     app.kubernetes.io/name: event-statistics
-    app.kubernetes.io/part-of: event-stats
   name: event-statistics
 spec:
   replicas: 1
   selector:
+    app.kubernetes.io/part-of: event-stats
     app.kubernetes.io/version: java17-latest
     app.kubernetes.io/name: event-statistics
-    app.kubernetes.io/part-of: event-stats
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: "fights-kafka,apicurio"
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:27:09 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:57 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8085"
@@ -254,9 +254,9 @@ spec:
         application: event-stats
         system: quarkus-super-heroes
         app.openshift.io/runtime: quarkus
+        app.kubernetes.io/part-of: event-stats
         app.kubernetes.io/version: java17-latest
         app.kubernetes.io/name: event-statistics
-        app.kubernetes.io/part-of: event-stats
     spec:
       containers:
         - env:
@@ -323,8 +323,8 @@ metadata:
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:27:09 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:57 +0000
   labels:
     app.kubernetes.io/name: event-statistics
     app.kubernetes.io/part-of: event-stats
diff --git a/event-statistics/deploy/k8s/native-java11-knative.yml b/event-statistics/deploy/k8s/native-java11-knative.yml
index 2003dc3bb..5827ef872 100644
--- a/event-statistics/deploy/k8s/native-java11-knative.yml
+++ b/event-statistics/deploy/k8s/native-java11-knative.yml
@@ -23,8 +23,8 @@ metadata:
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:24:36 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:42:30 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
@@ -45,8 +45,8 @@ spec:
         app.openshift.io/connects-to: "fights-kafka,apicurio"
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:24:36 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:42:30 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8085"
diff --git a/event-statistics/deploy/k8s/native-java11-kubernetes.yml b/event-statistics/deploy/k8s/native-java11-kubernetes.yml
index 02ae105b0..336fd019c 100644
--- a/event-statistics/deploy/k8s/native-java11-kubernetes.yml
+++ b/event-statistics/deploy/k8s/native-java11-kubernetes.yml
@@ -23,8 +23,8 @@ metadata:
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:22:05 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:40:00 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
@@ -149,8 +149,8 @@ metadata:
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:22:05 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:40:00 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
@@ -159,25 +159,25 @@ metadata:
     app: event-statistics
     application: event-stats
     system: quarkus-super-heroes
-    app.kubernetes.io/name: event-statistics
-    app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/part-of: event-stats
+    app.kubernetes.io/version: native-java11-latest
+    app.kubernetes.io/name: event-statistics
   name: event-statistics
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: event-statistics
-      app.kubernetes.io/version: native-java11-latest
       app.kubernetes.io/part-of: event-stats
+      app.kubernetes.io/version: native-java11-latest
+      app.kubernetes.io/name: event-statistics
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: "fights-kafka,apicurio"
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:22:05 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:40:00 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8085"
@@ -186,9 +186,9 @@ spec:
         app: event-statistics
         application: event-stats
         system: quarkus-super-heroes
-        app.kubernetes.io/name: event-statistics
-        app.kubernetes.io/version: native-java11-latest
         app.kubernetes.io/part-of: event-stats
+        app.kubernetes.io/version: native-java11-latest
+        app.kubernetes.io/name: event-statistics
     spec:
       containers:
         - env:
diff --git a/event-statistics/deploy/k8s/native-java11-minikube.yml b/event-statistics/deploy/k8s/native-java11-minikube.yml
index 9a24b293b..36f764e1a 100644
--- a/event-statistics/deploy/k8s/native-java11-minikube.yml
+++ b/event-statistics/deploy/k8s/native-java11-minikube.yml
@@ -23,12 +23,12 @@ metadata:
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    prometheus.io/port: "8085"
-    prometheus.io/scheme: http
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:22:56 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:40:51 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
+    prometheus.io/port: "8085"
+    prometheus.io/scheme: http
   labels:
     app.kubernetes.io/name: event-statistics
     app.kubernetes.io/part-of: event-stats
@@ -150,12 +150,12 @@ metadata:
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    prometheus.io/port: "8085"
-    prometheus.io/scheme: http
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:22:56 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:40:51 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
+    prometheus.io/port: "8085"
+    prometheus.io/scheme: http
   labels:
     app.kubernetes.io/name: event-statistics
     app.kubernetes.io/part-of: event-stats
@@ -177,12 +177,12 @@ spec:
         app.openshift.io/connects-to: "fights-kafka,apicurio"
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        prometheus.io/port: "8085"
-        prometheus.io/scheme: http
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:22:56 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:40:51 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
+        prometheus.io/port: "8085"
+        prometheus.io/scheme: http
       labels:
         app.kubernetes.io/name: event-statistics
         app.kubernetes.io/part-of: event-stats
diff --git a/event-statistics/deploy/k8s/native-java11-openshift.yml b/event-statistics/deploy/k8s/native-java11-openshift.yml
index 22c96595c..bbe08731b 100644
--- a/event-statistics/deploy/k8s/native-java11-openshift.yml
+++ b/event-statistics/deploy/k8s/native-java11-openshift.yml
@@ -20,11 +20,11 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:46 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:42 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
@@ -70,11 +70,11 @@ apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:46 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:42 +0000
   labels:
     name: apicurio
     application: event-stats
@@ -213,11 +213,11 @@ apiVersion: apps.openshift.io/v1
 kind: DeploymentConfig
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:46 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:42 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
@@ -240,11 +240,11 @@ spec:
   template:
     metadata:
       annotations:
-        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
         app.openshift.io/connects-to: "fights-kafka,apicurio"
         app.openshift.io/vcs-ref: main
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:46 +0000
+        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:42 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8085"
@@ -299,15 +299,6 @@ spec:
               memory: 128Mi
             requests:
               memory: 32Mi
-  triggers:
-    - imageChangeParams:
-        automatic: true
-        containerNames:
-          - event-statistics
-        from:
-          kind: ImageStreamTag
-          name: event-statistics:native-java11-latest
-      type: ImageChange
 ---
 apiVersion: route.openshift.io/v1
 kind: Route
@@ -329,11 +320,11 @@ apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:46 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:42 +0000
   labels:
     app.kubernetes.io/name: event-statistics
     app.kubernetes.io/part-of: event-stats
diff --git a/event-statistics/deploy/k8s/native-java17-knative.yml b/event-statistics/deploy/k8s/native-java17-knative.yml
index 3bbe44a99..d48d7c3a6 100644
--- a/event-statistics/deploy/k8s/native-java17-knative.yml
+++ b/event-statistics/deploy/k8s/native-java17-knative.yml
@@ -23,8 +23,8 @@ metadata:
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:31:22 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:49:06 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
@@ -34,9 +34,9 @@ metadata:
     app.openshift.io/runtime: quarkus
     application: event-stats
     system: quarkus-super-heroes
+    app.kubernetes.io/name: event-statistics
     app.kubernetes.io/version: native-java17-latest
     app.kubernetes.io/part-of: event-stats
-    app.kubernetes.io/name: event-statistics
   name: event-statistics
 spec:
   template:
@@ -45,8 +45,8 @@ spec:
         app.openshift.io/connects-to: "fights-kafka,apicurio"
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:31:22 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:49:06 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8085"
@@ -56,9 +56,9 @@ spec:
         app.openshift.io/runtime: quarkus
         application: event-stats
         system: quarkus-super-heroes
+        app.kubernetes.io/name: event-statistics
         app.kubernetes.io/version: native-java17-latest
         app.kubernetes.io/part-of: event-stats
-        app.kubernetes.io/name: event-statistics
     spec:
       containers:
         - envFrom:
diff --git a/event-statistics/deploy/k8s/native-java17-kubernetes.yml b/event-statistics/deploy/k8s/native-java17-kubernetes.yml
index df8cee666..5c53eb8c4 100644
--- a/event-statistics/deploy/k8s/native-java17-kubernetes.yml
+++ b/event-statistics/deploy/k8s/native-java17-kubernetes.yml
@@ -23,8 +23,8 @@ metadata:
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:28:50 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:34 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
@@ -149,8 +149,8 @@ metadata:
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:28:50 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:34 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
@@ -176,8 +176,8 @@ spec:
         app.openshift.io/connects-to: "fights-kafka,apicurio"
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:28:50 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:34 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8085"
diff --git a/event-statistics/deploy/k8s/native-java17-minikube.yml b/event-statistics/deploy/k8s/native-java17-minikube.yml
index 7e60cb890..1b6c25fb8 100644
--- a/event-statistics/deploy/k8s/native-java17-minikube.yml
+++ b/event-statistics/deploy/k8s/native-java17-minikube.yml
@@ -23,12 +23,12 @@ metadata:
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:41 +0000
-    prometheus.io/scrape: "true"
-    prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
     prometheus.io/scheme: http
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:25 +0000
+    prometheus.io/scrape: "true"
+    prometheus.io/path: /q/metrics
   labels:
     app.kubernetes.io/name: event-statistics
     app.kubernetes.io/part-of: event-stats
@@ -150,12 +150,12 @@ metadata:
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:41 +0000
-    prometheus.io/scrape: "true"
-    prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
     prometheus.io/scheme: http
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:25 +0000
+    prometheus.io/scrape: "true"
+    prometheus.io/path: /q/metrics
   labels:
     app.kubernetes.io/name: event-statistics
     app.kubernetes.io/part-of: event-stats
@@ -177,12 +177,12 @@ spec:
         app.openshift.io/connects-to: "fights-kafka,apicurio"
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:41 +0000
-        prometheus.io/scrape: "true"
-        prometheus.io/path: /q/metrics
         prometheus.io/port: "8085"
         prometheus.io/scheme: http
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:25 +0000
+        prometheus.io/scrape: "true"
+        prometheus.io/path: /q/metrics
       labels:
         app.kubernetes.io/name: event-statistics
         app.kubernetes.io/part-of: event-stats
diff --git a/event-statistics/deploy/k8s/native-java17-openshift.yml b/event-statistics/deploy/k8s/native-java17-openshift.yml
index e9022557c..d450ba03a 100644
--- a/event-statistics/deploy/k8s/native-java17-openshift.yml
+++ b/event-statistics/deploy/k8s/native-java17-openshift.yml
@@ -20,11 +20,11 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.openshift.io/vcs-ref: main
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:32 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:16 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
@@ -70,11 +70,11 @@ apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
   annotations:
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.openshift.io/vcs-ref: main
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:32 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:16 +0000
   labels:
     name: apicurio
     application: event-stats
@@ -82,8 +82,8 @@ metadata:
     app: event-statistics
     app.openshift.io/runtime: quarkus
     app.kubernetes.io/name: event-statistics
-    app.kubernetes.io/version: native-java17-latest
     app.kubernetes.io/part-of: event-stats
+    app.kubernetes.io/version: native-java17-latest
   name: event-statistics
 spec:
   dockerImageRepository: quay.io/quarkus-super-heroes/event-statistics
@@ -213,11 +213,11 @@ apiVersion: apps.openshift.io/v1
 kind: DeploymentConfig
 metadata:
   annotations:
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.openshift.io/vcs-ref: main
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:32 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:16 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8085"
@@ -228,23 +228,23 @@ metadata:
     system: quarkus-super-heroes
     app.openshift.io/runtime: quarkus
     app.kubernetes.io/name: event-statistics
-    app.kubernetes.io/version: native-java17-latest
     app.kubernetes.io/part-of: event-stats
+    app.kubernetes.io/version: native-java17-latest
   name: event-statistics
 spec:
   replicas: 1
   selector:
     app.kubernetes.io/name: event-statistics
-    app.kubernetes.io/version: native-java17-latest
     app.kubernetes.io/part-of: event-stats
+    app.kubernetes.io/version: native-java17-latest
   template:
     metadata:
       annotations:
+        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
         app.openshift.io/connects-to: "fights-kafka,apicurio"
         app.openshift.io/vcs-ref: main
-        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:32 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:16 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8085"
@@ -255,8 +255,8 @@ spec:
         system: quarkus-super-heroes
         app.openshift.io/runtime: quarkus
         app.kubernetes.io/name: event-statistics
-        app.kubernetes.io/version: native-java17-latest
         app.kubernetes.io/part-of: event-stats
+        app.kubernetes.io/version: native-java17-latest
     spec:
       containers:
         - env:
@@ -299,6 +299,15 @@ spec:
               memory: 128Mi
             requests:
               memory: 32Mi
+  triggers:
+    - imageChangeParams:
+        automatic: true
+        containerNames:
+          - event-statistics
+        from:
+          kind: ImageStreamTag
+          name: event-statistics:native-java17-latest
+      type: ImageChange
 ---
 apiVersion: route.openshift.io/v1
 kind: Route
@@ -320,11 +329,11 @@ apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
   annotations:
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-kafka,apicurio"
     app.openshift.io/vcs-ref: main
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:32 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:16 +0000
   labels:
     app.kubernetes.io/name: event-statistics
     app.kubernetes.io/part-of: event-stats
diff --git a/rest-fights/deploy/k8s/java11-knative-all-downstream.yml b/rest-fights/deploy/k8s/java11-knative-all-downstream.yml
index 1c942695d..30395e4a5 100644
--- a/rest-fights/deploy/k8s/java11-knative-all-downstream.yml
+++ b/rest-fights/deploy/k8s/java11-knative-all-downstream.yml
@@ -20,8 +20,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:20:34 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:32 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -31,8 +31,8 @@ metadata:
     app.openshift.io/runtime: quarkus
     application: villains-service
     system: quarkus-super-heroes
-    app.kubernetes.io/version: java11-latest
     app.kubernetes.io/part-of: villains-service
+    app.kubernetes.io/version: java11-latest
     app.kubernetes.io/name: rest-villains
   name: rest-villains
 spec:
@@ -42,8 +42,8 @@ spec:
         app.openshift.io/connects-to: villains-db
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:20:34 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:32 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -53,8 +53,8 @@ spec:
         app.openshift.io/runtime: quarkus
         application: villains-service
         system: quarkus-super-heroes
-        app.kubernetes.io/version: java11-latest
         app.kubernetes.io/part-of: villains-service
+        app.kubernetes.io/version: java11-latest
         app.kubernetes.io/name: rest-villains
     spec:
       containers:
@@ -195,8 +195,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:20:47 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:45 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -217,8 +217,8 @@ spec:
         app.openshift.io/connects-to: heroes-db
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:20:47 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:45 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
@@ -345,8 +345,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:21:01 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:58 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -356,9 +356,9 @@ metadata:
     app.openshift.io/runtime: quarkus
     application: fights-service
     system: quarkus-super-heroes
+    app.kubernetes.io/version: java11-latest
     app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/name: rest-fights
-    app.kubernetes.io/version: java11-latest
   name: rest-fights
 spec:
   template:
@@ -367,8 +367,8 @@ spec:
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:21:01 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:58 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
@@ -378,9 +378,9 @@ spec:
         app.openshift.io/runtime: quarkus
         application: fights-service
         system: quarkus-super-heroes
+        app.kubernetes.io/version: java11-latest
         app.kubernetes.io/part-of: fights-service
         app.kubernetes.io/name: rest-fights
-        app.kubernetes.io/version: java11-latest
     spec:
       containers:
         - envFrom:
diff --git a/rest-fights/deploy/k8s/java11-knative.yml b/rest-fights/deploy/k8s/java11-knative.yml
index 4b6087da6..36ad24465 100644
--- a/rest-fights/deploy/k8s/java11-knative.yml
+++ b/rest-fights/deploy/k8s/java11-knative.yml
@@ -71,8 +71,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:21:01 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:58 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -82,9 +82,9 @@ metadata:
     app.openshift.io/runtime: quarkus
     application: fights-service
     system: quarkus-super-heroes
+    app.kubernetes.io/version: java11-latest
     app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/name: rest-fights
-    app.kubernetes.io/version: java11-latest
   name: rest-fights
 spec:
   template:
@@ -93,8 +93,8 @@ spec:
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:21:01 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:58 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
@@ -104,9 +104,9 @@ spec:
         app.openshift.io/runtime: quarkus
         application: fights-service
         system: quarkus-super-heroes
+        app.kubernetes.io/version: java11-latest
         app.kubernetes.io/part-of: fights-service
         app.kubernetes.io/name: rest-fights
-        app.kubernetes.io/version: java11-latest
     spec:
       containers:
         - envFrom:
diff --git a/rest-fights/deploy/k8s/java11-kubernetes-all-downstream.yml b/rest-fights/deploy/k8s/java11-kubernetes-all-downstream.yml
index 1e1239176..578a42ff2 100644
--- a/rest-fights/deploy/k8s/java11-kubernetes-all-downstream.yml
+++ b/rest-fights/deploy/k8s/java11-kubernetes-all-downstream.yml
@@ -20,8 +20,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:17:56 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:35:51 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -96,8 +96,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:17:56 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:35:51 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -106,25 +106,25 @@ metadata:
     app: rest-villains
     application: villains-service
     system: quarkus-super-heroes
-    app.kubernetes.io/name: rest-villains
-    app.kubernetes.io/part-of: villains-service
     app.kubernetes.io/version: java11-latest
+    app.kubernetes.io/part-of: villains-service
+    app.kubernetes.io/name: rest-villains
   name: rest-villains
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: rest-villains
-      app.kubernetes.io/part-of: villains-service
       app.kubernetes.io/version: java11-latest
+      app.kubernetes.io/part-of: villains-service
+      app.kubernetes.io/name: rest-villains
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: villains-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:17:56 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:35:51 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -133,9 +133,9 @@ spec:
         app: rest-villains
         application: villains-service
         system: quarkus-super-heroes
-        app.kubernetes.io/name: rest-villains
-        app.kubernetes.io/part-of: villains-service
         app.kubernetes.io/version: java11-latest
+        app.kubernetes.io/part-of: villains-service
+        app.kubernetes.io/name: rest-villains
     spec:
       containers:
         - env:
@@ -263,8 +263,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:18:08 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:36:03 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -369,8 +369,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:18:08 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:36:03 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -380,24 +380,24 @@ metadata:
     application: heroes-service
     system: quarkus-super-heroes
     app.kubernetes.io/version: java11-latest
-    app.kubernetes.io/name: rest-heroes
     app.kubernetes.io/part-of: heroes-service
+    app.kubernetes.io/name: rest-heroes
   name: rest-heroes
 spec:
   replicas: 1
   selector:
     matchLabels:
       app.kubernetes.io/version: java11-latest
-      app.kubernetes.io/name: rest-heroes
       app.kubernetes.io/part-of: heroes-service
+      app.kubernetes.io/name: rest-heroes
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: heroes-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:18:08 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:36:03 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
@@ -407,8 +407,8 @@ spec:
         application: heroes-service
         system: quarkus-super-heroes
         app.kubernetes.io/version: java11-latest
-        app.kubernetes.io/name: rest-heroes
         app.kubernetes.io/part-of: heroes-service
+        app.kubernetes.io/name: rest-heroes
     spec:
       containers:
         - env:
@@ -524,8 +524,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:18:28 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:36:24 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -743,8 +743,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:18:28 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:36:24 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -754,24 +754,24 @@ metadata:
     application: fights-service
     system: quarkus-super-heroes
     app.kubernetes.io/name: rest-fights
-    app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/version: java11-latest
+    app.kubernetes.io/part-of: fights-service
   name: rest-fights
 spec:
   replicas: 1
   selector:
     matchLabels:
       app.kubernetes.io/name: rest-fights
-      app.kubernetes.io/part-of: fights-service
       app.kubernetes.io/version: java11-latest
+      app.kubernetes.io/part-of: fights-service
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:18:28 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:36:24 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
@@ -781,8 +781,8 @@ spec:
         application: fights-service
         system: quarkus-super-heroes
         app.kubernetes.io/name: rest-fights
-        app.kubernetes.io/part-of: fights-service
         app.kubernetes.io/version: java11-latest
+        app.kubernetes.io/part-of: fights-service
     spec:
       containers:
         - env:
diff --git a/rest-fights/deploy/k8s/java11-kubernetes.yml b/rest-fights/deploy/k8s/java11-kubernetes.yml
index 8d972bd4c..469a4e35e 100644
--- a/rest-fights/deploy/k8s/java11-kubernetes.yml
+++ b/rest-fights/deploy/k8s/java11-kubernetes.yml
@@ -71,8 +71,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:18:28 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:36:24 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -290,8 +290,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:18:28 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:36:24 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -301,24 +301,24 @@ metadata:
     application: fights-service
     system: quarkus-super-heroes
     app.kubernetes.io/name: rest-fights
-    app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/version: java11-latest
+    app.kubernetes.io/part-of: fights-service
   name: rest-fights
 spec:
   replicas: 1
   selector:
     matchLabels:
       app.kubernetes.io/name: rest-fights
-      app.kubernetes.io/part-of: fights-service
       app.kubernetes.io/version: java11-latest
+      app.kubernetes.io/part-of: fights-service
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:18:28 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:36:24 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
@@ -328,8 +328,8 @@ spec:
         application: fights-service
         system: quarkus-super-heroes
         app.kubernetes.io/name: rest-fights
-        app.kubernetes.io/part-of: fights-service
         app.kubernetes.io/version: java11-latest
+        app.kubernetes.io/part-of: fights-service
     spec:
       containers:
         - env:
diff --git a/rest-fights/deploy/k8s/java11-minikube-all-downstream.yml b/rest-fights/deploy/k8s/java11-minikube-all-downstream.yml
index d15fe0725..077b53933 100644
--- a/rest-fights/deploy/k8s/java11-minikube-all-downstream.yml
+++ b/rest-fights/deploy/k8s/java11-minikube-all-downstream.yml
@@ -20,8 +20,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:18:53 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:36:49 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -97,8 +97,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:18:53 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:36:49 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -124,8 +124,8 @@ spec:
         app.openshift.io/connects-to: villains-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:18:53 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:36:49 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -261,15 +261,15 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
+    app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.openshift.io/connects-to: heroes-db
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:06 +0000
-    prometheus.io/scrape: "true"
-    prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
     prometheus.io/scheme: http
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:01 +0000
+    prometheus.io/scrape: "true"
+    prometheus.io/path: /q/metrics
   labels:
     app.kubernetes.io/name: rest-heroes
     app.kubernetes.io/part-of: heroes-service
@@ -368,15 +368,15 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
+    app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.openshift.io/connects-to: heroes-db
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:06 +0000
-    prometheus.io/scrape: "true"
-    prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
     prometheus.io/scheme: http
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:01 +0000
+    prometheus.io/scrape: "true"
+    prometheus.io/path: /q/metrics
   labels:
     app.kubernetes.io/name: rest-heroes
     app.kubernetes.io/part-of: heroes-service
@@ -395,15 +395,15 @@ spec:
   template:
     metadata:
       annotations:
+        app.openshift.io/connects-to: heroes-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.openshift.io/connects-to: heroes-db
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:06 +0000
-        prometheus.io/scrape: "true"
-        prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
         prometheus.io/scheme: http
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:01 +0000
+        prometheus.io/scrape: "true"
+        prometheus.io/path: /q/metrics
       labels:
         app.kubernetes.io/name: rest-heroes
         app.kubernetes.io/part-of: heroes-service
@@ -526,12 +526,12 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    prometheus.io/port: "8082"
-    prometheus.io/scheme: http
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:19 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:15 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
+    prometheus.io/port: "8082"
+    prometheus.io/scheme: http
   labels:
     app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
@@ -746,12 +746,12 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    prometheus.io/port: "8082"
-    prometheus.io/scheme: http
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:19 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:15 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
+    prometheus.io/port: "8082"
+    prometheus.io/scheme: http
   labels:
     app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
@@ -773,12 +773,12 @@ spec:
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        prometheus.io/port: "8082"
-        prometheus.io/scheme: http
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:19 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:15 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
+        prometheus.io/port: "8082"
+        prometheus.io/scheme: http
       labels:
         app.kubernetes.io/name: rest-fights
         app.kubernetes.io/part-of: fights-service
diff --git a/rest-fights/deploy/k8s/java11-minikube.yml b/rest-fights/deploy/k8s/java11-minikube.yml
index 4e2978e4e..f072d9791 100644
--- a/rest-fights/deploy/k8s/java11-minikube.yml
+++ b/rest-fights/deploy/k8s/java11-minikube.yml
@@ -71,12 +71,12 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    prometheus.io/port: "8082"
-    prometheus.io/scheme: http
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:19 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:15 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
+    prometheus.io/port: "8082"
+    prometheus.io/scheme: http
   labels:
     app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
@@ -291,12 +291,12 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    prometheus.io/port: "8082"
-    prometheus.io/scheme: http
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:19 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:15 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
+    prometheus.io/port: "8082"
+    prometheus.io/scheme: http
   labels:
     app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
@@ -318,12 +318,12 @@ spec:
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        prometheus.io/port: "8082"
-        prometheus.io/scheme: http
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:19 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:15 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
+        prometheus.io/port: "8082"
+        prometheus.io/scheme: http
       labels:
         app.kubernetes.io/name: rest-fights
         app.kubernetes.io/part-of: fights-service
diff --git a/rest-fights/deploy/k8s/java11-openshift-all-downstream.yml b/rest-fights/deploy/k8s/java11-openshift-all-downstream.yml
index 491123438..6de1a06c3 100644
--- a/rest-fights/deploy/k8s/java11-openshift-all-downstream.yml
+++ b/rest-fights/deploy/k8s/java11-openshift-all-downstream.yml
@@ -20,8 +20,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:44 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:40 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -70,17 +70,17 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:44 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:40 +0000
   labels:
     name: villains-db
     application: villains-service
     system: quarkus-super-heroes
     app: rest-villains
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/version: java11-latest
     app.kubernetes.io/part-of: villains-service
     app.kubernetes.io/name: rest-villains
+    app.kubernetes.io/version: java11-latest
   name: rest-villains
 spec:
   dockerImageRepository: quay.io/quarkus-super-heroes/rest-villains
@@ -165,8 +165,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:44 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:40 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -176,24 +176,24 @@ metadata:
     application: villains-service
     system: quarkus-super-heroes
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/version: java11-latest
     app.kubernetes.io/part-of: villains-service
     app.kubernetes.io/name: rest-villains
+    app.kubernetes.io/version: java11-latest
   name: rest-villains
 spec:
   replicas: 1
   selector:
-    app.kubernetes.io/version: java11-latest
     app.kubernetes.io/part-of: villains-service
     app.kubernetes.io/name: rest-villains
+    app.kubernetes.io/version: java11-latest
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: villains-db
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:44 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:40 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -203,9 +203,9 @@ spec:
         application: villains-service
         system: quarkus-super-heroes
         app.openshift.io/runtime: quarkus
-        app.kubernetes.io/version: java11-latest
         app.kubernetes.io/part-of: villains-service
         app.kubernetes.io/name: rest-villains
+        app.kubernetes.io/version: java11-latest
     spec:
       containers:
         - env:
@@ -256,8 +256,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:44 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:40 +0000
   labels:
     app.kubernetes.io/name: rest-villains
     app.kubernetes.io/part-of: villains-service
@@ -309,11 +309,11 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:56 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:53 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -342,11 +342,11 @@ apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:56 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:53 +0000
   labels:
     name: heroes-db
     application: heroes-service
@@ -438,11 +438,11 @@ apiVersion: apps.openshift.io/v1
 kind: DeploymentConfig
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:56 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:53 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -465,11 +465,11 @@ spec:
   template:
     metadata:
       annotations:
-        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
         app.openshift.io/connects-to: heroes-db
         app.openshift.io/vcs-ref: main
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:56 +0000
+        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:53 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
@@ -524,25 +524,16 @@ spec:
               memory: 768Mi
             requests:
               memory: 256Mi
-  triggers:
-    - imageChangeParams:
-        automatic: true
-        containerNames:
-          - rest-heroes
-        from:
-          kind: ImageStreamTag
-          name: rest-heroes:java11-latest
-      type: ImageChange
 ---
 apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:56 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:53 +0000
   labels:
     app.kubernetes.io/name: rest-heroes
     app.kubernetes.io/part-of: heroes-service
@@ -628,11 +619,11 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:20:10 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:07 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -661,19 +652,19 @@ apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:20:10 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:07 +0000
   labels:
     name: apicurio
     application: fights-service
     system: quarkus-super-heroes
     app: rest-fights
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/name: rest-fights
+    app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/version: java11-latest
   name: rest-fights
 spec:
@@ -870,11 +861,11 @@ apiVersion: apps.openshift.io/v1
 kind: DeploymentConfig
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:20:10 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:07 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -884,24 +875,24 @@ metadata:
     application: fights-service
     system: quarkus-super-heroes
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/name: rest-fights
+    app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/version: java11-latest
   name: rest-fights
 spec:
   replicas: 1
   selector:
-    app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/name: rest-fights
+    app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/version: java11-latest
   template:
     metadata:
       annotations:
-        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.openshift.io/vcs-ref: main
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:20:10 +0000
+        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:07 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
@@ -911,8 +902,8 @@ spec:
         application: fights-service
         system: quarkus-super-heroes
         app.openshift.io/runtime: quarkus
-        app.kubernetes.io/part-of: fights-service
         app.kubernetes.io/name: rest-fights
+        app.kubernetes.io/part-of: fights-service
         app.kubernetes.io/version: java11-latest
     spec:
       containers:
@@ -956,15 +947,6 @@ spec:
               memory: 768Mi
             requests:
               memory: 256Mi
-  triggers:
-    - imageChangeParams:
-        automatic: true
-        containerNames:
-          - rest-fights
-        from:
-          kind: ImageStreamTag
-          name: rest-fights:java11-latest
-      type: ImageChange
 ---
 apiVersion: route.openshift.io/v1
 kind: Route
@@ -986,11 +968,11 @@ apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:20:10 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:07 +0000
   labels:
     app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
diff --git a/rest-fights/deploy/k8s/java11-openshift.yml b/rest-fights/deploy/k8s/java11-openshift.yml
index 53e4d7f93..bccb650a1 100644
--- a/rest-fights/deploy/k8s/java11-openshift.yml
+++ b/rest-fights/deploy/k8s/java11-openshift.yml
@@ -68,11 +68,11 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:20:10 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:07 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -101,19 +101,19 @@ apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:20:10 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:07 +0000
   labels:
     name: apicurio
     application: fights-service
     system: quarkus-super-heroes
     app: rest-fights
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/name: rest-fights
+    app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/version: java11-latest
   name: rest-fights
 spec:
@@ -310,11 +310,11 @@ apiVersion: apps.openshift.io/v1
 kind: DeploymentConfig
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:20:10 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:07 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -324,24 +324,24 @@ metadata:
     application: fights-service
     system: quarkus-super-heroes
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/name: rest-fights
+    app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/version: java11-latest
   name: rest-fights
 spec:
   replicas: 1
   selector:
-    app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/name: rest-fights
+    app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/version: java11-latest
   template:
     metadata:
       annotations:
-        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.openshift.io/vcs-ref: main
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:20:10 +0000
+        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:07 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
@@ -351,8 +351,8 @@ spec:
         application: fights-service
         system: quarkus-super-heroes
         app.openshift.io/runtime: quarkus
-        app.kubernetes.io/part-of: fights-service
         app.kubernetes.io/name: rest-fights
+        app.kubernetes.io/part-of: fights-service
         app.kubernetes.io/version: java11-latest
     spec:
       containers:
@@ -396,15 +396,6 @@ spec:
               memory: 768Mi
             requests:
               memory: 256Mi
-  triggers:
-    - imageChangeParams:
-        automatic: true
-        containerNames:
-          - rest-fights
-        from:
-          kind: ImageStreamTag
-          name: rest-fights:java11-latest
-      type: ImageChange
 ---
 apiVersion: route.openshift.io/v1
 kind: Route
@@ -426,11 +417,11 @@ apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:20:10 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:07 +0000
   labels:
     app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
diff --git a/rest-fights/deploy/k8s/java17-knative-all-downstream.yml b/rest-fights/deploy/k8s/java17-knative-all-downstream.yml
index 62a153b91..ec66e918a 100644
--- a/rest-fights/deploy/k8s/java17-knative-all-downstream.yml
+++ b/rest-fights/deploy/k8s/java17-knative-all-downstream.yml
@@ -20,8 +20,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:27:21 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:45:08 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -31,9 +31,9 @@ metadata:
     app.openshift.io/runtime: quarkus
     application: villains-service
     system: quarkus-super-heroes
-    app.kubernetes.io/version: java17-latest
-    app.kubernetes.io/name: rest-villains
     app.kubernetes.io/part-of: villains-service
+    app.kubernetes.io/name: rest-villains
+    app.kubernetes.io/version: java17-latest
   name: rest-villains
 spec:
   template:
@@ -42,8 +42,8 @@ spec:
         app.openshift.io/connects-to: villains-db
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:27:21 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:45:08 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -53,9 +53,9 @@ spec:
         app.openshift.io/runtime: quarkus
         application: villains-service
         system: quarkus-super-heroes
-        app.kubernetes.io/version: java17-latest
-        app.kubernetes.io/name: rest-villains
         app.kubernetes.io/part-of: villains-service
+        app.kubernetes.io/name: rest-villains
+        app.kubernetes.io/version: java17-latest
     spec:
       containers:
         - envFrom:
@@ -195,8 +195,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:27:33 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:45:20 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -206,9 +206,9 @@ metadata:
     app.openshift.io/runtime: quarkus
     application: heroes-service
     system: quarkus-super-heroes
-    app.kubernetes.io/part-of: heroes-service
-    app.kubernetes.io/version: java17-latest
     app.kubernetes.io/name: rest-heroes
+    app.kubernetes.io/version: java17-latest
+    app.kubernetes.io/part-of: heroes-service
   name: rest-heroes
 spec:
   template:
@@ -217,8 +217,8 @@ spec:
         app.openshift.io/connects-to: heroes-db
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:27:33 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:45:20 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
@@ -228,9 +228,9 @@ spec:
         app.openshift.io/runtime: quarkus
         application: heroes-service
         system: quarkus-super-heroes
-        app.kubernetes.io/part-of: heroes-service
-        app.kubernetes.io/version: java17-latest
         app.kubernetes.io/name: rest-heroes
+        app.kubernetes.io/version: java17-latest
+        app.kubernetes.io/part-of: heroes-service
     spec:
       containers:
         - envFrom:
@@ -345,8 +345,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:27:47 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:45:33 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -356,9 +356,9 @@ metadata:
     app.openshift.io/runtime: quarkus
     application: fights-service
     system: quarkus-super-heroes
-    app.kubernetes.io/version: java17-latest
-    app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
+    app.kubernetes.io/name: rest-fights
+    app.kubernetes.io/version: java17-latest
   name: rest-fights
 spec:
   template:
@@ -367,8 +367,8 @@ spec:
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:27:47 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:45:33 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
@@ -378,9 +378,9 @@ spec:
         app.openshift.io/runtime: quarkus
         application: fights-service
         system: quarkus-super-heroes
-        app.kubernetes.io/version: java17-latest
-        app.kubernetes.io/name: rest-fights
         app.kubernetes.io/part-of: fights-service
+        app.kubernetes.io/name: rest-fights
+        app.kubernetes.io/version: java17-latest
     spec:
       containers:
         - envFrom:
diff --git a/rest-fights/deploy/k8s/java17-knative.yml b/rest-fights/deploy/k8s/java17-knative.yml
index 973cafe24..74609aa1c 100644
--- a/rest-fights/deploy/k8s/java17-knative.yml
+++ b/rest-fights/deploy/k8s/java17-knative.yml
@@ -71,8 +71,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:27:47 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:45:33 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -82,9 +82,9 @@ metadata:
     app.openshift.io/runtime: quarkus
     application: fights-service
     system: quarkus-super-heroes
-    app.kubernetes.io/version: java17-latest
-    app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
+    app.kubernetes.io/name: rest-fights
+    app.kubernetes.io/version: java17-latest
   name: rest-fights
 spec:
   template:
@@ -93,8 +93,8 @@ spec:
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:27:47 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:45:33 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
@@ -104,9 +104,9 @@ spec:
         app.openshift.io/runtime: quarkus
         application: fights-service
         system: quarkus-super-heroes
-        app.kubernetes.io/version: java17-latest
-        app.kubernetes.io/name: rest-fights
         app.kubernetes.io/part-of: fights-service
+        app.kubernetes.io/name: rest-fights
+        app.kubernetes.io/version: java17-latest
     spec:
       containers:
         - envFrom:
diff --git a/rest-fights/deploy/k8s/java17-kubernetes-all-downstream.yml b/rest-fights/deploy/k8s/java17-kubernetes-all-downstream.yml
index e69be6bd0..dad6272b9 100644
--- a/rest-fights/deploy/k8s/java17-kubernetes-all-downstream.yml
+++ b/rest-fights/deploy/k8s/java17-kubernetes-all-downstream.yml
@@ -20,8 +20,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:24:48 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:42:42 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -96,8 +96,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:24:48 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:42:42 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -107,24 +107,24 @@ metadata:
     application: villains-service
     system: quarkus-super-heroes
     app.kubernetes.io/name: rest-villains
-    app.kubernetes.io/part-of: villains-service
     app.kubernetes.io/version: java17-latest
+    app.kubernetes.io/part-of: villains-service
   name: rest-villains
 spec:
   replicas: 1
   selector:
     matchLabels:
       app.kubernetes.io/name: rest-villains
-      app.kubernetes.io/part-of: villains-service
       app.kubernetes.io/version: java17-latest
+      app.kubernetes.io/part-of: villains-service
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: villains-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:24:48 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:42:42 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -134,8 +134,8 @@ spec:
         application: villains-service
         system: quarkus-super-heroes
         app.kubernetes.io/name: rest-villains
-        app.kubernetes.io/part-of: villains-service
         app.kubernetes.io/version: java17-latest
+        app.kubernetes.io/part-of: villains-service
     spec:
       containers:
         - env:
@@ -263,8 +263,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:01 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:42:54 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -369,8 +369,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:01 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:42:54 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -379,25 +379,25 @@ metadata:
     app: rest-heroes
     application: heroes-service
     system: quarkus-super-heroes
-    app.kubernetes.io/name: rest-heroes
     app.kubernetes.io/version: java17-latest
     app.kubernetes.io/part-of: heroes-service
+    app.kubernetes.io/name: rest-heroes
   name: rest-heroes
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: rest-heroes
       app.kubernetes.io/version: java17-latest
       app.kubernetes.io/part-of: heroes-service
+      app.kubernetes.io/name: rest-heroes
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: heroes-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:01 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:42:54 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
@@ -406,9 +406,9 @@ spec:
         app: rest-heroes
         application: heroes-service
         system: quarkus-super-heroes
-        app.kubernetes.io/name: rest-heroes
         app.kubernetes.io/version: java17-latest
         app.kubernetes.io/part-of: heroes-service
+        app.kubernetes.io/name: rest-heroes
     spec:
       containers:
         - env:
@@ -524,8 +524,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:15 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:08 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -743,8 +743,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:15 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:08 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -753,25 +753,25 @@ metadata:
     app: rest-fights
     application: fights-service
     system: quarkus-super-heroes
+    app.kubernetes.io/version: java17-latest
     app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/name: rest-fights
-    app.kubernetes.io/version: java17-latest
   name: rest-fights
 spec:
   replicas: 1
   selector:
     matchLabels:
+      app.kubernetes.io/version: java17-latest
       app.kubernetes.io/part-of: fights-service
       app.kubernetes.io/name: rest-fights
-      app.kubernetes.io/version: java17-latest
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:15 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:08 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
@@ -780,9 +780,9 @@ spec:
         app: rest-fights
         application: fights-service
         system: quarkus-super-heroes
+        app.kubernetes.io/version: java17-latest
         app.kubernetes.io/part-of: fights-service
         app.kubernetes.io/name: rest-fights
-        app.kubernetes.io/version: java17-latest
     spec:
       containers:
         - env:
diff --git a/rest-fights/deploy/k8s/java17-kubernetes.yml b/rest-fights/deploy/k8s/java17-kubernetes.yml
index dc7cf42ad..d1eb7c49e 100644
--- a/rest-fights/deploy/k8s/java17-kubernetes.yml
+++ b/rest-fights/deploy/k8s/java17-kubernetes.yml
@@ -71,8 +71,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:15 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:08 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -290,8 +290,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:15 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:08 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -300,25 +300,25 @@ metadata:
     app: rest-fights
     application: fights-service
     system: quarkus-super-heroes
+    app.kubernetes.io/version: java17-latest
     app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/name: rest-fights
-    app.kubernetes.io/version: java17-latest
   name: rest-fights
 spec:
   replicas: 1
   selector:
     matchLabels:
+      app.kubernetes.io/version: java17-latest
       app.kubernetes.io/part-of: fights-service
       app.kubernetes.io/name: rest-fights
-      app.kubernetes.io/version: java17-latest
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:15 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:08 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
@@ -327,9 +327,9 @@ spec:
         app: rest-fights
         application: fights-service
         system: quarkus-super-heroes
+        app.kubernetes.io/version: java17-latest
         app.kubernetes.io/part-of: fights-service
         app.kubernetes.io/name: rest-fights
-        app.kubernetes.io/version: java17-latest
     spec:
       containers:
         - env:
diff --git a/rest-fights/deploy/k8s/java17-minikube-all-downstream.yml b/rest-fights/deploy/k8s/java17-minikube-all-downstream.yml
index c8cd061a5..5c6ff8321 100644
--- a/rest-fights/deploy/k8s/java17-minikube-all-downstream.yml
+++ b/rest-fights/deploy/k8s/java17-minikube-all-downstream.yml
@@ -20,12 +20,12 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:39 +0000
-    prometheus.io/scrape: "true"
-    prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
     prometheus.io/scheme: http
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:33 +0000
+    prometheus.io/scrape: "true"
+    prometheus.io/path: /q/metrics
   labels:
     app.kubernetes.io/name: rest-villains
     app.kubernetes.io/part-of: villains-service
@@ -97,12 +97,12 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:39 +0000
-    prometheus.io/scrape: "true"
-    prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
     prometheus.io/scheme: http
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:33 +0000
+    prometheus.io/scrape: "true"
+    prometheus.io/path: /q/metrics
   labels:
     app.kubernetes.io/name: rest-villains
     app.kubernetes.io/part-of: villains-service
@@ -124,12 +124,12 @@ spec:
         app.openshift.io/connects-to: villains-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:39 +0000
-        prometheus.io/scrape: "true"
-        prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
         prometheus.io/scheme: http
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:33 +0000
+        prometheus.io/scrape: "true"
+        prometheus.io/path: /q/metrics
       labels:
         app.kubernetes.io/name: rest-villains
         app.kubernetes.io/part-of: villains-service
@@ -264,8 +264,8 @@ metadata:
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: heroes-db
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:51 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:45 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -371,8 +371,8 @@ metadata:
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: heroes-db
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:51 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:45 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -398,8 +398,8 @@ spec:
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
         app.openshift.io/connects-to: heroes-db
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:51 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:45 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
@@ -523,15 +523,15 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    prometheus.io/port: "8082"
-    prometheus.io/scheme: http
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:05 +0000
+    app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:58 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
+    prometheus.io/port: "8082"
+    prometheus.io/scheme: http
   labels:
     app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
@@ -743,15 +743,15 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
-    app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    prometheus.io/port: "8082"
-    prometheus.io/scheme: http
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:05 +0000
+    app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:58 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
+    prometheus.io/port: "8082"
+    prometheus.io/scheme: http
   labels:
     app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
@@ -770,15 +770,15 @@ spec:
   template:
     metadata:
       annotations:
-        app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        prometheus.io/port: "8082"
-        prometheus.io/scheme: http
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:05 +0000
+        app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:58 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
+        prometheus.io/port: "8082"
+        prometheus.io/scheme: http
       labels:
         app.kubernetes.io/name: rest-fights
         app.kubernetes.io/part-of: fights-service
diff --git a/rest-fights/deploy/k8s/java17-minikube.yml b/rest-fights/deploy/k8s/java17-minikube.yml
index 5a81f57d8..56c88718c 100644
--- a/rest-fights/deploy/k8s/java17-minikube.yml
+++ b/rest-fights/deploy/k8s/java17-minikube.yml
@@ -68,15 +68,15 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    prometheus.io/port: "8082"
-    prometheus.io/scheme: http
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:05 +0000
+    app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:58 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
+    prometheus.io/port: "8082"
+    prometheus.io/scheme: http
   labels:
     app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
@@ -288,15 +288,15 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
-    app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    prometheus.io/port: "8082"
-    prometheus.io/scheme: http
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:05 +0000
+    app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:58 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
+    prometheus.io/port: "8082"
+    prometheus.io/scheme: http
   labels:
     app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
@@ -315,15 +315,15 @@ spec:
   template:
     metadata:
       annotations:
-        app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        prometheus.io/port: "8082"
-        prometheus.io/scheme: http
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:05 +0000
+        app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:58 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
+        prometheus.io/port: "8082"
+        prometheus.io/scheme: http
       labels:
         app.kubernetes.io/name: rest-fights
         app.kubernetes.io/part-of: fights-service
diff --git a/rest-fights/deploy/k8s/java17-openshift-all-downstream.yml b/rest-fights/deploy/k8s/java17-openshift-all-downstream.yml
index 74a5b737f..cbb1e1ceb 100644
--- a/rest-fights/deploy/k8s/java17-openshift-all-downstream.yml
+++ b/rest-fights/deploy/k8s/java17-openshift-all-downstream.yml
@@ -17,11 +17,11 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:30 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:21 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -67,20 +67,20 @@ apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:30 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:21 +0000
   labels:
     name: villains-db
     application: villains-service
     system: quarkus-super-heroes
     app: rest-villains
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/name: rest-villains
     app.kubernetes.io/version: java17-latest
     app.kubernetes.io/part-of: villains-service
+    app.kubernetes.io/name: rest-villains
   name: rest-villains
 spec:
   dockerImageRepository: quay.io/quarkus-super-heroes/rest-villains
@@ -162,11 +162,11 @@ apiVersion: apps.openshift.io/v1
 kind: DeploymentConfig
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:30 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:21 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -176,24 +176,24 @@ metadata:
     application: villains-service
     system: quarkus-super-heroes
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/name: rest-villains
     app.kubernetes.io/version: java17-latest
     app.kubernetes.io/part-of: villains-service
+    app.kubernetes.io/name: rest-villains
   name: rest-villains
 spec:
   replicas: 1
   selector:
-    app.kubernetes.io/name: rest-villains
     app.kubernetes.io/version: java17-latest
     app.kubernetes.io/part-of: villains-service
+    app.kubernetes.io/name: rest-villains
   template:
     metadata:
       annotations:
-        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
         app.openshift.io/connects-to: villains-db
         app.openshift.io/vcs-ref: main
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:30 +0000
+        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:21 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -203,9 +203,9 @@ spec:
         application: villains-service
         system: quarkus-super-heroes
         app.openshift.io/runtime: quarkus
-        app.kubernetes.io/name: rest-villains
         app.kubernetes.io/version: java17-latest
         app.kubernetes.io/part-of: villains-service
+        app.kubernetes.io/name: rest-villains
     spec:
       containers:
         - env:
@@ -248,25 +248,16 @@ spec:
               memory: 768Mi
             requests:
               memory: 256Mi
-  triggers:
-    - imageChangeParams:
-        automatic: true
-        containerNames:
-          - rest-villains
-        from:
-          kind: ImageStreamTag
-          name: rest-villains:java17-latest
-      type: ImageChange
 ---
 apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:30 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:21 +0000
   labels:
     app.kubernetes.io/name: rest-villains
     app.kubernetes.io/part-of: villains-service
@@ -318,11 +309,11 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:42 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:33 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -351,11 +342,11 @@ apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
   annotations:
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:42 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:33 +0000
   labels:
     name: heroes-db
     application: heroes-service
@@ -447,11 +438,11 @@ apiVersion: apps.openshift.io/v1
 kind: DeploymentConfig
 metadata:
   annotations:
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:42 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:33 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -474,11 +465,11 @@ spec:
   template:
     metadata:
       annotations:
+        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
         app.openshift.io/connects-to: heroes-db
         app.openshift.io/vcs-ref: main
-        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:42 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:33 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
@@ -533,16 +524,25 @@ spec:
               memory: 768Mi
             requests:
               memory: 256Mi
+  triggers:
+    - imageChangeParams:
+        automatic: true
+        containerNames:
+          - rest-heroes
+        from:
+          kind: ImageStreamTag
+          name: rest-heroes:java17-latest
+      type: ImageChange
 ---
 apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
   annotations:
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:42 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:33 +0000
   labels:
     app.kubernetes.io/name: rest-heroes
     app.kubernetes.io/part-of: heroes-service
@@ -628,11 +628,11 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:56 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:45 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -661,20 +661,20 @@ apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:56 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:45 +0000
   labels:
     name: apicurio
     application: fights-service
     system: quarkus-super-heroes
     app: rest-fights
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/version: java17-latest
+    app.kubernetes.io/name: rest-fights
   name: rest-fights
 spec:
   dockerImageRepository: quay.io/quarkus-super-heroes/rest-fights
@@ -870,11 +870,11 @@ apiVersion: apps.openshift.io/v1
 kind: DeploymentConfig
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:56 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:45 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -884,24 +884,24 @@ metadata:
     application: fights-service
     system: quarkus-super-heroes
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/version: java17-latest
+    app.kubernetes.io/name: rest-fights
   name: rest-fights
 spec:
   replicas: 1
   selector:
-    app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/version: java17-latest
+    app.kubernetes.io/name: rest-fights
   template:
     metadata:
       annotations:
-        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.openshift.io/vcs-ref: main
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:56 +0000
+        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:45 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
@@ -911,9 +911,9 @@ spec:
         application: fights-service
         system: quarkus-super-heroes
         app.openshift.io/runtime: quarkus
-        app.kubernetes.io/name: rest-fights
         app.kubernetes.io/part-of: fights-service
         app.kubernetes.io/version: java17-latest
+        app.kubernetes.io/name: rest-fights
     spec:
       containers:
         - env:
@@ -956,15 +956,6 @@ spec:
               memory: 768Mi
             requests:
               memory: 256Mi
-  triggers:
-    - imageChangeParams:
-        automatic: true
-        containerNames:
-          - rest-fights
-        from:
-          kind: ImageStreamTag
-          name: rest-fights:java17-latest
-      type: ImageChange
 ---
 apiVersion: route.openshift.io/v1
 kind: Route
@@ -986,11 +977,11 @@ apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:56 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:45 +0000
   labels:
     app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
diff --git a/rest-fights/deploy/k8s/java17-openshift.yml b/rest-fights/deploy/k8s/java17-openshift.yml
index 2c10fd9e1..354476176 100644
--- a/rest-fights/deploy/k8s/java17-openshift.yml
+++ b/rest-fights/deploy/k8s/java17-openshift.yml
@@ -68,11 +68,11 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:56 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:45 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -101,20 +101,20 @@ apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:56 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:45 +0000
   labels:
     name: apicurio
     application: fights-service
     system: quarkus-super-heroes
     app: rest-fights
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/version: java17-latest
+    app.kubernetes.io/name: rest-fights
   name: rest-fights
 spec:
   dockerImageRepository: quay.io/quarkus-super-heroes/rest-fights
@@ -310,11 +310,11 @@ apiVersion: apps.openshift.io/v1
 kind: DeploymentConfig
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:56 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:45 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -324,24 +324,24 @@ metadata:
     application: fights-service
     system: quarkus-super-heroes
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/version: java17-latest
+    app.kubernetes.io/name: rest-fights
   name: rest-fights
 spec:
   replicas: 1
   selector:
-    app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/version: java17-latest
+    app.kubernetes.io/name: rest-fights
   template:
     metadata:
       annotations:
-        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.openshift.io/vcs-ref: main
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:56 +0000
+        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:45 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
@@ -351,9 +351,9 @@ spec:
         application: fights-service
         system: quarkus-super-heroes
         app.openshift.io/runtime: quarkus
-        app.kubernetes.io/name: rest-fights
         app.kubernetes.io/part-of: fights-service
         app.kubernetes.io/version: java17-latest
+        app.kubernetes.io/name: rest-fights
     spec:
       containers:
         - env:
@@ -396,15 +396,6 @@ spec:
               memory: 768Mi
             requests:
               memory: 256Mi
-  triggers:
-    - imageChangeParams:
-        automatic: true
-        containerNames:
-          - rest-fights
-        from:
-          kind: ImageStreamTag
-          name: rest-fights:java17-latest
-      type: ImageChange
 ---
 apiVersion: route.openshift.io/v1
 kind: Route
@@ -426,11 +417,11 @@ apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:56 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:45 +0000
   labels:
     app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
diff --git a/rest-fights/deploy/k8s/native-java11-knative-all-downstream.yml b/rest-fights/deploy/k8s/native-java11-knative-all-downstream.yml
index 73312a89e..a0e3feab6 100644
--- a/rest-fights/deploy/k8s/native-java11-knative-all-downstream.yml
+++ b/rest-fights/deploy/k8s/native-java11-knative-all-downstream.yml
@@ -20,8 +20,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:58 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:53 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -31,8 +31,8 @@ metadata:
     app.openshift.io/runtime: quarkus
     application: villains-service
     system: quarkus-super-heroes
-    app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/name: rest-villains
+    app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/part-of: villains-service
   name: rest-villains
 spec:
@@ -42,8 +42,8 @@ spec:
         app.openshift.io/connects-to: villains-db
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:58 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:53 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -53,8 +53,8 @@ spec:
         app.openshift.io/runtime: quarkus
         application: villains-service
         system: quarkus-super-heroes
-        app.kubernetes.io/version: native-java11-latest
         app.kubernetes.io/name: rest-villains
+        app.kubernetes.io/version: native-java11-latest
         app.kubernetes.io/part-of: villains-service
     spec:
       containers:
@@ -195,8 +195,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:24:10 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:42:04 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -206,8 +206,8 @@ metadata:
     app.openshift.io/runtime: quarkus
     application: heroes-service
     system: quarkus-super-heroes
-    app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/part-of: heroes-service
+    app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/name: rest-heroes
   name: rest-heroes
 spec:
@@ -217,8 +217,8 @@ spec:
         app.openshift.io/connects-to: heroes-db
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:24:10 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:42:04 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
@@ -228,8 +228,8 @@ spec:
         app.openshift.io/runtime: quarkus
         application: heroes-service
         system: quarkus-super-heroes
-        app.kubernetes.io/version: native-java11-latest
         app.kubernetes.io/part-of: heroes-service
+        app.kubernetes.io/version: native-java11-latest
         app.kubernetes.io/name: rest-heroes
     spec:
       containers:
@@ -345,8 +345,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:24:24 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:42:17 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -356,9 +356,9 @@ metadata:
     app.openshift.io/runtime: quarkus
     application: fights-service
     system: quarkus-super-heroes
-    app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/name: rest-fights
+    app.kubernetes.io/version: native-java11-latest
   name: rest-fights
 spec:
   template:
@@ -367,8 +367,8 @@ spec:
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:24:24 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:42:17 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
@@ -378,9 +378,9 @@ spec:
         app.openshift.io/runtime: quarkus
         application: fights-service
         system: quarkus-super-heroes
-        app.kubernetes.io/version: native-java11-latest
         app.kubernetes.io/part-of: fights-service
         app.kubernetes.io/name: rest-fights
+        app.kubernetes.io/version: native-java11-latest
     spec:
       containers:
         - envFrom:
diff --git a/rest-fights/deploy/k8s/native-java11-knative.yml b/rest-fights/deploy/k8s/native-java11-knative.yml
index 9179442ea..5f9cc6732 100644
--- a/rest-fights/deploy/k8s/native-java11-knative.yml
+++ b/rest-fights/deploy/k8s/native-java11-knative.yml
@@ -71,8 +71,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:24:24 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:42:17 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -82,9 +82,9 @@ metadata:
     app.openshift.io/runtime: quarkus
     application: fights-service
     system: quarkus-super-heroes
-    app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/name: rest-fights
+    app.kubernetes.io/version: native-java11-latest
   name: rest-fights
 spec:
   template:
@@ -93,8 +93,8 @@ spec:
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:24:24 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:42:17 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
@@ -104,9 +104,9 @@ spec:
         app.openshift.io/runtime: quarkus
         application: fights-service
         system: quarkus-super-heroes
-        app.kubernetes.io/version: native-java11-latest
         app.kubernetes.io/part-of: fights-service
         app.kubernetes.io/name: rest-fights
+        app.kubernetes.io/version: native-java11-latest
     spec:
       containers:
         - envFrom:
diff --git a/rest-fights/deploy/k8s/native-java11-kubernetes-all-downstream.yml b/rest-fights/deploy/k8s/native-java11-kubernetes-all-downstream.yml
index 194ae7b5f..eb39594c4 100644
--- a/rest-fights/deploy/k8s/native-java11-kubernetes-all-downstream.yml
+++ b/rest-fights/deploy/k8s/native-java11-kubernetes-all-downstream.yml
@@ -20,8 +20,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:21:26 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:39:23 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -96,8 +96,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:21:26 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:39:23 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -106,16 +106,16 @@ metadata:
     app: rest-villains
     application: villains-service
     system: quarkus-super-heroes
-    app.kubernetes.io/name: rest-villains
     app.kubernetes.io/part-of: villains-service
+    app.kubernetes.io/name: rest-villains
     app.kubernetes.io/version: native-java11-latest
   name: rest-villains
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: rest-villains
       app.kubernetes.io/part-of: villains-service
+      app.kubernetes.io/name: rest-villains
       app.kubernetes.io/version: native-java11-latest
   template:
     metadata:
@@ -123,8 +123,8 @@ spec:
         app.openshift.io/connects-to: villains-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:21:26 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:39:23 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -133,8 +133,8 @@ spec:
         app: rest-villains
         application: villains-service
         system: quarkus-super-heroes
-        app.kubernetes.io/name: rest-villains
         app.kubernetes.io/part-of: villains-service
+        app.kubernetes.io/name: rest-villains
         app.kubernetes.io/version: native-java11-latest
     spec:
       containers:
@@ -263,8 +263,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:21:38 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:39:35 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -369,8 +369,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:21:38 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:39:35 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -396,8 +396,8 @@ spec:
         app.openshift.io/connects-to: heroes-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:21:38 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:39:35 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
@@ -524,8 +524,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:21:52 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:39:48 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -743,8 +743,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:21:52 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:39:48 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -770,8 +770,8 @@ spec:
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:21:52 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:39:48 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
diff --git a/rest-fights/deploy/k8s/native-java11-kubernetes.yml b/rest-fights/deploy/k8s/native-java11-kubernetes.yml
index 7d6a2feaa..d7ca40916 100644
--- a/rest-fights/deploy/k8s/native-java11-kubernetes.yml
+++ b/rest-fights/deploy/k8s/native-java11-kubernetes.yml
@@ -71,8 +71,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:21:52 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:39:48 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -290,8 +290,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:21:52 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:39:48 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -317,8 +317,8 @@ spec:
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:21:52 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:39:48 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
diff --git a/rest-fights/deploy/k8s/native-java11-minikube-all-downstream.yml b/rest-fights/deploy/k8s/native-java11-minikube-all-downstream.yml
index 5e74b4149..ac622b901 100644
--- a/rest-fights/deploy/k8s/native-java11-minikube-all-downstream.yml
+++ b/rest-fights/deploy/k8s/native-java11-minikube-all-downstream.yml
@@ -20,8 +20,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:22:17 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:40:12 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -97,8 +97,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:22:17 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:40:12 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -124,8 +124,8 @@ spec:
         app.openshift.io/connects-to: villains-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:22:17 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:40:12 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -261,11 +261,11 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
+    app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.openshift.io/connects-to: heroes-db
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:22:29 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:40:24 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -368,11 +368,11 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
+    app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.openshift.io/connects-to: heroes-db
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:22:29 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:40:24 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -395,11 +395,11 @@ spec:
   template:
     metadata:
       annotations:
+        app.openshift.io/connects-to: heroes-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.openshift.io/connects-to: heroes-db
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:22:29 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:40:24 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
@@ -526,8 +526,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:22:43 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:40:37 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -746,8 +746,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:22:43 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:40:37 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -773,8 +773,8 @@ spec:
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:22:43 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:40:37 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
diff --git a/rest-fights/deploy/k8s/native-java11-minikube.yml b/rest-fights/deploy/k8s/native-java11-minikube.yml
index df5642562..9134508a5 100644
--- a/rest-fights/deploy/k8s/native-java11-minikube.yml
+++ b/rest-fights/deploy/k8s/native-java11-minikube.yml
@@ -71,8 +71,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:22:43 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:40:37 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -291,8 +291,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:22:43 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:40:37 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -318,8 +318,8 @@ spec:
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:22:43 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:40:37 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
diff --git a/rest-fights/deploy/k8s/native-java11-openshift-all-downstream.yml b/rest-fights/deploy/k8s/native-java11-openshift-all-downstream.yml
index 8bea9180b..896b8e3cb 100644
--- a/rest-fights/deploy/k8s/native-java11-openshift-all-downstream.yml
+++ b/rest-fights/deploy/k8s/native-java11-openshift-all-downstream.yml
@@ -17,11 +17,11 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:07 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:04 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -67,19 +67,19 @@ apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:07 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:04 +0000
   labels:
     name: villains-db
     application: villains-service
     system: quarkus-super-heroes
     app: rest-villains
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/name: rest-villains
+    app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/part-of: villains-service
   name: rest-villains
 spec:
@@ -162,11 +162,11 @@ apiVersion: apps.openshift.io/v1
 kind: DeploymentConfig
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:07 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:04 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -176,24 +176,24 @@ metadata:
     application: villains-service
     system: quarkus-super-heroes
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/name: rest-villains
+    app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/part-of: villains-service
   name: rest-villains
 spec:
   replicas: 1
   selector:
-    app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/name: rest-villains
+    app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/part-of: villains-service
   template:
     metadata:
       annotations:
-        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
         app.openshift.io/connects-to: villains-db
         app.openshift.io/vcs-ref: main
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:07 +0000
+        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:04 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -203,8 +203,8 @@ spec:
         application: villains-service
         system: quarkus-super-heroes
         app.openshift.io/runtime: quarkus
-        app.kubernetes.io/version: native-java11-latest
         app.kubernetes.io/name: rest-villains
+        app.kubernetes.io/version: native-java11-latest
         app.kubernetes.io/part-of: villains-service
     spec:
       containers:
@@ -248,25 +248,16 @@ spec:
               memory: 128Mi
             requests:
               memory: 32Mi
-  triggers:
-    - imageChangeParams:
-        automatic: true
-        containerNames:
-          - rest-villains
-        from:
-          kind: ImageStreamTag
-          name: rest-villains:native-java11-latest
-      type: ImageChange
 ---
 apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:07 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:04 +0000
   labels:
     app.kubernetes.io/name: rest-villains
     app.kubernetes.io/part-of: villains-service
@@ -321,8 +312,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:19 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:16 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -354,8 +345,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:19 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:16 +0000
   labels:
     name: heroes-db
     application: heroes-service
@@ -363,8 +354,8 @@ metadata:
     app: rest-heroes
     app.openshift.io/runtime: quarkus
     app.kubernetes.io/name: rest-heroes
-    app.kubernetes.io/part-of: heroes-service
     app.kubernetes.io/version: native-java11-latest
+    app.kubernetes.io/part-of: heroes-service
   name: rest-heroes
 spec:
   dockerImageRepository: quay.io/quarkus-super-heroes/rest-heroes
@@ -450,8 +441,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:19 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:16 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -462,23 +453,23 @@ metadata:
     system: quarkus-super-heroes
     app.openshift.io/runtime: quarkus
     app.kubernetes.io/name: rest-heroes
-    app.kubernetes.io/part-of: heroes-service
     app.kubernetes.io/version: native-java11-latest
+    app.kubernetes.io/part-of: heroes-service
   name: rest-heroes
 spec:
   replicas: 1
   selector:
     app.kubernetes.io/name: rest-heroes
-    app.kubernetes.io/part-of: heroes-service
     app.kubernetes.io/version: native-java11-latest
+    app.kubernetes.io/part-of: heroes-service
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: heroes-db
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:19 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:16 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
@@ -489,8 +480,8 @@ spec:
         system: quarkus-super-heroes
         app.openshift.io/runtime: quarkus
         app.kubernetes.io/name: rest-heroes
-        app.kubernetes.io/part-of: heroes-service
         app.kubernetes.io/version: native-java11-latest
+        app.kubernetes.io/part-of: heroes-service
     spec:
       containers:
         - env:
@@ -541,8 +532,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:19 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:16 +0000
   labels:
     app.kubernetes.io/name: rest-heroes
     app.kubernetes.io/part-of: heroes-service
@@ -631,8 +622,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:33 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:30 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -664,17 +655,17 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:33 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:30 +0000
   labels:
     name: apicurio
     application: fights-service
     system: quarkus-super-heroes
     app: rest-fights
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/name: rest-fights
+    app.kubernetes.io/part-of: fights-service
   name: rest-fights
 spec:
   dockerImageRepository: quay.io/quarkus-super-heroes/rest-fights
@@ -873,8 +864,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:33 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:30 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -884,24 +875,24 @@ metadata:
     application: fights-service
     system: quarkus-super-heroes
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/name: rest-fights
+    app.kubernetes.io/part-of: fights-service
   name: rest-fights
 spec:
   replicas: 1
   selector:
-    app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/name: rest-fights
+    app.kubernetes.io/part-of: fights-service
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:33 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:30 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
@@ -911,9 +902,9 @@ spec:
         application: fights-service
         system: quarkus-super-heroes
         app.openshift.io/runtime: quarkus
-        app.kubernetes.io/part-of: fights-service
         app.kubernetes.io/version: native-java11-latest
         app.kubernetes.io/name: rest-fights
+        app.kubernetes.io/part-of: fights-service
     spec:
       containers:
         - env:
@@ -980,8 +971,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:33 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:30 +0000
   labels:
     app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
diff --git a/rest-fights/deploy/k8s/native-java11-openshift.yml b/rest-fights/deploy/k8s/native-java11-openshift.yml
index 6eda60bd5..d34eb3521 100644
--- a/rest-fights/deploy/k8s/native-java11-openshift.yml
+++ b/rest-fights/deploy/k8s/native-java11-openshift.yml
@@ -71,8 +71,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:33 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:30 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -104,17 +104,17 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:33 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:30 +0000
   labels:
     name: apicurio
     application: fights-service
     system: quarkus-super-heroes
     app: rest-fights
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/name: rest-fights
+    app.kubernetes.io/part-of: fights-service
   name: rest-fights
 spec:
   dockerImageRepository: quay.io/quarkus-super-heroes/rest-fights
@@ -313,8 +313,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:33 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:30 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -324,24 +324,24 @@ metadata:
     application: fights-service
     system: quarkus-super-heroes
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/name: rest-fights
+    app.kubernetes.io/part-of: fights-service
   name: rest-fights
 spec:
   replicas: 1
   selector:
-    app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/name: rest-fights
+    app.kubernetes.io/part-of: fights-service
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:33 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:30 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
@@ -351,9 +351,9 @@ spec:
         application: fights-service
         system: quarkus-super-heroes
         app.openshift.io/runtime: quarkus
-        app.kubernetes.io/part-of: fights-service
         app.kubernetes.io/version: native-java11-latest
         app.kubernetes.io/name: rest-fights
+        app.kubernetes.io/part-of: fights-service
     spec:
       containers:
         - env:
@@ -420,8 +420,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:33 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:30 +0000
   labels:
     app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
diff --git a/rest-fights/deploy/k8s/native-java17-knative-all-downstream.yml b/rest-fights/deploy/k8s/native-java17-knative-all-downstream.yml
index 223c079e5..142985aab 100644
--- a/rest-fights/deploy/k8s/native-java17-knative-all-downstream.yml
+++ b/rest-fights/deploy/k8s/native-java17-knative-all-downstream.yml
@@ -20,8 +20,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:44 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:28 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -31,9 +31,9 @@ metadata:
     app.openshift.io/runtime: quarkus
     application: villains-service
     system: quarkus-super-heroes
+    app.kubernetes.io/name: rest-villains
     app.kubernetes.io/version: native-java17-latest
     app.kubernetes.io/part-of: villains-service
-    app.kubernetes.io/name: rest-villains
   name: rest-villains
 spec:
   template:
@@ -42,8 +42,8 @@ spec:
         app.openshift.io/connects-to: villains-db
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:44 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:28 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -53,9 +53,9 @@ spec:
         app.openshift.io/runtime: quarkus
         application: villains-service
         system: quarkus-super-heroes
+        app.kubernetes.io/name: rest-villains
         app.kubernetes.io/version: native-java17-latest
         app.kubernetes.io/part-of: villains-service
-        app.kubernetes.io/name: rest-villains
     spec:
       containers:
         - envFrom:
@@ -195,8 +195,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:56 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:40 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -206,9 +206,9 @@ metadata:
     app.openshift.io/runtime: quarkus
     application: heroes-service
     system: quarkus-super-heroes
+    app.kubernetes.io/version: native-java17-latest
     app.kubernetes.io/part-of: heroes-service
     app.kubernetes.io/name: rest-heroes
-    app.kubernetes.io/version: native-java17-latest
   name: rest-heroes
 spec:
   template:
@@ -217,8 +217,8 @@ spec:
         app.openshift.io/connects-to: heroes-db
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:56 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:40 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
@@ -228,9 +228,9 @@ spec:
         app.openshift.io/runtime: quarkus
         application: heroes-service
         system: quarkus-super-heroes
+        app.kubernetes.io/version: native-java17-latest
         app.kubernetes.io/part-of: heroes-service
         app.kubernetes.io/name: rest-heroes
-        app.kubernetes.io/version: native-java17-latest
     spec:
       containers:
         - envFrom:
@@ -345,8 +345,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:31:10 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:53 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -356,9 +356,9 @@ metadata:
     app.openshift.io/runtime: quarkus
     application: fights-service
     system: quarkus-super-heroes
+    app.kubernetes.io/version: native-java17-latest
     app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/name: rest-fights
-    app.kubernetes.io/version: native-java17-latest
   name: rest-fights
 spec:
   template:
@@ -367,8 +367,8 @@ spec:
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:31:10 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:53 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
@@ -378,9 +378,9 @@ spec:
         app.openshift.io/runtime: quarkus
         application: fights-service
         system: quarkus-super-heroes
+        app.kubernetes.io/version: native-java17-latest
         app.kubernetes.io/part-of: fights-service
         app.kubernetes.io/name: rest-fights
-        app.kubernetes.io/version: native-java17-latest
     spec:
       containers:
         - envFrom:
diff --git a/rest-fights/deploy/k8s/native-java17-knative.yml b/rest-fights/deploy/k8s/native-java17-knative.yml
index 4fadaa247..081664127 100644
--- a/rest-fights/deploy/k8s/native-java17-knative.yml
+++ b/rest-fights/deploy/k8s/native-java17-knative.yml
@@ -71,8 +71,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:31:10 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:53 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -82,9 +82,9 @@ metadata:
     app.openshift.io/runtime: quarkus
     application: fights-service
     system: quarkus-super-heroes
+    app.kubernetes.io/version: native-java17-latest
     app.kubernetes.io/part-of: fights-service
     app.kubernetes.io/name: rest-fights
-    app.kubernetes.io/version: native-java17-latest
   name: rest-fights
 spec:
   template:
@@ -93,8 +93,8 @@ spec:
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:31:10 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:53 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
@@ -104,9 +104,9 @@ spec:
         app.openshift.io/runtime: quarkus
         application: fights-service
         system: quarkus-super-heroes
+        app.kubernetes.io/version: native-java17-latest
         app.kubernetes.io/part-of: fights-service
         app.kubernetes.io/name: rest-fights
-        app.kubernetes.io/version: native-java17-latest
     spec:
       containers:
         - envFrom:
diff --git a/rest-fights/deploy/k8s/native-java17-kubernetes-all-downstream.yml b/rest-fights/deploy/k8s/native-java17-kubernetes-all-downstream.yml
index 203abcac2..dbf663176 100644
--- a/rest-fights/deploy/k8s/native-java17-kubernetes-all-downstream.yml
+++ b/rest-fights/deploy/k8s/native-java17-kubernetes-all-downstream.yml
@@ -20,8 +20,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:28:11 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:45:57 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -96,8 +96,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:28:11 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:45:57 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -106,25 +106,25 @@ metadata:
     app: rest-villains
     application: villains-service
     system: quarkus-super-heroes
-    app.kubernetes.io/version: native-java17-latest
     app.kubernetes.io/part-of: villains-service
     app.kubernetes.io/name: rest-villains
+    app.kubernetes.io/version: native-java17-latest
   name: rest-villains
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/version: native-java17-latest
       app.kubernetes.io/part-of: villains-service
       app.kubernetes.io/name: rest-villains
+      app.kubernetes.io/version: native-java17-latest
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: villains-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:28:11 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:45:57 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -133,9 +133,9 @@ spec:
         app: rest-villains
         application: villains-service
         system: quarkus-super-heroes
-        app.kubernetes.io/version: native-java17-latest
         app.kubernetes.io/part-of: villains-service
         app.kubernetes.io/name: rest-villains
+        app.kubernetes.io/version: native-java17-latest
     spec:
       containers:
         - env:
@@ -263,8 +263,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:28:24 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:08 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -369,8 +369,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:28:24 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:08 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -380,24 +380,24 @@ metadata:
     application: heroes-service
     system: quarkus-super-heroes
     app.kubernetes.io/part-of: heroes-service
-    app.kubernetes.io/version: native-java17-latest
     app.kubernetes.io/name: rest-heroes
+    app.kubernetes.io/version: native-java17-latest
   name: rest-heroes
 spec:
   replicas: 1
   selector:
     matchLabels:
       app.kubernetes.io/part-of: heroes-service
-      app.kubernetes.io/version: native-java17-latest
       app.kubernetes.io/name: rest-heroes
+      app.kubernetes.io/version: native-java17-latest
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: heroes-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:28:24 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:08 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
@@ -407,8 +407,8 @@ spec:
         application: heroes-service
         system: quarkus-super-heroes
         app.kubernetes.io/part-of: heroes-service
-        app.kubernetes.io/version: native-java17-latest
         app.kubernetes.io/name: rest-heroes
+        app.kubernetes.io/version: native-java17-latest
     spec:
       containers:
         - env:
@@ -524,8 +524,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:28:37 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:21 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -743,8 +743,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:28:37 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:21 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -753,16 +753,16 @@ metadata:
     app: rest-fights
     application: fights-service
     system: quarkus-super-heroes
-    app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
+    app.kubernetes.io/name: rest-fights
     app.kubernetes.io/version: native-java17-latest
   name: rest-fights
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: rest-fights
       app.kubernetes.io/part-of: fights-service
+      app.kubernetes.io/name: rest-fights
       app.kubernetes.io/version: native-java17-latest
   template:
     metadata:
@@ -770,8 +770,8 @@ spec:
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:28:37 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:21 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
@@ -780,8 +780,8 @@ spec:
         app: rest-fights
         application: fights-service
         system: quarkus-super-heroes
-        app.kubernetes.io/name: rest-fights
         app.kubernetes.io/part-of: fights-service
+        app.kubernetes.io/name: rest-fights
         app.kubernetes.io/version: native-java17-latest
     spec:
       containers:
diff --git a/rest-fights/deploy/k8s/native-java17-kubernetes.yml b/rest-fights/deploy/k8s/native-java17-kubernetes.yml
index a4149e327..b4a3c40d9 100644
--- a/rest-fights/deploy/k8s/native-java17-kubernetes.yml
+++ b/rest-fights/deploy/k8s/native-java17-kubernetes.yml
@@ -71,8 +71,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:28:37 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:21 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -290,8 +290,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:28:37 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:21 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -300,16 +300,16 @@ metadata:
     app: rest-fights
     application: fights-service
     system: quarkus-super-heroes
-    app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
+    app.kubernetes.io/name: rest-fights
     app.kubernetes.io/version: native-java17-latest
   name: rest-fights
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: rest-fights
       app.kubernetes.io/part-of: fights-service
+      app.kubernetes.io/name: rest-fights
       app.kubernetes.io/version: native-java17-latest
   template:
     metadata:
@@ -317,8 +317,8 @@ spec:
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:28:37 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:21 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
@@ -327,8 +327,8 @@ spec:
         app: rest-fights
         application: fights-service
         system: quarkus-super-heroes
-        app.kubernetes.io/name: rest-fights
         app.kubernetes.io/part-of: fights-service
+        app.kubernetes.io/name: rest-fights
         app.kubernetes.io/version: native-java17-latest
     spec:
       containers:
diff --git a/rest-fights/deploy/k8s/native-java17-minikube-all-downstream.yml b/rest-fights/deploy/k8s/native-java17-minikube-all-downstream.yml
index a63c7b6b6..d653c7fdc 100644
--- a/rest-fights/deploy/k8s/native-java17-minikube-all-downstream.yml
+++ b/rest-fights/deploy/k8s/native-java17-minikube-all-downstream.yml
@@ -17,11 +17,11 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:02 +0000
+    app.openshift.io/connects-to: villains-db
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:46 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -94,11 +94,11 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
-    app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:02 +0000
+    app.openshift.io/connects-to: villains-db
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:46 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -121,11 +121,11 @@ spec:
   template:
     metadata:
       annotations:
-        app.openshift.io/connects-to: villains-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:02 +0000
+        app.openshift.io/connects-to: villains-db
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:46 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -261,11 +261,11 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
+    app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.openshift.io/connects-to: heroes-db
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:15 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:58 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -368,11 +368,11 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
+    app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.openshift.io/connects-to: heroes-db
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:15 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:58 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -395,11 +395,11 @@ spec:
   template:
     metadata:
       annotations:
+        app.openshift.io/connects-to: heroes-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.openshift.io/connects-to: heroes-db
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:15 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:58 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
@@ -523,15 +523,15 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
+    app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:29 +0000
-    prometheus.io/scrape: "true"
-    prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
     prometheus.io/scheme: http
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:13 +0000
+    prometheus.io/scrape: "true"
+    prometheus.io/path: /q/metrics
   labels:
     app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
@@ -743,15 +743,15 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
+    app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:29 +0000
-    prometheus.io/scrape: "true"
-    prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
     prometheus.io/scheme: http
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:13 +0000
+    prometheus.io/scrape: "true"
+    prometheus.io/path: /q/metrics
   labels:
     app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
@@ -770,15 +770,15 @@ spec:
   template:
     metadata:
       annotations:
+        app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:29 +0000
-        prometheus.io/scrape: "true"
-        prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
         prometheus.io/scheme: http
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:13 +0000
+        prometheus.io/scrape: "true"
+        prometheus.io/path: /q/metrics
       labels:
         app.kubernetes.io/name: rest-fights
         app.kubernetes.io/part-of: fights-service
diff --git a/rest-fights/deploy/k8s/native-java17-minikube.yml b/rest-fights/deploy/k8s/native-java17-minikube.yml
index 52c682dd0..b4c32a902 100644
--- a/rest-fights/deploy/k8s/native-java17-minikube.yml
+++ b/rest-fights/deploy/k8s/native-java17-minikube.yml
@@ -68,15 +68,15 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
+    app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:29 +0000
-    prometheus.io/scrape: "true"
-    prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
     prometheus.io/scheme: http
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:13 +0000
+    prometheus.io/scrape: "true"
+    prometheus.io/path: /q/metrics
   labels:
     app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
@@ -288,15 +288,15 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
+    app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:29 +0000
-    prometheus.io/scrape: "true"
-    prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
     prometheus.io/scheme: http
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:13 +0000
+    prometheus.io/scrape: "true"
+    prometheus.io/path: /q/metrics
   labels:
     app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
@@ -315,15 +315,15 @@ spec:
   template:
     metadata:
       annotations:
+        app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:29 +0000
-        prometheus.io/scrape: "true"
-        prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
         prometheus.io/scheme: http
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:13 +0000
+        prometheus.io/scrape: "true"
+        prometheus.io/path: /q/metrics
       labels:
         app.kubernetes.io/name: rest-fights
         app.kubernetes.io/part-of: fights-service
diff --git a/rest-fights/deploy/k8s/native-java17-openshift-all-downstream.yml b/rest-fights/deploy/k8s/native-java17-openshift-all-downstream.yml
index d014b67d4..bb6bfed41 100644
--- a/rest-fights/deploy/k8s/native-java17-openshift-all-downstream.yml
+++ b/rest-fights/deploy/k8s/native-java17-openshift-all-downstream.yml
@@ -17,11 +17,11 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:53 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:37 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -67,20 +67,20 @@ apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
   annotations:
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:53 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:37 +0000
   labels:
     name: villains-db
     application: villains-service
     system: quarkus-super-heroes
     app: rest-villains
     app.openshift.io/runtime: quarkus
+    app.kubernetes.io/version: native-java17-latest
     app.kubernetes.io/part-of: villains-service
     app.kubernetes.io/name: rest-villains
-    app.kubernetes.io/version: native-java17-latest
   name: rest-villains
 spec:
   dockerImageRepository: quay.io/quarkus-super-heroes/rest-villains
@@ -162,11 +162,11 @@ apiVersion: apps.openshift.io/v1
 kind: DeploymentConfig
 metadata:
   annotations:
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:53 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:37 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -176,24 +176,24 @@ metadata:
     application: villains-service
     system: quarkus-super-heroes
     app.openshift.io/runtime: quarkus
+    app.kubernetes.io/version: native-java17-latest
     app.kubernetes.io/part-of: villains-service
     app.kubernetes.io/name: rest-villains
-    app.kubernetes.io/version: native-java17-latest
   name: rest-villains
 spec:
   replicas: 1
   selector:
+    app.kubernetes.io/version: native-java17-latest
     app.kubernetes.io/part-of: villains-service
     app.kubernetes.io/name: rest-villains
-    app.kubernetes.io/version: native-java17-latest
   template:
     metadata:
       annotations:
+        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
         app.openshift.io/connects-to: villains-db
         app.openshift.io/vcs-ref: main
-        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:53 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:37 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -203,9 +203,9 @@ spec:
         application: villains-service
         system: quarkus-super-heroes
         app.openshift.io/runtime: quarkus
+        app.kubernetes.io/version: native-java17-latest
         app.kubernetes.io/part-of: villains-service
         app.kubernetes.io/name: rest-villains
-        app.kubernetes.io/version: native-java17-latest
     spec:
       containers:
         - env:
@@ -248,16 +248,25 @@ spec:
               memory: 128Mi
             requests:
               memory: 32Mi
+  triggers:
+    - imageChangeParams:
+        automatic: true
+        containerNames:
+          - rest-villains
+        from:
+          kind: ImageStreamTag
+          name: rest-villains:native-java17-latest
+      type: ImageChange
 ---
 apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
   annotations:
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:53 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:37 +0000
   labels:
     app.kubernetes.io/name: rest-villains
     app.kubernetes.io/part-of: villains-service
@@ -312,8 +321,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:05 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:50 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -345,17 +354,17 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:05 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:50 +0000
   labels:
     name: heroes-db
     application: heroes-service
     system: quarkus-super-heroes
     app: rest-heroes
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/version: native-java17-latest
-    app.kubernetes.io/name: rest-heroes
     app.kubernetes.io/part-of: heroes-service
+    app.kubernetes.io/name: rest-heroes
+    app.kubernetes.io/version: native-java17-latest
   name: rest-heroes
 spec:
   dockerImageRepository: quay.io/quarkus-super-heroes/rest-heroes
@@ -441,8 +450,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:05 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:50 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -452,24 +461,24 @@ metadata:
     application: heroes-service
     system: quarkus-super-heroes
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/version: native-java17-latest
-    app.kubernetes.io/name: rest-heroes
     app.kubernetes.io/part-of: heroes-service
+    app.kubernetes.io/name: rest-heroes
+    app.kubernetes.io/version: native-java17-latest
   name: rest-heroes
 spec:
   replicas: 1
   selector:
-    app.kubernetes.io/version: native-java17-latest
-    app.kubernetes.io/name: rest-heroes
     app.kubernetes.io/part-of: heroes-service
+    app.kubernetes.io/name: rest-heroes
+    app.kubernetes.io/version: native-java17-latest
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: heroes-db
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:05 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:50 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
@@ -479,9 +488,9 @@ spec:
         application: heroes-service
         system: quarkus-super-heroes
         app.openshift.io/runtime: quarkus
-        app.kubernetes.io/version: native-java17-latest
-        app.kubernetes.io/name: rest-heroes
         app.kubernetes.io/part-of: heroes-service
+        app.kubernetes.io/name: rest-heroes
+        app.kubernetes.io/version: native-java17-latest
     spec:
       containers:
         - env:
@@ -532,8 +541,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:05 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:50 +0000
   labels:
     app.kubernetes.io/name: rest-heroes
     app.kubernetes.io/part-of: heroes-service
@@ -622,8 +631,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:19 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:04 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -655,17 +664,17 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:19 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:04 +0000
   labels:
     name: apicurio
     application: fights-service
     system: quarkus-super-heroes
     app: rest-fights
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/part-of: fights-service
-    app.kubernetes.io/name: rest-fights
     app.kubernetes.io/version: native-java17-latest
+    app.kubernetes.io/name: rest-fights
+    app.kubernetes.io/part-of: fights-service
   name: rest-fights
 spec:
   dockerImageRepository: quay.io/quarkus-super-heroes/rest-fights
@@ -864,8 +873,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:19 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:04 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -875,24 +884,24 @@ metadata:
     application: fights-service
     system: quarkus-super-heroes
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/part-of: fights-service
-    app.kubernetes.io/name: rest-fights
     app.kubernetes.io/version: native-java17-latest
+    app.kubernetes.io/name: rest-fights
+    app.kubernetes.io/part-of: fights-service
   name: rest-fights
 spec:
   replicas: 1
   selector:
-    app.kubernetes.io/part-of: fights-service
-    app.kubernetes.io/name: rest-fights
     app.kubernetes.io/version: native-java17-latest
+    app.kubernetes.io/name: rest-fights
+    app.kubernetes.io/part-of: fights-service
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:19 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:04 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
@@ -902,9 +911,9 @@ spec:
         application: fights-service
         system: quarkus-super-heroes
         app.openshift.io/runtime: quarkus
-        app.kubernetes.io/part-of: fights-service
-        app.kubernetes.io/name: rest-fights
         app.kubernetes.io/version: native-java17-latest
+        app.kubernetes.io/name: rest-fights
+        app.kubernetes.io/part-of: fights-service
     spec:
       containers:
         - env:
@@ -971,8 +980,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:19 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:04 +0000
   labels:
     app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
diff --git a/rest-fights/deploy/k8s/native-java17-openshift.yml b/rest-fights/deploy/k8s/native-java17-openshift.yml
index e7010c4c4..9e97a4e48 100644
--- a/rest-fights/deploy/k8s/native-java17-openshift.yml
+++ b/rest-fights/deploy/k8s/native-java17-openshift.yml
@@ -71,8 +71,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:19 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:04 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -104,17 +104,17 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:19 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:04 +0000
   labels:
     name: apicurio
     application: fights-service
     system: quarkus-super-heroes
     app: rest-fights
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/part-of: fights-service
-    app.kubernetes.io/name: rest-fights
     app.kubernetes.io/version: native-java17-latest
+    app.kubernetes.io/name: rest-fights
+    app.kubernetes.io/part-of: fights-service
   name: rest-fights
 spec:
   dockerImageRepository: quay.io/quarkus-super-heroes/rest-fights
@@ -313,8 +313,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:19 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:04 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8082"
@@ -324,24 +324,24 @@ metadata:
     application: fights-service
     system: quarkus-super-heroes
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/part-of: fights-service
-    app.kubernetes.io/name: rest-fights
     app.kubernetes.io/version: native-java17-latest
+    app.kubernetes.io/name: rest-fights
+    app.kubernetes.io/part-of: fights-service
   name: rest-fights
 spec:
   replicas: 1
   selector:
-    app.kubernetes.io/part-of: fights-service
-    app.kubernetes.io/name: rest-fights
     app.kubernetes.io/version: native-java17-latest
+    app.kubernetes.io/name: rest-fights
+    app.kubernetes.io/part-of: fights-service
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:19 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:04 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8082"
@@ -351,9 +351,9 @@ spec:
         application: fights-service
         system: quarkus-super-heroes
         app.openshift.io/runtime: quarkus
-        app.kubernetes.io/part-of: fights-service
-        app.kubernetes.io/name: rest-fights
         app.kubernetes.io/version: native-java17-latest
+        app.kubernetes.io/name: rest-fights
+        app.kubernetes.io/part-of: fights-service
     spec:
       containers:
         - env:
@@ -420,8 +420,8 @@ metadata:
     app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes"
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:19 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:04 +0000
   labels:
     app.kubernetes.io/name: rest-fights
     app.kubernetes.io/part-of: fights-service
diff --git a/rest-heroes/deploy/k8s/java11-knative.yml b/rest-heroes/deploy/k8s/java11-knative.yml
index f1f73e6e0..7934e621e 100644
--- a/rest-heroes/deploy/k8s/java11-knative.yml
+++ b/rest-heroes/deploy/k8s/java11-knative.yml
@@ -6,8 +6,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:20:47 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:45 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -28,8 +28,8 @@ spec:
         app.openshift.io/connects-to: heroes-db
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:20:47 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:45 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
diff --git a/rest-heroes/deploy/k8s/java11-kubernetes.yml b/rest-heroes/deploy/k8s/java11-kubernetes.yml
index 8d320cd55..8b1366cff 100644
--- a/rest-heroes/deploy/k8s/java11-kubernetes.yml
+++ b/rest-heroes/deploy/k8s/java11-kubernetes.yml
@@ -37,8 +37,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:18:08 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:36:03 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -143,8 +143,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:18:08 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:36:03 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -154,24 +154,24 @@ metadata:
     application: heroes-service
     system: quarkus-super-heroes
     app.kubernetes.io/version: java11-latest
-    app.kubernetes.io/name: rest-heroes
     app.kubernetes.io/part-of: heroes-service
+    app.kubernetes.io/name: rest-heroes
   name: rest-heroes
 spec:
   replicas: 1
   selector:
     matchLabels:
       app.kubernetes.io/version: java11-latest
-      app.kubernetes.io/name: rest-heroes
       app.kubernetes.io/part-of: heroes-service
+      app.kubernetes.io/name: rest-heroes
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: heroes-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:18:08 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:36:03 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
@@ -181,8 +181,8 @@ spec:
         application: heroes-service
         system: quarkus-super-heroes
         app.kubernetes.io/version: java11-latest
-        app.kubernetes.io/name: rest-heroes
         app.kubernetes.io/part-of: heroes-service
+        app.kubernetes.io/name: rest-heroes
     spec:
       containers:
         - env:
diff --git a/rest-heroes/deploy/k8s/java11-minikube.yml b/rest-heroes/deploy/k8s/java11-minikube.yml
index e383f4f88..062623bda 100644
--- a/rest-heroes/deploy/k8s/java11-minikube.yml
+++ b/rest-heroes/deploy/k8s/java11-minikube.yml
@@ -34,15 +34,15 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
+    app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.openshift.io/connects-to: heroes-db
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:06 +0000
-    prometheus.io/scrape: "true"
-    prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
     prometheus.io/scheme: http
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:01 +0000
+    prometheus.io/scrape: "true"
+    prometheus.io/path: /q/metrics
   labels:
     app.kubernetes.io/name: rest-heroes
     app.kubernetes.io/part-of: heroes-service
@@ -141,15 +141,15 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
+    app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.openshift.io/connects-to: heroes-db
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:06 +0000
-    prometheus.io/scrape: "true"
-    prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
     prometheus.io/scheme: http
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:01 +0000
+    prometheus.io/scrape: "true"
+    prometheus.io/path: /q/metrics
   labels:
     app.kubernetes.io/name: rest-heroes
     app.kubernetes.io/part-of: heroes-service
@@ -168,15 +168,15 @@ spec:
   template:
     metadata:
       annotations:
+        app.openshift.io/connects-to: heroes-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.openshift.io/connects-to: heroes-db
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:06 +0000
-        prometheus.io/scrape: "true"
-        prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
         prometheus.io/scheme: http
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:01 +0000
+        prometheus.io/scrape: "true"
+        prometheus.io/path: /q/metrics
       labels:
         app.kubernetes.io/name: rest-heroes
         app.kubernetes.io/part-of: heroes-service
diff --git a/rest-heroes/deploy/k8s/java11-openshift.yml b/rest-heroes/deploy/k8s/java11-openshift.yml
index a8c64a7ae..7dc809ad8 100644
--- a/rest-heroes/deploy/k8s/java11-openshift.yml
+++ b/rest-heroes/deploy/k8s/java11-openshift.yml
@@ -34,11 +34,11 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:56 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:53 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -67,11 +67,11 @@ apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:56 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:53 +0000
   labels:
     name: heroes-db
     application: heroes-service
@@ -163,11 +163,11 @@ apiVersion: apps.openshift.io/v1
 kind: DeploymentConfig
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:56 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:53 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -190,11 +190,11 @@ spec:
   template:
     metadata:
       annotations:
-        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
         app.openshift.io/connects-to: heroes-db
         app.openshift.io/vcs-ref: main
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:56 +0000
+        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:53 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
@@ -249,25 +249,16 @@ spec:
               memory: 768Mi
             requests:
               memory: 256Mi
-  triggers:
-    - imageChangeParams:
-        automatic: true
-        containerNames:
-          - rest-heroes
-        from:
-          kind: ImageStreamTag
-          name: rest-heroes:java11-latest
-      type: ImageChange
 ---
 apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:56 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:53 +0000
   labels:
     app.kubernetes.io/name: rest-heroes
     app.kubernetes.io/part-of: heroes-service
diff --git a/rest-heroes/deploy/k8s/java17-knative.yml b/rest-heroes/deploy/k8s/java17-knative.yml
index bbe4fb59e..cf5c05490 100644
--- a/rest-heroes/deploy/k8s/java17-knative.yml
+++ b/rest-heroes/deploy/k8s/java17-knative.yml
@@ -6,8 +6,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:27:33 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:45:20 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -17,9 +17,9 @@ metadata:
     app.openshift.io/runtime: quarkus
     application: heroes-service
     system: quarkus-super-heroes
-    app.kubernetes.io/part-of: heroes-service
-    app.kubernetes.io/version: java17-latest
     app.kubernetes.io/name: rest-heroes
+    app.kubernetes.io/version: java17-latest
+    app.kubernetes.io/part-of: heroes-service
   name: rest-heroes
 spec:
   template:
@@ -28,8 +28,8 @@ spec:
         app.openshift.io/connects-to: heroes-db
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:27:33 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:45:20 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
@@ -39,9 +39,9 @@ spec:
         app.openshift.io/runtime: quarkus
         application: heroes-service
         system: quarkus-super-heroes
-        app.kubernetes.io/part-of: heroes-service
-        app.kubernetes.io/version: java17-latest
         app.kubernetes.io/name: rest-heroes
+        app.kubernetes.io/version: java17-latest
+        app.kubernetes.io/part-of: heroes-service
     spec:
       containers:
         - envFrom:
diff --git a/rest-heroes/deploy/k8s/java17-kubernetes.yml b/rest-heroes/deploy/k8s/java17-kubernetes.yml
index 358aa3955..61e6186df 100644
--- a/rest-heroes/deploy/k8s/java17-kubernetes.yml
+++ b/rest-heroes/deploy/k8s/java17-kubernetes.yml
@@ -37,8 +37,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:01 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:42:54 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -143,8 +143,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:01 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:42:54 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -153,25 +153,25 @@ metadata:
     app: rest-heroes
     application: heroes-service
     system: quarkus-super-heroes
-    app.kubernetes.io/name: rest-heroes
     app.kubernetes.io/version: java17-latest
     app.kubernetes.io/part-of: heroes-service
+    app.kubernetes.io/name: rest-heroes
   name: rest-heroes
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: rest-heroes
       app.kubernetes.io/version: java17-latest
       app.kubernetes.io/part-of: heroes-service
+      app.kubernetes.io/name: rest-heroes
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: heroes-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:01 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:42:54 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
@@ -180,9 +180,9 @@ spec:
         app: rest-heroes
         application: heroes-service
         system: quarkus-super-heroes
-        app.kubernetes.io/name: rest-heroes
         app.kubernetes.io/version: java17-latest
         app.kubernetes.io/part-of: heroes-service
+        app.kubernetes.io/name: rest-heroes
     spec:
       containers:
         - env:
diff --git a/rest-heroes/deploy/k8s/java17-minikube.yml b/rest-heroes/deploy/k8s/java17-minikube.yml
index 5e4eb342a..b71fd288d 100644
--- a/rest-heroes/deploy/k8s/java17-minikube.yml
+++ b/rest-heroes/deploy/k8s/java17-minikube.yml
@@ -37,8 +37,8 @@ metadata:
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: heroes-db
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:51 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:45 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -144,8 +144,8 @@ metadata:
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: heroes-db
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:51 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:45 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -171,8 +171,8 @@ spec:
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
         app.openshift.io/connects-to: heroes-db
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:51 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:45 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
diff --git a/rest-heroes/deploy/k8s/java17-openshift.yml b/rest-heroes/deploy/k8s/java17-openshift.yml
index e43af946f..b2f037645 100644
--- a/rest-heroes/deploy/k8s/java17-openshift.yml
+++ b/rest-heroes/deploy/k8s/java17-openshift.yml
@@ -34,11 +34,11 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:42 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:33 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -67,11 +67,11 @@ apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
   annotations:
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:42 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:33 +0000
   labels:
     name: heroes-db
     application: heroes-service
@@ -163,11 +163,11 @@ apiVersion: apps.openshift.io/v1
 kind: DeploymentConfig
 metadata:
   annotations:
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:42 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:33 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -190,11 +190,11 @@ spec:
   template:
     metadata:
       annotations:
+        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
         app.openshift.io/connects-to: heroes-db
         app.openshift.io/vcs-ref: main
-        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:42 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:33 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
@@ -249,16 +249,25 @@ spec:
               memory: 768Mi
             requests:
               memory: 256Mi
+  triggers:
+    - imageChangeParams:
+        automatic: true
+        containerNames:
+          - rest-heroes
+        from:
+          kind: ImageStreamTag
+          name: rest-heroes:java17-latest
+      type: ImageChange
 ---
 apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
   annotations:
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:42 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:33 +0000
   labels:
     app.kubernetes.io/name: rest-heroes
     app.kubernetes.io/part-of: heroes-service
diff --git a/rest-heroes/deploy/k8s/native-java11-knative.yml b/rest-heroes/deploy/k8s/native-java11-knative.yml
index 965f33d9b..619cccf8d 100644
--- a/rest-heroes/deploy/k8s/native-java11-knative.yml
+++ b/rest-heroes/deploy/k8s/native-java11-knative.yml
@@ -6,8 +6,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:24:10 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:42:04 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -17,8 +17,8 @@ metadata:
     app.openshift.io/runtime: quarkus
     application: heroes-service
     system: quarkus-super-heroes
-    app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/part-of: heroes-service
+    app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/name: rest-heroes
   name: rest-heroes
 spec:
@@ -28,8 +28,8 @@ spec:
         app.openshift.io/connects-to: heroes-db
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:24:10 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:42:04 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
@@ -39,8 +39,8 @@ spec:
         app.openshift.io/runtime: quarkus
         application: heroes-service
         system: quarkus-super-heroes
-        app.kubernetes.io/version: native-java11-latest
         app.kubernetes.io/part-of: heroes-service
+        app.kubernetes.io/version: native-java11-latest
         app.kubernetes.io/name: rest-heroes
     spec:
       containers:
diff --git a/rest-heroes/deploy/k8s/native-java11-kubernetes.yml b/rest-heroes/deploy/k8s/native-java11-kubernetes.yml
index d813d7e39..30bf3f0e4 100644
--- a/rest-heroes/deploy/k8s/native-java11-kubernetes.yml
+++ b/rest-heroes/deploy/k8s/native-java11-kubernetes.yml
@@ -37,8 +37,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:21:38 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:39:35 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -143,8 +143,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:21:38 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:39:35 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -170,8 +170,8 @@ spec:
         app.openshift.io/connects-to: heroes-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:21:38 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:39:35 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
diff --git a/rest-heroes/deploy/k8s/native-java11-minikube.yml b/rest-heroes/deploy/k8s/native-java11-minikube.yml
index eed25b3c7..89b74c036 100644
--- a/rest-heroes/deploy/k8s/native-java11-minikube.yml
+++ b/rest-heroes/deploy/k8s/native-java11-minikube.yml
@@ -34,11 +34,11 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
+    app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.openshift.io/connects-to: heroes-db
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:22:29 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:40:24 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -141,11 +141,11 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
+    app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.openshift.io/connects-to: heroes-db
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:22:29 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:40:24 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -168,11 +168,11 @@ spec:
   template:
     metadata:
       annotations:
+        app.openshift.io/connects-to: heroes-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.openshift.io/connects-to: heroes-db
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:22:29 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:40:24 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
diff --git a/rest-heroes/deploy/k8s/native-java11-openshift.yml b/rest-heroes/deploy/k8s/native-java11-openshift.yml
index 910154638..96852b09a 100644
--- a/rest-heroes/deploy/k8s/native-java11-openshift.yml
+++ b/rest-heroes/deploy/k8s/native-java11-openshift.yml
@@ -37,8 +37,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:19 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:16 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -70,8 +70,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:19 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:16 +0000
   labels:
     name: heroes-db
     application: heroes-service
@@ -79,8 +79,8 @@ metadata:
     app: rest-heroes
     app.openshift.io/runtime: quarkus
     app.kubernetes.io/name: rest-heroes
-    app.kubernetes.io/part-of: heroes-service
     app.kubernetes.io/version: native-java11-latest
+    app.kubernetes.io/part-of: heroes-service
   name: rest-heroes
 spec:
   dockerImageRepository: quay.io/quarkus-super-heroes/rest-heroes
@@ -166,8 +166,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:19 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:16 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -178,23 +178,23 @@ metadata:
     system: quarkus-super-heroes
     app.openshift.io/runtime: quarkus
     app.kubernetes.io/name: rest-heroes
-    app.kubernetes.io/part-of: heroes-service
     app.kubernetes.io/version: native-java11-latest
+    app.kubernetes.io/part-of: heroes-service
   name: rest-heroes
 spec:
   replicas: 1
   selector:
     app.kubernetes.io/name: rest-heroes
-    app.kubernetes.io/part-of: heroes-service
     app.kubernetes.io/version: native-java11-latest
+    app.kubernetes.io/part-of: heroes-service
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: heroes-db
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:19 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:16 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
@@ -205,8 +205,8 @@ spec:
         system: quarkus-super-heroes
         app.openshift.io/runtime: quarkus
         app.kubernetes.io/name: rest-heroes
-        app.kubernetes.io/part-of: heroes-service
         app.kubernetes.io/version: native-java11-latest
+        app.kubernetes.io/part-of: heroes-service
     spec:
       containers:
         - env:
@@ -257,8 +257,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:19 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:16 +0000
   labels:
     app.kubernetes.io/name: rest-heroes
     app.kubernetes.io/part-of: heroes-service
diff --git a/rest-heroes/deploy/k8s/native-java17-knative.yml b/rest-heroes/deploy/k8s/native-java17-knative.yml
index 787a905bc..a2d025bc5 100644
--- a/rest-heroes/deploy/k8s/native-java17-knative.yml
+++ b/rest-heroes/deploy/k8s/native-java17-knative.yml
@@ -6,8 +6,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:56 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:40 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -17,9 +17,9 @@ metadata:
     app.openshift.io/runtime: quarkus
     application: heroes-service
     system: quarkus-super-heroes
+    app.kubernetes.io/version: native-java17-latest
     app.kubernetes.io/part-of: heroes-service
     app.kubernetes.io/name: rest-heroes
-    app.kubernetes.io/version: native-java17-latest
   name: rest-heroes
 spec:
   template:
@@ -28,8 +28,8 @@ spec:
         app.openshift.io/connects-to: heroes-db
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:56 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:40 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
@@ -39,9 +39,9 @@ spec:
         app.openshift.io/runtime: quarkus
         application: heroes-service
         system: quarkus-super-heroes
+        app.kubernetes.io/version: native-java17-latest
         app.kubernetes.io/part-of: heroes-service
         app.kubernetes.io/name: rest-heroes
-        app.kubernetes.io/version: native-java17-latest
     spec:
       containers:
         - envFrom:
diff --git a/rest-heroes/deploy/k8s/native-java17-kubernetes.yml b/rest-heroes/deploy/k8s/native-java17-kubernetes.yml
index a878d0489..4ab353c59 100644
--- a/rest-heroes/deploy/k8s/native-java17-kubernetes.yml
+++ b/rest-heroes/deploy/k8s/native-java17-kubernetes.yml
@@ -37,8 +37,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:28:24 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:08 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -143,8 +143,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:28:24 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:08 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -154,24 +154,24 @@ metadata:
     application: heroes-service
     system: quarkus-super-heroes
     app.kubernetes.io/part-of: heroes-service
-    app.kubernetes.io/version: native-java17-latest
     app.kubernetes.io/name: rest-heroes
+    app.kubernetes.io/version: native-java17-latest
   name: rest-heroes
 spec:
   replicas: 1
   selector:
     matchLabels:
       app.kubernetes.io/part-of: heroes-service
-      app.kubernetes.io/version: native-java17-latest
       app.kubernetes.io/name: rest-heroes
+      app.kubernetes.io/version: native-java17-latest
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: heroes-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:28:24 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:08 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
@@ -181,8 +181,8 @@ spec:
         application: heroes-service
         system: quarkus-super-heroes
         app.kubernetes.io/part-of: heroes-service
-        app.kubernetes.io/version: native-java17-latest
         app.kubernetes.io/name: rest-heroes
+        app.kubernetes.io/version: native-java17-latest
     spec:
       containers:
         - env:
diff --git a/rest-heroes/deploy/k8s/native-java17-minikube.yml b/rest-heroes/deploy/k8s/native-java17-minikube.yml
index 71fdc3808..dbede5087 100644
--- a/rest-heroes/deploy/k8s/native-java17-minikube.yml
+++ b/rest-heroes/deploy/k8s/native-java17-minikube.yml
@@ -34,11 +34,11 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
+    app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.openshift.io/connects-to: heroes-db
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:15 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:58 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -141,11 +141,11 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
+    app.openshift.io/connects-to: heroes-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.openshift.io/connects-to: heroes-db
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:15 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:58 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -168,11 +168,11 @@ spec:
   template:
     metadata:
       annotations:
+        app.openshift.io/connects-to: heroes-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.openshift.io/connects-to: heroes-db
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:15 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:58 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
diff --git a/rest-heroes/deploy/k8s/native-java17-openshift.yml b/rest-heroes/deploy/k8s/native-java17-openshift.yml
index aae1e9045..a61687ff4 100644
--- a/rest-heroes/deploy/k8s/native-java17-openshift.yml
+++ b/rest-heroes/deploy/k8s/native-java17-openshift.yml
@@ -37,8 +37,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:05 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:50 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -70,17 +70,17 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:05 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:50 +0000
   labels:
     name: heroes-db
     application: heroes-service
     system: quarkus-super-heroes
     app: rest-heroes
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/version: native-java17-latest
-    app.kubernetes.io/name: rest-heroes
     app.kubernetes.io/part-of: heroes-service
+    app.kubernetes.io/name: rest-heroes
+    app.kubernetes.io/version: native-java17-latest
   name: rest-heroes
 spec:
   dockerImageRepository: quay.io/quarkus-super-heroes/rest-heroes
@@ -166,8 +166,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:05 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:50 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8083"
@@ -177,24 +177,24 @@ metadata:
     application: heroes-service
     system: quarkus-super-heroes
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/version: native-java17-latest
-    app.kubernetes.io/name: rest-heroes
     app.kubernetes.io/part-of: heroes-service
+    app.kubernetes.io/name: rest-heroes
+    app.kubernetes.io/version: native-java17-latest
   name: rest-heroes
 spec:
   replicas: 1
   selector:
-    app.kubernetes.io/version: native-java17-latest
-    app.kubernetes.io/name: rest-heroes
     app.kubernetes.io/part-of: heroes-service
+    app.kubernetes.io/name: rest-heroes
+    app.kubernetes.io/version: native-java17-latest
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: heroes-db
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:05 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:50 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8083"
@@ -204,9 +204,9 @@ spec:
         application: heroes-service
         system: quarkus-super-heroes
         app.openshift.io/runtime: quarkus
-        app.kubernetes.io/version: native-java17-latest
-        app.kubernetes.io/name: rest-heroes
         app.kubernetes.io/part-of: heroes-service
+        app.kubernetes.io/name: rest-heroes
+        app.kubernetes.io/version: native-java17-latest
     spec:
       containers:
         - env:
@@ -257,8 +257,8 @@ metadata:
     app.openshift.io/connects-to: heroes-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:05 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:50 +0000
   labels:
     app.kubernetes.io/name: rest-heroes
     app.kubernetes.io/part-of: heroes-service
diff --git a/rest-villains/deploy/k8s/java11-knative.yml b/rest-villains/deploy/k8s/java11-knative.yml
index 6165949e8..9c9991b5c 100644
--- a/rest-villains/deploy/k8s/java11-knative.yml
+++ b/rest-villains/deploy/k8s/java11-knative.yml
@@ -20,8 +20,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:20:34 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:32 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -31,8 +31,8 @@ metadata:
     app.openshift.io/runtime: quarkus
     application: villains-service
     system: quarkus-super-heroes
-    app.kubernetes.io/version: java11-latest
     app.kubernetes.io/part-of: villains-service
+    app.kubernetes.io/version: java11-latest
     app.kubernetes.io/name: rest-villains
   name: rest-villains
 spec:
@@ -42,8 +42,8 @@ spec:
         app.openshift.io/connects-to: villains-db
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:20:34 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:38:32 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -53,8 +53,8 @@ spec:
         app.openshift.io/runtime: quarkus
         application: villains-service
         system: quarkus-super-heroes
-        app.kubernetes.io/version: java11-latest
         app.kubernetes.io/part-of: villains-service
+        app.kubernetes.io/version: java11-latest
         app.kubernetes.io/name: rest-villains
     spec:
       containers:
diff --git a/rest-villains/deploy/k8s/java11-kubernetes.yml b/rest-villains/deploy/k8s/java11-kubernetes.yml
index 22d112266..b10753d2e 100644
--- a/rest-villains/deploy/k8s/java11-kubernetes.yml
+++ b/rest-villains/deploy/k8s/java11-kubernetes.yml
@@ -20,8 +20,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:17:56 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:35:51 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -96,8 +96,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:17:56 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:35:51 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -106,25 +106,25 @@ metadata:
     app: rest-villains
     application: villains-service
     system: quarkus-super-heroes
-    app.kubernetes.io/name: rest-villains
-    app.kubernetes.io/part-of: villains-service
     app.kubernetes.io/version: java11-latest
+    app.kubernetes.io/part-of: villains-service
+    app.kubernetes.io/name: rest-villains
   name: rest-villains
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: rest-villains
-      app.kubernetes.io/part-of: villains-service
       app.kubernetes.io/version: java11-latest
+      app.kubernetes.io/part-of: villains-service
+      app.kubernetes.io/name: rest-villains
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: villains-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:17:56 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:35:51 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -133,9 +133,9 @@ spec:
         app: rest-villains
         application: villains-service
         system: quarkus-super-heroes
-        app.kubernetes.io/name: rest-villains
-        app.kubernetes.io/part-of: villains-service
         app.kubernetes.io/version: java11-latest
+        app.kubernetes.io/part-of: villains-service
+        app.kubernetes.io/name: rest-villains
     spec:
       containers:
         - env:
diff --git a/rest-villains/deploy/k8s/java11-minikube.yml b/rest-villains/deploy/k8s/java11-minikube.yml
index 976d66da4..1b5e93590 100644
--- a/rest-villains/deploy/k8s/java11-minikube.yml
+++ b/rest-villains/deploy/k8s/java11-minikube.yml
@@ -20,8 +20,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:18:53 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:36:49 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -97,8 +97,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:18:53 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:36:49 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -124,8 +124,8 @@ spec:
         app.openshift.io/connects-to: villains-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:18:53 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:36:49 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
diff --git a/rest-villains/deploy/k8s/java11-openshift.yml b/rest-villains/deploy/k8s/java11-openshift.yml
index d7acebde4..56355a63a 100644
--- a/rest-villains/deploy/k8s/java11-openshift.yml
+++ b/rest-villains/deploy/k8s/java11-openshift.yml
@@ -20,8 +20,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:44 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:40 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -70,17 +70,17 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:44 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:40 +0000
   labels:
     name: villains-db
     application: villains-service
     system: quarkus-super-heroes
     app: rest-villains
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/version: java11-latest
     app.kubernetes.io/part-of: villains-service
     app.kubernetes.io/name: rest-villains
+    app.kubernetes.io/version: java11-latest
   name: rest-villains
 spec:
   dockerImageRepository: quay.io/quarkus-super-heroes/rest-villains
@@ -165,8 +165,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:44 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:40 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -176,24 +176,24 @@ metadata:
     application: villains-service
     system: quarkus-super-heroes
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/version: java11-latest
     app.kubernetes.io/part-of: villains-service
     app.kubernetes.io/name: rest-villains
+    app.kubernetes.io/version: java11-latest
   name: rest-villains
 spec:
   replicas: 1
   selector:
-    app.kubernetes.io/version: java11-latest
     app.kubernetes.io/part-of: villains-service
     app.kubernetes.io/name: rest-villains
+    app.kubernetes.io/version: java11-latest
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: villains-db
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:44 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:40 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -203,9 +203,9 @@ spec:
         application: villains-service
         system: quarkus-super-heroes
         app.openshift.io/runtime: quarkus
-        app.kubernetes.io/version: java11-latest
         app.kubernetes.io/part-of: villains-service
         app.kubernetes.io/name: rest-villains
+        app.kubernetes.io/version: java11-latest
     spec:
       containers:
         - env:
@@ -256,8 +256,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:19:44 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:37:40 +0000
   labels:
     app.kubernetes.io/name: rest-villains
     app.kubernetes.io/part-of: villains-service
diff --git a/rest-villains/deploy/k8s/java17-knative.yml b/rest-villains/deploy/k8s/java17-knative.yml
index 6fd8bf5a6..cf331052d 100644
--- a/rest-villains/deploy/k8s/java17-knative.yml
+++ b/rest-villains/deploy/k8s/java17-knative.yml
@@ -20,8 +20,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:27:21 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:45:08 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -31,9 +31,9 @@ metadata:
     app.openshift.io/runtime: quarkus
     application: villains-service
     system: quarkus-super-heroes
-    app.kubernetes.io/version: java17-latest
-    app.kubernetes.io/name: rest-villains
     app.kubernetes.io/part-of: villains-service
+    app.kubernetes.io/name: rest-villains
+    app.kubernetes.io/version: java17-latest
   name: rest-villains
 spec:
   template:
@@ -42,8 +42,8 @@ spec:
         app.openshift.io/connects-to: villains-db
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:27:21 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:45:08 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -53,9 +53,9 @@ spec:
         app.openshift.io/runtime: quarkus
         application: villains-service
         system: quarkus-super-heroes
-        app.kubernetes.io/version: java17-latest
-        app.kubernetes.io/name: rest-villains
         app.kubernetes.io/part-of: villains-service
+        app.kubernetes.io/name: rest-villains
+        app.kubernetes.io/version: java17-latest
     spec:
       containers:
         - envFrom:
diff --git a/rest-villains/deploy/k8s/java17-kubernetes.yml b/rest-villains/deploy/k8s/java17-kubernetes.yml
index 7cd31f6fa..fbd850df6 100644
--- a/rest-villains/deploy/k8s/java17-kubernetes.yml
+++ b/rest-villains/deploy/k8s/java17-kubernetes.yml
@@ -20,8 +20,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:24:48 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:42:42 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -96,8 +96,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:24:48 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:42:42 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -107,24 +107,24 @@ metadata:
     application: villains-service
     system: quarkus-super-heroes
     app.kubernetes.io/name: rest-villains
-    app.kubernetes.io/part-of: villains-service
     app.kubernetes.io/version: java17-latest
+    app.kubernetes.io/part-of: villains-service
   name: rest-villains
 spec:
   replicas: 1
   selector:
     matchLabels:
       app.kubernetes.io/name: rest-villains
-      app.kubernetes.io/part-of: villains-service
       app.kubernetes.io/version: java17-latest
+      app.kubernetes.io/part-of: villains-service
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: villains-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:24:48 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:42:42 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -134,8 +134,8 @@ spec:
         application: villains-service
         system: quarkus-super-heroes
         app.kubernetes.io/name: rest-villains
-        app.kubernetes.io/part-of: villains-service
         app.kubernetes.io/version: java17-latest
+        app.kubernetes.io/part-of: villains-service
     spec:
       containers:
         - env:
diff --git a/rest-villains/deploy/k8s/java17-minikube.yml b/rest-villains/deploy/k8s/java17-minikube.yml
index 4ad374447..e0fe1b68f 100644
--- a/rest-villains/deploy/k8s/java17-minikube.yml
+++ b/rest-villains/deploy/k8s/java17-minikube.yml
@@ -20,12 +20,12 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:39 +0000
-    prometheus.io/scrape: "true"
-    prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
     prometheus.io/scheme: http
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:33 +0000
+    prometheus.io/scrape: "true"
+    prometheus.io/path: /q/metrics
   labels:
     app.kubernetes.io/name: rest-villains
     app.kubernetes.io/part-of: villains-service
@@ -97,12 +97,12 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:39 +0000
-    prometheus.io/scrape: "true"
-    prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
     prometheus.io/scheme: http
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:33 +0000
+    prometheus.io/scrape: "true"
+    prometheus.io/path: /q/metrics
   labels:
     app.kubernetes.io/name: rest-villains
     app.kubernetes.io/part-of: villains-service
@@ -124,12 +124,12 @@ spec:
         app.openshift.io/connects-to: villains-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:25:39 +0000
-        prometheus.io/scrape: "true"
-        prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
         prometheus.io/scheme: http
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:43:33 +0000
+        prometheus.io/scrape: "true"
+        prometheus.io/path: /q/metrics
       labels:
         app.kubernetes.io/name: rest-villains
         app.kubernetes.io/part-of: villains-service
diff --git a/rest-villains/deploy/k8s/java17-openshift.yml b/rest-villains/deploy/k8s/java17-openshift.yml
index bbbcd801e..0860d647f 100644
--- a/rest-villains/deploy/k8s/java17-openshift.yml
+++ b/rest-villains/deploy/k8s/java17-openshift.yml
@@ -17,11 +17,11 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:30 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:21 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -67,20 +67,20 @@ apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:30 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:21 +0000
   labels:
     name: villains-db
     application: villains-service
     system: quarkus-super-heroes
     app: rest-villains
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/name: rest-villains
     app.kubernetes.io/version: java17-latest
     app.kubernetes.io/part-of: villains-service
+    app.kubernetes.io/name: rest-villains
   name: rest-villains
 spec:
   dockerImageRepository: quay.io/quarkus-super-heroes/rest-villains
@@ -162,11 +162,11 @@ apiVersion: apps.openshift.io/v1
 kind: DeploymentConfig
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:30 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:21 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -176,24 +176,24 @@ metadata:
     application: villains-service
     system: quarkus-super-heroes
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/name: rest-villains
     app.kubernetes.io/version: java17-latest
     app.kubernetes.io/part-of: villains-service
+    app.kubernetes.io/name: rest-villains
   name: rest-villains
 spec:
   replicas: 1
   selector:
-    app.kubernetes.io/name: rest-villains
     app.kubernetes.io/version: java17-latest
     app.kubernetes.io/part-of: villains-service
+    app.kubernetes.io/name: rest-villains
   template:
     metadata:
       annotations:
-        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
         app.openshift.io/connects-to: villains-db
         app.openshift.io/vcs-ref: main
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:30 +0000
+        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:21 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -203,9 +203,9 @@ spec:
         application: villains-service
         system: quarkus-super-heroes
         app.openshift.io/runtime: quarkus
-        app.kubernetes.io/name: rest-villains
         app.kubernetes.io/version: java17-latest
         app.kubernetes.io/part-of: villains-service
+        app.kubernetes.io/name: rest-villains
     spec:
       containers:
         - env:
@@ -248,25 +248,16 @@ spec:
               memory: 768Mi
             requests:
               memory: 256Mi
-  triggers:
-    - imageChangeParams:
-        automatic: true
-        containerNames:
-          - rest-villains
-        from:
-          kind: ImageStreamTag
-          name: rest-villains:java17-latest
-      type: ImageChange
 ---
 apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:26:30 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:44:21 +0000
   labels:
     app.kubernetes.io/name: rest-villains
     app.kubernetes.io/part-of: villains-service
diff --git a/rest-villains/deploy/k8s/native-java11-knative.yml b/rest-villains/deploy/k8s/native-java11-knative.yml
index 8bdf7ae52..3aeedd4e6 100644
--- a/rest-villains/deploy/k8s/native-java11-knative.yml
+++ b/rest-villains/deploy/k8s/native-java11-knative.yml
@@ -20,8 +20,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:58 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:53 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -31,8 +31,8 @@ metadata:
     app.openshift.io/runtime: quarkus
     application: villains-service
     system: quarkus-super-heroes
-    app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/name: rest-villains
+    app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/part-of: villains-service
   name: rest-villains
 spec:
@@ -42,8 +42,8 @@ spec:
         app.openshift.io/connects-to: villains-db
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:58 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:53 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -53,8 +53,8 @@ spec:
         app.openshift.io/runtime: quarkus
         application: villains-service
         system: quarkus-super-heroes
-        app.kubernetes.io/version: native-java11-latest
         app.kubernetes.io/name: rest-villains
+        app.kubernetes.io/version: native-java11-latest
         app.kubernetes.io/part-of: villains-service
     spec:
       containers:
diff --git a/rest-villains/deploy/k8s/native-java11-kubernetes.yml b/rest-villains/deploy/k8s/native-java11-kubernetes.yml
index 027435d5d..1e52aa601 100644
--- a/rest-villains/deploy/k8s/native-java11-kubernetes.yml
+++ b/rest-villains/deploy/k8s/native-java11-kubernetes.yml
@@ -20,8 +20,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:21:26 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:39:23 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -96,8 +96,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:21:26 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:39:23 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -106,16 +106,16 @@ metadata:
     app: rest-villains
     application: villains-service
     system: quarkus-super-heroes
-    app.kubernetes.io/name: rest-villains
     app.kubernetes.io/part-of: villains-service
+    app.kubernetes.io/name: rest-villains
     app.kubernetes.io/version: native-java11-latest
   name: rest-villains
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: rest-villains
       app.kubernetes.io/part-of: villains-service
+      app.kubernetes.io/name: rest-villains
       app.kubernetes.io/version: native-java11-latest
   template:
     metadata:
@@ -123,8 +123,8 @@ spec:
         app.openshift.io/connects-to: villains-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:21:26 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:39:23 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -133,8 +133,8 @@ spec:
         app: rest-villains
         application: villains-service
         system: quarkus-super-heroes
-        app.kubernetes.io/name: rest-villains
         app.kubernetes.io/part-of: villains-service
+        app.kubernetes.io/name: rest-villains
         app.kubernetes.io/version: native-java11-latest
     spec:
       containers:
diff --git a/rest-villains/deploy/k8s/native-java11-minikube.yml b/rest-villains/deploy/k8s/native-java11-minikube.yml
index 78b16ed3a..99784f058 100644
--- a/rest-villains/deploy/k8s/native-java11-minikube.yml
+++ b/rest-villains/deploy/k8s/native-java11-minikube.yml
@@ -20,8 +20,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:22:17 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:40:12 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -97,8 +97,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:22:17 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:40:12 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -124,8 +124,8 @@ spec:
         app.openshift.io/connects-to: villains-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:22:17 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:40:12 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
diff --git a/rest-villains/deploy/k8s/native-java11-openshift.yml b/rest-villains/deploy/k8s/native-java11-openshift.yml
index 88656fef5..818bdd34e 100644
--- a/rest-villains/deploy/k8s/native-java11-openshift.yml
+++ b/rest-villains/deploy/k8s/native-java11-openshift.yml
@@ -17,11 +17,11 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:07 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:04 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -67,19 +67,19 @@ apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:07 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:04 +0000
   labels:
     name: villains-db
     application: villains-service
     system: quarkus-super-heroes
     app: rest-villains
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/name: rest-villains
+    app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/part-of: villains-service
   name: rest-villains
 spec:
@@ -162,11 +162,11 @@ apiVersion: apps.openshift.io/v1
 kind: DeploymentConfig
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:07 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:04 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -176,24 +176,24 @@ metadata:
     application: villains-service
     system: quarkus-super-heroes
     app.openshift.io/runtime: quarkus
-    app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/name: rest-villains
+    app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/part-of: villains-service
   name: rest-villains
 spec:
   replicas: 1
   selector:
-    app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/name: rest-villains
+    app.kubernetes.io/version: native-java11-latest
     app.kubernetes.io/part-of: villains-service
   template:
     metadata:
       annotations:
-        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
         app.openshift.io/connects-to: villains-db
         app.openshift.io/vcs-ref: main
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:07 +0000
+        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:04 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -203,8 +203,8 @@ spec:
         application: villains-service
         system: quarkus-super-heroes
         app.openshift.io/runtime: quarkus
-        app.kubernetes.io/version: native-java11-latest
         app.kubernetes.io/name: rest-villains
+        app.kubernetes.io/version: native-java11-latest
         app.kubernetes.io/part-of: villains-service
     spec:
       containers:
@@ -248,25 +248,16 @@ spec:
               memory: 128Mi
             requests:
               memory: 32Mi
-  triggers:
-    - imageChangeParams:
-        automatic: true
-        containerNames:
-          - rest-villains
-        from:
-          kind: ImageStreamTag
-          name: rest-villains:native-java11-latest
-      type: ImageChange
 ---
 apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
   annotations:
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:23:07 +0000
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:41:04 +0000
   labels:
     app.kubernetes.io/name: rest-villains
     app.kubernetes.io/part-of: villains-service
diff --git a/rest-villains/deploy/k8s/native-java17-knative.yml b/rest-villains/deploy/k8s/native-java17-knative.yml
index b3a9ca29d..22e68478f 100644
--- a/rest-villains/deploy/k8s/native-java17-knative.yml
+++ b/rest-villains/deploy/k8s/native-java17-knative.yml
@@ -20,8 +20,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
     app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:44 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:28 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -31,9 +31,9 @@ metadata:
     app.openshift.io/runtime: quarkus
     application: villains-service
     system: quarkus-super-heroes
+    app.kubernetes.io/name: rest-villains
     app.kubernetes.io/version: native-java17-latest
     app.kubernetes.io/part-of: villains-service
-    app.kubernetes.io/name: rest-villains
   name: rest-villains
 spec:
   template:
@@ -42,8 +42,8 @@ spec:
         app.openshift.io/connects-to: villains-db
         app.openshift.io/vcs-ref: main
         app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:30:44 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:48:28 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -53,9 +53,9 @@ spec:
         app.openshift.io/runtime: quarkus
         application: villains-service
         system: quarkus-super-heroes
+        app.kubernetes.io/name: rest-villains
         app.kubernetes.io/version: native-java17-latest
         app.kubernetes.io/part-of: villains-service
-        app.kubernetes.io/name: rest-villains
     spec:
       containers:
         - envFrom:
diff --git a/rest-villains/deploy/k8s/native-java17-kubernetes.yml b/rest-villains/deploy/k8s/native-java17-kubernetes.yml
index bb3edd212..b33a289ab 100644
--- a/rest-villains/deploy/k8s/native-java17-kubernetes.yml
+++ b/rest-villains/deploy/k8s/native-java17-kubernetes.yml
@@ -20,8 +20,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:28:11 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:45:57 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -96,8 +96,8 @@ metadata:
     app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:28:11 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:45:57 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -106,25 +106,25 @@ metadata:
     app: rest-villains
     application: villains-service
     system: quarkus-super-heroes
-    app.kubernetes.io/version: native-java17-latest
     app.kubernetes.io/part-of: villains-service
     app.kubernetes.io/name: rest-villains
+    app.kubernetes.io/version: native-java17-latest
   name: rest-villains
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/version: native-java17-latest
       app.kubernetes.io/part-of: villains-service
       app.kubernetes.io/name: rest-villains
+      app.kubernetes.io/version: native-java17-latest
   template:
     metadata:
       annotations:
         app.openshift.io/connects-to: villains-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:28:11 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:45:57 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -133,9 +133,9 @@ spec:
         app: rest-villains
         application: villains-service
         system: quarkus-super-heroes
-        app.kubernetes.io/version: native-java17-latest
         app.kubernetes.io/part-of: villains-service
         app.kubernetes.io/name: rest-villains
+        app.kubernetes.io/version: native-java17-latest
     spec:
       containers:
         - env:
diff --git a/rest-villains/deploy/k8s/native-java17-minikube.yml b/rest-villains/deploy/k8s/native-java17-minikube.yml
index 96c002fef..9a7000944 100644
--- a/rest-villains/deploy/k8s/native-java17-minikube.yml
+++ b/rest-villains/deploy/k8s/native-java17-minikube.yml
@@ -17,11 +17,11 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:02 +0000
+    app.openshift.io/connects-to: villains-db
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:46 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -94,11 +94,11 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
-    app.openshift.io/connects-to: villains-db
     app.quarkus.io/vcs-ref: main
     app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:02 +0000
+    app.openshift.io/connects-to: villains-db
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:46 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -121,11 +121,11 @@ spec:
   template:
     metadata:
       annotations:
-        app.openshift.io/connects-to: villains-db
         app.quarkus.io/vcs-ref: main
         app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:02 +0000
+        app.openshift.io/connects-to: villains-db
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:46:46 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
diff --git a/rest-villains/deploy/k8s/native-java17-openshift.yml b/rest-villains/deploy/k8s/native-java17-openshift.yml
index 165072720..0520d7dd5 100644
--- a/rest-villains/deploy/k8s/native-java17-openshift.yml
+++ b/rest-villains/deploy/k8s/native-java17-openshift.yml
@@ -17,11 +17,11 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:53 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:37 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -67,20 +67,20 @@ apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
   annotations:
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:53 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:37 +0000
   labels:
     name: villains-db
     application: villains-service
     system: quarkus-super-heroes
     app: rest-villains
     app.openshift.io/runtime: quarkus
+    app.kubernetes.io/version: native-java17-latest
     app.kubernetes.io/part-of: villains-service
     app.kubernetes.io/name: rest-villains
-    app.kubernetes.io/version: native-java17-latest
   name: rest-villains
 spec:
   dockerImageRepository: quay.io/quarkus-super-heroes/rest-villains
@@ -162,11 +162,11 @@ apiVersion: apps.openshift.io/v1
 kind: DeploymentConfig
 metadata:
   annotations:
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:53 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:37 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8084"
@@ -176,24 +176,24 @@ metadata:
     application: villains-service
     system: quarkus-super-heroes
     app.openshift.io/runtime: quarkus
+    app.kubernetes.io/version: native-java17-latest
     app.kubernetes.io/part-of: villains-service
     app.kubernetes.io/name: rest-villains
-    app.kubernetes.io/version: native-java17-latest
   name: rest-villains
 spec:
   replicas: 1
   selector:
+    app.kubernetes.io/version: native-java17-latest
     app.kubernetes.io/part-of: villains-service
     app.kubernetes.io/name: rest-villains
-    app.kubernetes.io/version: native-java17-latest
   template:
     metadata:
       annotations:
+        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
         app.openshift.io/connects-to: villains-db
         app.openshift.io/vcs-ref: main
-        app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-        app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-        app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:53 +0000
+        app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+        app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:37 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8084"
@@ -203,9 +203,9 @@ spec:
         application: villains-service
         system: quarkus-super-heroes
         app.openshift.io/runtime: quarkus
+        app.kubernetes.io/version: native-java17-latest
         app.kubernetes.io/part-of: villains-service
         app.kubernetes.io/name: rest-villains
-        app.kubernetes.io/version: native-java17-latest
     spec:
       containers:
         - env:
@@ -248,16 +248,25 @@ spec:
               memory: 128Mi
             requests:
               memory: 32Mi
+  triggers:
+    - imageChangeParams:
+        automatic: true
+        containerNames:
+          - rest-villains
+        from:
+          kind: ImageStreamTag
+          name: rest-villains:native-java17-latest
+      type: ImageChange
 ---
 apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
   annotations:
+    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
     app.openshift.io/connects-to: villains-db
     app.openshift.io/vcs-ref: main
-    app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes
-    app.quarkus.io/commit-id: 397e5e177d002fc3aa59edcdf54236723c2585fe
-    app.quarkus.io/build-timestamp: 2022-02-07 - 20:29:53 +0000
+    app.quarkus.io/commit-id: b8b6139e57d0072059c5e6a2797ba996320d0f83
+    app.quarkus.io/build-timestamp: 2022-02-07 - 20:47:37 +0000
   labels:
     app.kubernetes.io/name: rest-villains
     app.kubernetes.io/part-of: villains-service