diff --git a/local/application/values.yaml b/local/application/values.yaml
index a81c714c..0bd28d75 100644
--- a/local/application/values.yaml
+++ b/local/application/values.yaml
@@ -9,7 +9,7 @@ local: &localConfig
 
 global:
   tracing:
-    url: http://zipkin.istio-system:9411
+    endpoint: http://zipkin.istio-system:9411/api/v2/spans
 
 dima-frontend:
   image:
diff --git a/local/kubernetes/10_build_dima.sh b/local/kubernetes/10_build_dima.sh
index 349e3ffe..52e90721 100755
--- a/local/kubernetes/10_build_dima.sh
+++ b/local/kubernetes/10_build_dima.sh
@@ -1,9 +1,24 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-export GKE_REGISTRY=local
+script_dir="$(dirname "$0")"
 
-GITHUB_SHA="$(git rev-parse --short HEAD)-snapshot"
-export GITHUB_SHA
+image_prefix="local/dima-"
+image_tag="$(git rev-parse --short HEAD)-snapshot"
 
-docker compose -f ../../stack/compose/docker-compose.yml -f ../../stack/compose/docker-compose-registry-tags.yml build --parallel
\ No newline at end of file
+services=(
+  "imageorchestrator"
+  "imageholder"
+  "imagerotator"
+  "imagegrayscale"
+  "imageresize"
+  "imageflip"
+  "imagethumbnail"
+  "trafficgen"
+)
+
+for service in "${services[@]}"; do
+  docker build "${script_dir}/../../stack/application/" --build-arg "SERVICE=$service"  -t "${image_prefix}${service}:${image_tag}"
+done
+
+docker build "${script_dir}/../../stack/application/frontend/" -t "${image_prefix}frontend:${image_tag}"
diff --git a/local/kubernetes/22b_deploy_logging_elastic.sh b/local/kubernetes/22b_deploy_logging_elastic.sh
index 3f2b81e2..14ed8f44 100755
--- a/local/kubernetes/22b_deploy_logging_elastic.sh
+++ b/local/kubernetes/22b_deploy_logging_elastic.sh
@@ -3,6 +3,7 @@ set -euo pipefail
 
 NAMESPACE=logging
 ELASTIC_VERSION="7.17.3"
+FLUENTD_VERSION="0.4.3"
 
 echo "=== Deploy logging stack in namespace ${NAMESPACE}"
 
@@ -22,7 +23,7 @@ echo "--- install curator"
 helm upgrade --install -n "$NAMESPACE" -f tools/logging/curator.yaml elasticsearch-curator lebenitza/elasticsearch-curator
 
 echo "--- install fluentd"
-helm upgrade --install -n "$NAMESPACE" -f tools/logging/fluentd.yaml fluentd fluent/fluentd
+helm upgrade --install -n "$NAMESPACE" -f tools/logging/fluentd.yaml fluentd fluent/fluentd --version ${FLUENTD_VERSION}
 
 echo "--- install kibana"
 helm upgrade --install -n "$NAMESPACE" -f tools/logging/kibana.yaml --version ${ELASTIC_VERSION} kibana elastic/kibana
diff --git a/local/kubernetes/infrastructure/service-ingress.yaml b/local/kubernetes/infrastructure/service-ingress.yaml
index 2db471e4..dd0b1045 100644
--- a/local/kubernetes/infrastructure/service-ingress.yaml
+++ b/local/kubernetes/infrastructure/service-ingress.yaml
@@ -9,7 +9,8 @@ metadata:
 spec:
   ingressClassName: nginx
   rules:
-  - http:
+  - host: localhost
+    http:
       paths:
       - path: "/prometheus/?(.*)"
         pathType: ImplementationSpecific
@@ -29,7 +30,8 @@ metadata:
 spec:
   ingressClassName: nginx
   rules:
-  - http:
+  - host: localhost
+    http:
       paths:
       - path: "/grafana/?(.*)"
         pathType: ImplementationSpecific
@@ -49,7 +51,8 @@ metadata:
 spec:
   ingressClassName: nginx
   rules:
-    - http:
+    - host: localhost
+      http:
         paths:
           - path: "/jaeger/?(.*)"
             pathType: ImplementationSpecific
@@ -70,7 +73,8 @@ metadata:
 spec:
   ingressClassName: nginx
   rules:
-    - http:
+    - host: localhost
+      http:
         paths:
           - path: "/kibana/?(.*)"
             pathType: ImplementationSpecific
diff --git a/local/kubernetes/tools/istio/kiali.yaml b/local/kubernetes/tools/istio/kiali.yaml
index 80423948..0c113dde 100644
--- a/local/kubernetes/tools/istio/kiali.yaml
+++ b/local/kubernetes/tools/istio/kiali.yaml
@@ -10,6 +10,7 @@ deployment:
       metadata:
         annotations:
           nginx.ingress.kubernetes.io/rewrite-target: /$1
+          nginx.ingress.kubernetes.io/use-regex: "true"
       spec:
         ingressClassName: nginx
         rules:
@@ -21,7 +22,7 @@ deployment:
                       port:
                         number: 20001
                   path: /(.*)
-                  pathType: Prefix
+                  pathType: ImplementationSpecific
   pod_annotations:
     prometheus.io/scrape: "true"
     prometheus.io/port: "9090"
diff --git a/local/kubernetes/tools/logging/curator.yaml b/local/kubernetes/tools/logging/curator.yaml
index e0db844a..df522fab 100644
--- a/local/kubernetes/tools/logging/curator.yaml
+++ b/local/kubernetes/tools/logging/curator.yaml
@@ -1,4 +1,7 @@
 ---
+image:
+  repository: bitnami/elasticsearch-curator-archived
+
 configMaps:
   action_file_yml: |-
     ---
@@ -20,7 +23,7 @@ configMaps:
           unit_count: 3
         - filtertype: pattern
           kind: regex
-          value: '^[^\.].*'    
+          value: '^[^\.].*'
   config_yml: |-
     ---
     client:
@@ -44,4 +47,4 @@ configMaps:
       loglevel: INFO
       logfile:
       logformat: default
-      blacklist: [‘elasticsearch’]
+      blacklist: ['elasticsearch']
diff --git a/local/kubernetes/tools/logging/elasticsearch.yaml b/local/kubernetes/tools/logging/elasticsearch.yaml
index fc0ef6b2..2a9000b5 100644
--- a/local/kubernetes/tools/logging/elasticsearch.yaml
+++ b/local/kubernetes/tools/logging/elasticsearch.yaml
@@ -1,20 +1,27 @@
 ---
 replicas: 1
+
+esJavaOpts: "-Xms512m -Xmx512m"
+
 resources:
   requests:
     cpu: "250m"
-    memory: "1000Mi"
+    memory: "1Gi"
   limits:
     cpu: "500m"
-    memory: "1500Mi"
+    memory: "2Gi"
+
 secret:
   enabled: true
   password: "changeme"
+
 clusterHealthCheckParams: "wait_for_status=yellow&timeout=1s"
+
 volumeClaimTemplate:
   resources:
     requests:
       storage: 10Gi
+
 lifecycle:
   postStart:
     exec:
diff --git a/local/kubernetes/tools/logging/fluentd.yaml b/local/kubernetes/tools/logging/fluentd.yaml
index 62435c30..fef917d7 100644
--- a/local/kubernetes/tools/logging/fluentd.yaml
+++ b/local/kubernetes/tools/logging/fluentd.yaml
@@ -35,6 +35,12 @@ fileConfigs:
       </parse>
       emit_unmatched_lines true
     </source>
+    <source>
+      @type prometheus
+      bind 0.0.0.0
+      port 24231
+      metrics_path /metrics
+    </source>
   02_filters.conf: |-
     <label @KUBERNETES>
       <match kubernetes.var.log.containers.fluentd**>
diff --git a/local/kubernetes/tools/logging/kibana-index/build_deploy.sh b/local/kubernetes/tools/logging/kibana-index/build_deploy.sh
index 623a97ad..e8c4b774 100755
--- a/local/kubernetes/tools/logging/kibana-index/build_deploy.sh
+++ b/local/kubernetes/tools/logging/kibana-index/build_deploy.sh
@@ -4,9 +4,10 @@ set -euo pipefail
 dir="$(dirname "$0")"
 namespace="$1"
 
-TAG="gcr.io/olly-2021-k8s-migration/kibana-index:latest"
+CLUSTER_NAME=o11y-stack
+TAG="local/kibana-index:latest"
 
 docker build "$dir" -t "$TAG"
-docker push "$TAG"
+k3d image import -c "$CLUSTER_NAME" "$TAG"
 
 kubectl apply -n "$namespace" -f "$dir/job.yaml"
\ No newline at end of file
diff --git a/local/kubernetes/tools/logging/kibana-index/job.yaml b/local/kubernetes/tools/logging/kibana-index/job.yaml
index a9d04b63..455a01b8 100644
--- a/local/kubernetes/tools/logging/kibana-index/job.yaml
+++ b/local/kubernetes/tools/logging/kibana-index/job.yaml
@@ -9,7 +9,7 @@ spec:
     spec:
       containers:
         - name: kibana-index
-          image: gcr.io/olly-2021-k8s-migration/kibana-index:latest
-          imagePullPolicy: Always
+          image: local/kibana-index:latest
+          imagePullPolicy: Never  # Imported via k3d image import
       restartPolicy: OnFailure
   backoffLimit: 4
diff --git a/stack/application/Dockerfile b/stack/application/Dockerfile
index ad5c0b16..9c902cd8 100644
--- a/stack/application/Dockerfile
+++ b/stack/application/Dockerfile
@@ -1,28 +1,28 @@
-FROM gradle:7.6-jdk17-alpine AS builder
+FROM eclipse-temurin:17.0.8.1_1-jdk-jammy AS builder
 
 WORKDIR /build
 
-ARG ELASTIC_APM_AGENT_VERSION=1.36.0
+ARG ELASTIC_APM_AGENT_VERSION=1.43.0
 
 # apm
-RUN wget https://search.maven.org/remotecontent?filepath=co/elastic/apm/elastic-apm-agent/${ELASTIC_APM_AGENT_VERSION}/elastic-apm-agent-${ELASTIC_APM_AGENT_VERSION}.jar -O /elastic-apm-agent.jar
+RUN wget -q https://search.maven.org/remotecontent?filepath=co/elastic/apm/elastic-apm-agent/${ELASTIC_APM_AGENT_VERSION}/elastic-apm-agent-${ELASTIC_APM_AGENT_VERSION}.jar -O /elastic-apm-agent.jar
 
 # gradle cache
-COPY build.gradle build.gradle
-COPY settings.gradle settings.gradle
-RUN gradle resolveDependencies
+COPY ["gradle/", "./gradle"]
+COPY ["build.gradle", "settings.gradle", "gradlew", "./"]
+RUN ./gradlew resolveDependencies
 
 # libs
 COPY springevents springevents
-RUN gradle springevents:build
+RUN ./gradlew springevents:build
 
 # service build
 ARG SERVICE
 COPY $SERVICE $SERVICE
 
-RUN gradle $SERVICE:build
+RUN ./gradlew "$SERVICE:build"
 
-FROM eclipse-temurin:17.0.6_10-jre AS final
+FROM eclipse-temurin:17.0.8.1_1-jre-jammy AS final
 ARG SERVICE
 
 COPY --from=builder /elastic-apm-agent.jar /
@@ -34,4 +34,4 @@ RUN chmod +x /entrypoint.sh
 ENV SERVICE=$SERVICE
 
 EXPOSE 8080 5005
-ENTRYPOINT /entrypoint.sh $SERVICE
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/stack/application/build.gradle b/stack/application/build.gradle
index d0e9e349..7b9e4cd0 100644
--- a/stack/application/build.gradle
+++ b/stack/application/build.gradle
@@ -1,91 +1,80 @@
-plugins {
-    id "io.spring.dependency-management" version "1.1.0"
-}
-
-subprojects {
-    group = 'feature-creeps'
-    version = null
-
-    apply plugin: 'groovy'
-    apply plugin: 'io.spring.dependency-management'
-
-    repositories {
-        mavenCentral()
-        maven { url 'https://repo.spring.io/milestone' }
-        maven { url "https://plugins.gradle.org/m2/" }
-    }
-
-    dependencyManagement {
-        imports {
-            mavenBom "org.springframework.cloud:spring-cloud-dependencies:2021.0.6"
-            mavenBom "org.springframework.boot:spring-boot-dependencies:2.7.9"
-        }
-    }
-    task allDeps(type: DependencyReportTask) {}
-    dependencies {
-        // spring
-        implementation 'org.springframework.boot:spring-boot-starter-actuator'
-        implementation 'org.springframework.boot:spring-boot-starter-data-rest'
-
-        // commons
-        implementation 'commons-io:commons-io:2.11.0'
-        implementation 'org.apache.commons:commons-lang3:3.12.0'
-
-        // logs
-        runtimeOnly 'net.logstash.logback:logstash-logback-encoder:7.3'
-        
-        // metrics
-        runtimeOnly 'io.micrometer:micrometer-core'
-        runtimeOnly 'io.micrometer:micrometer-registry-prometheus'
-        
-        // traces
-        implementation 'org.springframework.cloud:spring-cloud-starter-sleuth'
-        runtimeOnly 'org.springframework.cloud:spring-cloud-sleuth-zipkin'
-
-        // events
-        implementation 'io.honeycomb.beeline:beeline-spring-boot-starter:1.7.1'
-
-        // tests
-        testImplementation 'org.springframework.boot:spring-boot-starter-test'
-
-        // tests still using junit4
-        testImplementation("org.junit.vintage:junit-vintage-engine") {
-            exclude group: "org.hamcrest", module: "hamcrest-core"
-        }
-    }
-
-}
-
-task resolveDependencies {
-    doLast {
-        project.rootProject.allprojects.each { subProject ->
-            subProject.buildscript.configurations.each { configuration ->
-                resolveConfiguration(configuration)
-            }
-            subProject.configurations.each { configuration ->
-                resolveConfiguration(configuration)
-            }
-        }
-    }
-}
-
-void resolveConfiguration(configuration) {
-    if (isResolveableConfiguration(configuration)) {
-        configuration.resolve()
-    }
-}
-
-boolean isResolveableConfiguration(configuration) {
-    def nonResolveableConfigurations = ['api', 'apiElements', 'compileOnly', 'compileOnlyApi', 
-                                        'implementation', 'integrationTestCompileOnly', 'integrationTestImplementation',
-                                        'integrationTestRuntimeOnly', 'mainSourceElements',
-                                        'runtimeElements', 'runtimeOnly',
-                                        'testCompileOnly', 'testImplementation', 'testResultsElementsForTest',
-                                        'testRuntimeOnly',
-                                        'generatedImplementation', 'generatedRuntimeOnly']
-
-    if (nonResolveableConfigurations.contains(configuration.getName())) {
-        return false
-    }
-    return true
-}
\ No newline at end of file
+plugins {
+    id "io.spring.dependency-management" version "1.1.0"
+    id "com.github.ben-manes.versions" version "0.46.0"
+}
+
+subprojects {
+    group = 'feature-creeps'
+    version = null
+
+    apply plugin: 'groovy'
+    apply plugin: 'io.spring.dependency-management'
+
+    repositories {
+        mavenCentral()
+        maven { url 'https://repo.spring.io/milestone' }
+        maven { url "https://plugins.gradle.org/m2/" }
+    }
+
+    dependencyManagement {
+        imports {
+            mavenBom "org.springframework.cloud:spring-cloud-dependencies:2022.0.2"
+            mavenBom "org.springframework.boot:spring-boot-dependencies:3.1.4"
+        }
+    }
+
+    dependencies {
+        // spring
+        implementation 'org.springframework.boot:spring-boot-starter-actuator'
+        implementation 'org.springframework.boot:spring-boot-starter-data-rest'
+
+        // commons
+        implementation 'commons-io:commons-io:2.11.0'
+        implementation 'org.apache.commons:commons-lang3:3.12.0'
+
+        // logs
+        implementation 'net.logstash.logback:logstash-logback-encoder:7.3'
+
+        // metrics
+        implementation 'io.micrometer:micrometer-core'
+        implementation 'io.micrometer:micrometer-observation'
+        implementation 'io.micrometer:micrometer-registry-prometheus'
+
+        // traces
+        implementation 'io.micrometer:micrometer-tracing-bridge-brave'
+        implementation 'io.zipkin.reporter2:zipkin-reporter-brave:2.16.4'
+
+        // events
+        implementation 'io.honeycomb.beeline:beeline-spring-boot-starter:1.7.1'
+
+        // tests
+        testImplementation 'org.springframework.boot:spring-boot-starter-test'
+
+        // Lombok
+        compileOnly 'org.projectlombok:lombok:1.18.26'
+        annotationProcessor 'org.projectlombok:lombok:1.18.26'
+        testCompileOnly 'org.projectlombok:lombok:1.18.26'
+        testAnnotationProcessor 'org.projectlombok:lombok:1.18.26'
+    }
+
+    test {
+        useJUnitPlatform()
+    }
+
+    configurations.configureEach {
+        exclude group: 'junit', module: 'junit'
+        exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
+    }
+}
+
+allprojects {
+    task resolveDependencies {
+        doLast {
+            configurations.each { conf ->
+                if (conf.isCanBeResolved()) {
+                    conf.resolve()
+                }
+            }
+        }
+    }
+}
diff --git a/stack/application/entrypoint.sh b/stack/application/entrypoint.sh
index ef01520f..3c601a9e 100755
--- a/stack/application/entrypoint.sh
+++ b/stack/application/entrypoint.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
-SERVICE=$1
+if [ -z "$SERVICE" ]; then
+  echo "environment variable SERVICE not set! Exiting..." >&2
+  exit 1
+fi
 
 JAVA_OPTIONS=""
 JAVA_OPTIONS="$JAVA_OPTIONS -Djava.security.egd=file:/dev/./urandom"
diff --git a/stack/application/gradle/wrapper/.gitignore b/stack/application/gradle/wrapper/.gitignore
new file mode 100644
index 00000000..63b7142f
--- /dev/null
+++ b/stack/application/gradle/wrapper/.gitignore
@@ -0,0 +1 @@
+!gradle-wrapper.jar
\ No newline at end of file
diff --git a/stack/application/gradle/wrapper/gradle-wrapper.jar b/stack/application/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..c1962a79
Binary files /dev/null and b/stack/application/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/stack/application/gradle/wrapper/gradle-wrapper.properties b/stack/application/gradle/wrapper/gradle-wrapper.properties
index 50832291..37aef8d3 100644
--- a/stack/application/gradle/wrapper/gradle-wrapper.properties
+++ b/stack/application/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/stack/application/gradlew b/stack/application/gradlew
index 65dcd68d..aeb74cbb 100755
--- a/stack/application/gradlew
+++ b/stack/application/gradlew
@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -144,7 +141,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +149,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
diff --git a/stack/application/imageflip/build.gradle b/stack/application/imageflip/build.gradle
index a29eb7c0..71335ae6 100644
--- a/stack/application/imageflip/build.gradle
+++ b/stack/application/imageflip/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'org.springframework.boot' version "2.7.9"
+    id 'org.springframework.boot' version "3.1.4"
     id 'java'
 }
 
diff --git a/stack/application/imageflip/src/main/java/com/github/olly/workshop/imageflip/adapter/ImageController.java b/stack/application/imageflip/src/main/java/com/github/olly/workshop/imageflip/adapter/ImageController.java
index 8d0e4d79..5c9e5deb 100644
--- a/stack/application/imageflip/src/main/java/com/github/olly/workshop/imageflip/adapter/ImageController.java
+++ b/stack/application/imageflip/src/main/java/com/github/olly/workshop/imageflip/adapter/ImageController.java
@@ -1,11 +1,11 @@
 package com.github.olly.workshop.imageflip.adapter;
 
 import com.github.olly.workshop.imageflip.config.LoggingContextUtil;
-import com.github.olly.workshop.springevents.service.EventService;
 import com.github.olly.workshop.imageflip.service.ImageService;
+import com.github.olly.workshop.springevents.service.EventService;
+import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -19,24 +19,20 @@
 import java.io.IOException;
 
 @RestController
+@RequiredArgsConstructor
 @RequestMapping(value = "/api/image")
 public class ImageController {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ImageController.class);
 
-    @Autowired
-    private ImageService imageService;
-
-    @Autowired
-    private EventService eventService;
-
-    @Autowired
-    private LoggingContextUtil lcu;
+    private final ImageService imageService;
+    private final EventService eventService;
+    private final LoggingContextUtil lcu;
 
     @PostMapping("flip")
     public ResponseEntity flipImage(@RequestParam("image") MultipartFile file,
-            @RequestParam(value = "vertical") Boolean vertical,
-            @RequestParam(value = "horizontal") Boolean horizontal) throws IOException {
+                                    @RequestParam(value = "vertical") Boolean vertical,
+                                    @RequestParam(value = "horizontal") Boolean horizontal) throws IOException {
 
         this.eventService.addFieldToActiveEvent("action", "flip");
         this.eventService.addFieldToActiveEvent("content.type", file.getContentType());
diff --git a/stack/application/imageflip/src/main/java/com/github/olly/workshop/imageflip/service/ImageService.java b/stack/application/imageflip/src/main/java/com/github/olly/workshop/imageflip/service/ImageService.java
index c9dec7f1..f727b013 100755
--- a/stack/application/imageflip/src/main/java/com/github/olly/workshop/imageflip/service/ImageService.java
+++ b/stack/application/imageflip/src/main/java/com/github/olly/workshop/imageflip/service/ImageService.java
@@ -1,9 +1,9 @@
 package com.github.olly.workshop.imageflip.service;
 
 import com.github.olly.workshop.springevents.service.EventService;
+import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -17,13 +17,11 @@
 import java.io.InputStream;
 
 @Service
+@RequiredArgsConstructor
 public class ImageService {
 
-    @Autowired
-    ImageFlipMetricsService imageFlipMetricsService;
-
-    @Autowired
-    private EventService eventService;
+    private final ImageFlipMetricsService imageFlipMetricsService;
+    private final EventService eventService;
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ImageService.class);
 
@@ -37,7 +35,7 @@ public byte[] flip(MultipartFile file, boolean vertical, boolean horizontal) {
             final byte[] imageBytes = bufferedImageToByteArray(flippedImage, formatName);
 
             imageFlipMetricsService.imageFlipped(file.getContentType(), String.valueOf(vertical), String.valueOf(horizontal));
-            this.eventService.addFieldToActiveEvent("content.type", file.getContentType()) ;
+            this.eventService.addFieldToActiveEvent("content.type", file.getContentType());
 
             return imageBytes;
         } catch (IOException e) {
diff --git a/stack/application/imageflip/src/main/resources/application.properties b/stack/application/imageflip/src/main/resources/application.properties
index d218945a..46861571 100644
--- a/stack/application/imageflip/src/main/resources/application.properties
+++ b/stack/application/imageflip/src/main/resources/application.properties
@@ -1,18 +1,17 @@
-server.error.whitelabel.enabled=false
-spring.data.mongodb.host=mongodb
-spring.data.mongodb.port=27017
-spring.data.mongodb.database=imageflip
 management.endpoint.metrics.enabled=true
 management.endpoints.web.exposure.include=*
 management.endpoint.prometheus.enabled=true
-management.metrics.export.prometheus.enabled=true
+management.prometheus.metrics.export.enabled=true
+spring.application.name=imageflip
+spring.data.mongodb.host=mongodb
+spring.data.mongodb.port=27017
+spring.data.mongodb.database=imageflip
+server.error.whitelabel.enabled=false
 spring.servlet.multipart.max-file-size=10MB
 spring.servlet.multipart.max-request-size=10MB
-spring.sleuth.traceId128=true
-spring.sleuth.sampler.probability=1.0
-spring.zipkin.enabled=${TRACING_ENABLED:true}
-spring.zipkin.baseUrl=http://zipkin.istio-system:9411"
-spring.zipkin.service.name=imageflip
+management.tracing.enabled=${TRACING_ENABLED:true}
+management.tracing.sampling.probability=${TRACING_SAMPLING_PROPABILITY:1.0}
+management.zipkin.tracing.endpoint=${SPRING_ZIPKIN_ENDPOINT:http://localhost:9411/api/v2/spans}
 honeycomb.beeline.service-name=imageflip
 honeycomb.beeline.dataset=${HONEYCOMB_DATASET:workshop}
 honeycomb.beeline.write-key=${HONEYCOMB_KEY}
diff --git a/stack/application/imageflip/src/test/java/com/github/olly/workshop/imageflip/adapter/ImageControllerTest.java b/stack/application/imageflip/src/test/java/com/github/olly/workshop/imageflip/adapter/ImageControllerTest.java
index 01f17c6b..dbe68854 100644
--- a/stack/application/imageflip/src/test/java/com/github/olly/workshop/imageflip/adapter/ImageControllerTest.java
+++ b/stack/application/imageflip/src/test/java/com/github/olly/workshop/imageflip/adapter/ImageControllerTest.java
@@ -1,12 +1,7 @@
 package com.github.olly.workshop.imageflip.adapter;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
-import java.io.IOException;
 import org.apache.commons.io.IOUtils;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.core.io.Resource;
@@ -14,10 +9,12 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.mock.web.MockMultipartFile;
-import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.web.multipart.MultipartFile;
 
-@RunWith(SpringRunner.class)
+import java.io.IOException;
+
+import static org.junit.jupiter.api.Assertions.*;
+
 @SpringBootTest
 public class ImageControllerTest {
 
@@ -25,7 +22,7 @@ public class ImageControllerTest {
     ImageController imageController;
 
     @Autowired
-    private ResourceLoader resourceLoader = null;
+    private final ResourceLoader resourceLoader = null;
 
     private MultipartFile getMultipartImage(String filename) {
         Resource image = resourceLoader.getResource("classpath:" + filename);
@@ -42,7 +39,7 @@ public void jpgImageShouldReturnValidResponse() throws IOException {
         ResponseEntity response = imageController.flipImage(getMultipartImage("test.jpg"), true, false);
         assertEquals(response.getStatusCode(), HttpStatus.OK);
         assertTrue(response.hasBody());
-        assertTrue(response.getHeaders().get("content-type").stream().anyMatch(item -> "image/jpg".equals(item)));
+        assertTrue(response.getHeaders().get("content-type").stream().anyMatch("image/jpg"::equals));
         byte[] data = (byte[]) response.getBody();
         assertNotEquals(data.length, 0);
     }
@@ -52,7 +49,7 @@ public void pngImageShouldReturnValidResponse() throws IOException {
         ResponseEntity response = imageController.flipImage(getMultipartImage("test.png"), true, false);
         assertEquals(response.getStatusCode(), HttpStatus.OK);
         assertTrue(response.hasBody());
-        assertTrue(response.getHeaders().get("content-type").stream().anyMatch(item -> "image/png".equals(item)));
+        assertTrue(response.getHeaders().get("content-type").stream().anyMatch("image/png"::equals));
         byte[] data = (byte[]) response.getBody();
         assertNotEquals(data.length, 0);
     }
@@ -60,7 +57,7 @@ public void pngImageShouldReturnValidResponse() throws IOException {
     @Test
     public void emptyImageShouldReturnBadRequest() throws IOException {
         MultipartFile emptyImage = new MockMultipartFile("file",
-                "test.jpg", "image/jpg", new byte[] {});
+                "test.jpg", "image/jpg", new byte[]{});
         ResponseEntity response = imageController.flipImage(emptyImage, true, false);
         assertEquals(response.getStatusCode(), HttpStatus.BAD_REQUEST);
     }
@@ -68,7 +65,7 @@ public void emptyImageShouldReturnBadRequest() throws IOException {
     @Test
     public void unknownContentTypeShouldReturnBadRequest() throws IOException {
         MultipartFile wrongContent = new MockMultipartFile("file",
-                "test.jpg", "application/json", new byte[] { 0 });
+                "test.jpg", "application/json", new byte[]{0});
         ResponseEntity response = imageController.flipImage(wrongContent, true, false);
         assertEquals(response.getStatusCode(), HttpStatus.BAD_REQUEST);
     }
diff --git a/stack/application/imagegrayscale/build.gradle b/stack/application/imagegrayscale/build.gradle
index f5c916c0..940d98f4 100644
--- a/stack/application/imagegrayscale/build.gradle
+++ b/stack/application/imagegrayscale/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'org.springframework.boot' version "2.7.9"
+	id 'org.springframework.boot' version "3.1.4"
 	id 'java'
 }
 
diff --git a/stack/application/imagegrayscale/src/main/java/com/github/olly/workshop/imagegrayscale/controller/ImageGrayscale.java b/stack/application/imagegrayscale/src/main/java/com/github/olly/workshop/imagegrayscale/controller/ImageGrayscale.java
index b85a060e..607a42b9 100644
--- a/stack/application/imagegrayscale/src/main/java/com/github/olly/workshop/imagegrayscale/controller/ImageGrayscale.java
+++ b/stack/application/imagegrayscale/src/main/java/com/github/olly/workshop/imagegrayscale/controller/ImageGrayscale.java
@@ -2,10 +2,10 @@
 
 import com.github.olly.workshop.imagegrayscale.service.ImageService;
 import com.github.olly.workshop.springevents.service.EventService;
+import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.*;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -16,16 +16,14 @@
 import java.io.IOException;
 
 @RestController
+@RequiredArgsConstructor
 @RequestMapping(value = "/api/image")
 public class ImageGrayscale {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ImageGrayscale.class);
 
-    @Autowired
-    private ImageService imageService;
-
-    @Autowired
-    private EventService eventService;
+    private final ImageService imageService;
+    private final EventService eventService;
 
     @PostMapping(value = "/grayscale")
     public ResponseEntity toGrayscale(@RequestParam("image") MultipartFile image) {
diff --git a/stack/application/imagegrayscale/src/main/java/com/github/olly/workshop/imagegrayscale/service/ImageService.java b/stack/application/imagegrayscale/src/main/java/com/github/olly/workshop/imagegrayscale/service/ImageService.java
index 3efea9df..b32cd302 100755
--- a/stack/application/imagegrayscale/src/main/java/com/github/olly/workshop/imagegrayscale/service/ImageService.java
+++ b/stack/application/imagegrayscale/src/main/java/com/github/olly/workshop/imagegrayscale/service/ImageService.java
@@ -1,9 +1,9 @@
 package com.github.olly.workshop.imagegrayscale.service;
 
 import com.github.olly.workshop.springevents.service.EventService;
+import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -17,13 +17,11 @@
 import java.io.InputStream;
 
 @Service
+@RequiredArgsConstructor
 public class ImageService {
 
-    @Autowired
-    ImageGrayscaleMetricsService imageGrayscaleMetricsService;
-
-    @Autowired
-    private EventService eventService;
+    private final ImageGrayscaleMetricsService imageGrayscaleMetricsService;
+    private final EventService eventService;
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ImageService.class);
 
diff --git a/stack/application/imagegrayscale/src/main/resources/application.properties b/stack/application/imagegrayscale/src/main/resources/application.properties
index f7951653..5b2319cc 100644
--- a/stack/application/imagegrayscale/src/main/resources/application.properties
+++ b/stack/application/imagegrayscale/src/main/resources/application.properties
@@ -1,17 +1,14 @@
-server.error.whitelabel.enabled=false
 management.endpoint.metrics.enabled=true
 management.endpoints.web.exposure.include=*
 management.endpoint.prometheus.enabled=true
-management.metrics.export.prometheus.enabled=true
+management.prometheus.metrics.export.enabled=true
+server.error.whitelabel.enabled=false
+spring.application.name=imagegrayscale
 spring.servlet.multipart.max-file-size=10MB
 spring.servlet.multipart.max-request-size=10MB
-logging.pattern.console=%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} [%X{traceId}/%X{spanId}] - %msg %replace(%xException){'\n','\r'}%nopex%n
-spring.application.name=imagegrayscale
-spring.sleuth.traceId128=true
-spring.sleuth.sampler.probability=1.0
-spring.zipkin.enabled=${TRACING_ENABLED:true}
-spring.zipkin.baseUrl=http://zipkin.istio-system:9411
-spring.zipkin.service.name=imagegrayscale
+management.tracing.enabled=${TRACING_ENABLED:true}
+management.tracing.sampling.probability=${TRACING_SAMPLING_PROPABILITY:1.0}
+management.zipkin.tracing.endpoint=${SPRING_ZIPKIN_ENDPOINT:http://localhost:9411/api/v2/spans}
 honeycomb.beeline.service-name=imagegrayscale
 honeycomb.beeline.dataset=${HONEYCOMB_DATASET:workshop}
 honeycomb.beeline.write-key=${HONEYCOMB_KEY}
diff --git a/stack/application/imagegrayscale/src/test/java/com/github/olly/workshop/imagegrayscale/controller/ImageGrayscaleTest.java b/stack/application/imagegrayscale/src/test/java/com/github/olly/workshop/imagegrayscale/controller/ImageGrayscaleTest.java
index 83f039d0..e02e504c 100644
--- a/stack/application/imagegrayscale/src/test/java/com/github/olly/workshop/imagegrayscale/controller/ImageGrayscaleTest.java
+++ b/stack/application/imagegrayscale/src/test/java/com/github/olly/workshop/imagegrayscale/controller/ImageGrayscaleTest.java
@@ -1,12 +1,7 @@
 package com.github.olly.workshop.imagegrayscale.controller;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
-import java.io.IOException;
 import org.apache.commons.io.IOUtils;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.core.io.Resource;
@@ -14,10 +9,12 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.mock.web.MockMultipartFile;
-import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.web.multipart.MultipartFile;
 
-@RunWith(SpringRunner.class)
+import java.io.IOException;
+
+import static org.junit.jupiter.api.Assertions.*;
+
 @SpringBootTest
 public class ImageGrayscaleTest {
 
@@ -25,7 +22,7 @@ public class ImageGrayscaleTest {
     ImageGrayscale imageGrayscale;
 
     @Autowired
-    private ResourceLoader resourceLoader = null;
+    private final ResourceLoader resourceLoader = null;
 
     private MultipartFile getMultipartImage(String filename) {
         Resource image = resourceLoader.getResource("classpath:" + filename);
@@ -60,7 +57,7 @@ public void pngImageShouldReturnValidResponse() {
     @Test
     public void emptyImageShouldReturnBadRequest() {
         MultipartFile emptyImage = new MockMultipartFile("file",
-                "test.jpg", "image/jpg", new byte[] {});
+                "test.jpg", "image/jpg", new byte[]{});
         ResponseEntity response = imageGrayscale.toGrayscale(emptyImage);
         assertEquals(response.getStatusCode(), HttpStatus.BAD_REQUEST);
     }
@@ -68,7 +65,7 @@ public void emptyImageShouldReturnBadRequest() {
     @Test
     public void unknownContentTypeShouldReturnBadRequest() {
         MultipartFile wrongContent = new MockMultipartFile("file",
-                "test.jpg", "application/json", new byte[] { 0 });
+                "test.jpg", "application/json", new byte[]{0});
         ResponseEntity response = imageGrayscale.toGrayscale(wrongContent);
         assertEquals(response.getStatusCode(), HttpStatus.BAD_REQUEST);
     }
diff --git a/stack/application/imageholder/build.gradle b/stack/application/imageholder/build.gradle
index 69889931..19af4c04 100644
--- a/stack/application/imageholder/build.gradle
+++ b/stack/application/imageholder/build.gradle
@@ -1,16 +1,9 @@
-buildscript {
-    dependencies {
-        classpath "gradle.plugin.de.db.vz:msintplugin:1.1.7"
-    }
-}
-
 plugins {
-    id 'org.springframework.boot' version "2.7.9"
+    id 'org.springframework.boot' version "3.1.4"
     id 'java'
+    id 'groovy'
 }
 
-apply plugin: 'de.db.vz.msintplugin'
-
 bootJar {
     archiveBaseName = 'imageholder'
 }
@@ -19,9 +12,8 @@ dependencies {
     implementation project(':springevents')
     implementation 'org.springframework.boot:spring-boot-starter-data-mongodb'
     implementation 'org.springframework.cloud:spring-cloud-starter-openfeign'
-    implementation "org.codehaus.groovy:groovy-all:3.0.15"
 
     testImplementation 'de.bwaldvogel:mongo-java-server:1.43.0'
-    testImplementation "org.spockframework:spock-core:2.3-groovy-3.0"
-    testImplementation "org.spockframework:spock-spring:2.3-groovy-3.0"
-}
\ No newline at end of file
+    testImplementation "org.spockframework:spock-core:2.4-M1-groovy-4.0"
+    testImplementation "org.spockframework:spock-spring:2.4-M1-groovy-4.0"
+}
diff --git a/stack/application/imageholder/src/integrationTest/docker/docker-compose.yml b/stack/application/imageholder/src/integrationTest/docker/docker-compose.yml
deleted file mode 100644
index 0a1081ea..00000000
--- a/stack/application/imageholder/src/integrationTest/docker/docker-compose.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-version: '3'
-services:
-
-  ## Domain
-
-  imageorchestrator:
-    build: ../../../../imageorchestrator
-    environment:
-      JAVA_DEBUG: "true"
-    ports:
-      - 8080:8080
-      - 5005:5005
-
-  imageholder:
-    build: ../../../../imageholder
-    depends_on:
-      - mongodb-service
-    ports:
-      - 8080
-
-  imagerotator:
-    build: ../../../../imagerotator
-    ports:
-      - 8080
-
-  imagegrayscale:
-    build: ../../../../imagegrayscale
-    ports:
-      - 8080
-
-  ## Storage
-
-  # database
-  mongodb-service:
-    image: mongo:3.2.12
-    ports:
-      - '27017'
\ No newline at end of file
diff --git a/stack/application/imageholder/src/main/java/com/github/olly/workshop/imageholder/ImageholderApplication.java b/stack/application/imageholder/src/main/java/com/github/olly/workshop/imageholder/ImageholderApplication.java
index b758afdd..d825a3d3 100644
--- a/stack/application/imageholder/src/main/java/com/github/olly/workshop/imageholder/ImageholderApplication.java
+++ b/stack/application/imageholder/src/main/java/com/github/olly/workshop/imageholder/ImageholderApplication.java
@@ -2,17 +2,19 @@
 
 import com.github.olly.workshop.springevents.SpringBootEventsConfiguration;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.cloud.openfeign.FeignAutoConfiguration;
 import org.springframework.context.annotation.Import;
 
 @SpringBootApplication
 @EnableFeignClients
+@ImportAutoConfiguration({FeignAutoConfiguration.class})
 @Import(SpringBootEventsConfiguration.class)
 public class ImageholderApplication {
 
     public static void main(String[] args) {
-        ConfigurableApplicationContext context = SpringApplication.run(ImageholderApplication.class, args);
+        SpringApplication.run(ImageholderApplication.class, args);
     }
 }
diff --git a/stack/application/imageholder/src/main/java/com/github/olly/workshop/imageholder/adapter/ImageController.java b/stack/application/imageholder/src/main/java/com/github/olly/workshop/imageholder/adapter/ImageController.java
index 12eacbec..436908d6 100644
--- a/stack/application/imageholder/src/main/java/com/github/olly/workshop/imageholder/adapter/ImageController.java
+++ b/stack/application/imageholder/src/main/java/com/github/olly/workshop/imageholder/adapter/ImageController.java
@@ -7,12 +7,12 @@
 import com.github.olly.workshop.imageholder.service.client.ImageThumbnailClient;
 import com.github.olly.workshop.springevents.adapter.NotFoundException;
 import com.github.olly.workshop.springevents.service.EventService;
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -27,25 +27,17 @@
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 
 @RestController
+@RequiredArgsConstructor
 @RequestMapping(value = "/api/images")
 public class ImageController {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ImageController.class);
 
-    @Autowired
-    private ImageService imageService;
-
-    @Autowired
-    private ImageHolderMetricsService imageHolderMetricsService;
-
-    @Autowired
-    private ImageThumbnailClient imageThumbnailClient;
-
-    @Autowired
-    private LoggingContextUtil loggingContextUtil;
-
-    @Autowired
-    private EventService eventService;
+    private final ImageService imageService;
+    private final ImageHolderMetricsService imageHolderMetricsService;
+    private final ImageThumbnailClient imageThumbnailClient;
+    private final LoggingContextUtil loggingContextUtil;
+    private final EventService eventService;
 
     @GetMapping(produces = APPLICATION_JSON_VALUE)
     public ResponseEntity getAll() {
@@ -167,7 +159,7 @@ public ResponseEntity deleteAllImages() {
         imageService.deleteAllImages();
         this.eventService.addFieldToActiveEvent("action", "delete_all");
         this.eventService.addFieldToActiveEvent("app.error", 0);
-        return new ResponseEntity<>("Deleted following images: " + allImageIds.toString(), HttpStatus.OK);
+        return new ResponseEntity<>("Deleted following images: " + allImageIds, HttpStatus.OK);
     }
 
     @PostMapping()
diff --git a/stack/application/imageholder/src/main/java/com/github/olly/workshop/imageholder/service/ImageService.java b/stack/application/imageholder/src/main/java/com/github/olly/workshop/imageholder/service/ImageService.java
index 6560c2d9..7e74fa14 100755
--- a/stack/application/imageholder/src/main/java/com/github/olly/workshop/imageholder/service/ImageService.java
+++ b/stack/application/imageholder/src/main/java/com/github/olly/workshop/imageholder/service/ImageService.java
@@ -2,10 +2,10 @@
 
 import com.github.olly.workshop.imageholder.model.Image;
 import com.github.olly.workshop.springevents.service.EventService;
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Collection;
@@ -13,18 +13,14 @@
 import java.util.stream.Collectors;
 
 @Service
+@RequiredArgsConstructor
 public class ImageService {
 
-    private static int MAX_IMAGES_TO_KEEP = 1000;
+    private static final int MAX_IMAGES_TO_KEEP = 1000;
 
-    @Autowired
-    private ImageRepository imageRepository;
-
-    @Autowired
-    private ImageHolderMetricsService imageHolderMetricsService;
-
-    @Autowired
-    private EventService eventService;
+    private final ImageRepository imageRepository;
+    private final ImageHolderMetricsService imageHolderMetricsService;
+    private final EventService eventService;
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ImageService.class);
 
diff --git a/stack/application/imageholder/src/main/resources/application.properties b/stack/application/imageholder/src/main/resources/application.properties
index 454fb7ed..ec620181 100644
--- a/stack/application/imageholder/src/main/resources/application.properties
+++ b/stack/application/imageholder/src/main/resources/application.properties
@@ -1,18 +1,17 @@
+management.endpoint.metrics.enabled=true
+management.endpoints.web.exposure.include=*
+management.endpoint.prometheus.enabled=true
+management.prometheus.metrics.export.enabled=true
 server.error.whitelabel.enabled=false
+spring.application.name=imageholder
 spring.data.mongodb.host=${MONGODB_HOST:mongodb-service}
 spring.data.mongodb.port=${MONGODB_PORT:27017}
 spring.data.mongodb.database=imageholder
-management.endpoint.metrics.enabled=true
-management.endpoints.web.exposure.include=*
-management.endpoint.prometheus.enabled=true
-management.metrics.export.prometheus.enabled=true
 spring.servlet.multipart.max-file-size=10MB
 spring.servlet.multipart.max-request-size=10MB
-spring.sleuth.traceId128=true
-spring.sleuth.sampler.probability=1.0
-spring.zipkin.enabled=${TRACING_ENABLED:true}
-spring.zipkin.baseUrl=http://zipkin.istio-system:9411
-spring.zipkin.service.name=imageholder
+management.tracing.enabled=${TRACING_ENABLED:true}
+management.tracing.sampling.probability=${TRACING_SAMPLING_PROPABILITY:1.0}
+management.zipkin.tracing.endpoint=${SPRING_ZIPKIN_ENDPOINT:http://localhost:9411/api/v2/spans}
 #logging.pattern.console=%date{"yyyy-MM-dd'T'HH:mm:ss.SSSZ", UTC} %5p %t %c{5}:%L [log_framework=logback;app_name=${APP_NAME};app_version=${APP_VERSION};instance_id=${CF_INSTANCE_INDEX}] %m MULTIEXCEPTION %replace(%xException){'\n','\u2028'}%nopex%n</pattern>
 honeycomb.beeline.service-name=imageholder
 honeycomb.beeline.dataset=${HONEYCOMB_DATASET:workshop}
diff --git a/stack/application/imageholder/src/test/groovy/com/github/olly/workshop/imageholder/service/ImageDeletionSpec.groovy b/stack/application/imageholder/src/test/groovy/com/github/olly/workshop/imageholder/service/ImageDeletionSpec.groovy
index 587735a2..07406586 100644
--- a/stack/application/imageholder/src/test/groovy/com/github/olly/workshop/imageholder/service/ImageDeletionSpec.groovy
+++ b/stack/application/imageholder/src/test/groovy/com/github/olly/workshop/imageholder/service/ImageDeletionSpec.groovy
@@ -6,7 +6,7 @@ import spock.lang.Specification
 
 /*
     this spec represents a test with spock mocks/stubs
- */
+*/
 
 class ImageDeletionSpec extends Specification {
 
@@ -15,11 +15,7 @@ class ImageDeletionSpec extends Specification {
         ImageRepository imageRepository = Mock(ImageRepository)
         ImageHolderMetricsService metricsService = Mock(ImageHolderMetricsService)
         EventService eventService = Mock(EventService)
-        ImageService imageService = new ImageService(
-                imageRepository: imageRepository,
-                imageHolderMetricsService: metricsService,
-                eventService: eventService)
-
+        ImageService imageService = new ImageService(imageRepository, metricsService, eventService)
 
         and:
         def numberOfImages = 1000
@@ -28,7 +24,7 @@ class ImageDeletionSpec extends Specification {
         and:
         1 * imageRepository.findAllIds() >> (1..numberOfImages).collect { new Image(id: it) }
         1 * imageRepository.findAllIds() >> (1..(numberOfImages - 1)).collect { new Image(id: it) }
-        imageRepository.findById(_) >> { String id -> new Optional<Image>(new Image(id: id)) }
+        imageRepository.findById(_) >> { String id -> Optional.of(new Image(id: id)) }
 
         when:
         imageService.save(testImage)
diff --git a/stack/application/imageholder/src/test/groovy/com/github/olly/workshop/imageholder/service/ImageServiceSpec.groovy b/stack/application/imageholder/src/test/groovy/com/github/olly/workshop/imageholder/service/ImageServiceSpec.groovy
index cceca1b7..d2e9e0f1 100644
--- a/stack/application/imageholder/src/test/groovy/com/github/olly/workshop/imageholder/service/ImageServiceSpec.groovy
+++ b/stack/application/imageholder/src/test/groovy/com/github/olly/workshop/imageholder/service/ImageServiceSpec.groovy
@@ -15,9 +15,10 @@ import spock.lang.Specification
 
 /*
     this spec represents a spring boot integration test with spock and an in-memory mongo db
- */
+*/
 
 @SpringBootTest
+// @ContextConfiguration(classes=[ImageService.class, ImageRepository.class])
 class ImageServiceSpec extends Specification {
 
     @Autowired
diff --git a/stack/application/imageholder/src/test/java/com/github/olly/workshop/imageholder/ImageholderApplicationTests.java b/stack/application/imageholder/src/test/java/com/github/olly/workshop/imageholder/ImageholderApplicationTests.java
index 76b6e736..61a963f3 100644
--- a/stack/application/imageholder/src/test/java/com/github/olly/workshop/imageholder/ImageholderApplicationTests.java
+++ b/stack/application/imageholder/src/test/java/com/github/olly/workshop/imageholder/ImageholderApplicationTests.java
@@ -1,19 +1,16 @@
 package com.github.olly.workshop.imageholder;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.test.autoconfigure.data.mongo.DataMongoTest;
 import org.springframework.cloud.openfeign.FeignAutoConfiguration;
 import org.springframework.context.annotation.Import;
-import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringRunner.class)
 @DataMongoTest
-@Import({ MetricsAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class })
-@ImportAutoConfiguration({ FeignAutoConfiguration.class })
+@Import({MetricsAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class})
+@ImportAutoConfiguration({FeignAutoConfiguration.class})
 public class ImageholderApplicationTests {
 
     @Test
diff --git a/stack/application/imageorchestrator/build.gradle b/stack/application/imageorchestrator/build.gradle
index 0960cd54..a72a404d 100644
--- a/stack/application/imageorchestrator/build.gradle
+++ b/stack/application/imageorchestrator/build.gradle
@@ -1,16 +1,8 @@
-buildscript {
-    dependencies {
-        classpath "gradle.plugin.de.db.vz:msintplugin:1.1.7"
-    }
-}
-
 plugins {
-    id 'org.springframework.boot' version "2.7.9"
+    id 'org.springframework.boot' version "3.1.4"
     id 'java'
 }
 
-apply plugin: 'de.db.vz.msintplugin'
-
 bootJar {
     archiveBaseName = 'imageorchestrator'
 }
@@ -20,4 +12,4 @@ dependencies {
     implementation 'org.springframework.cloud:spring-cloud-starter-openfeign'
 
     implementation 'com.google.guava:guava:31.1-jre'
-}
\ No newline at end of file
+}
diff --git a/stack/application/imageorchestrator/src/integrationTest/docker/docker-compose.yml b/stack/application/imageorchestrator/src/integrationTest/docker/docker-compose.yml
deleted file mode 100644
index dd7b8cdf..00000000
--- a/stack/application/imageorchestrator/src/integrationTest/docker/docker-compose.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-version: '3'
-services:
-
-  ## Domain
-  imageholder:
-    build: ../../../../imageholder
-    environment:
-      JAVA_DEBUG: "true"
-    depends_on:
-    - mongodb-service
-    ports:
-    - 8080
-
-  ## Storage
-  mongodb-service:
-    image: mongo:3.2.12
-    ports:
-    - '27017'
\ No newline at end of file
diff --git a/stack/application/imageorchestrator/src/main/java/com/github/olly/workshop/imageorchestrator/ImageorchestratorApplication.java b/stack/application/imageorchestrator/src/main/java/com/github/olly/workshop/imageorchestrator/ImageorchestratorApplication.java
index 88365d71..fffbc80a 100644
--- a/stack/application/imageorchestrator/src/main/java/com/github/olly/workshop/imageorchestrator/ImageorchestratorApplication.java
+++ b/stack/application/imageorchestrator/src/main/java/com/github/olly/workshop/imageorchestrator/ImageorchestratorApplication.java
@@ -2,21 +2,23 @@
 
 import com.github.olly.workshop.springevents.SpringBootEventsConfiguration;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.cloud.openfeign.FeignAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;
 import org.springframework.web.client.RestTemplate;
 
 @SpringBootApplication
 @EnableFeignClients(basePackages = {"com.github"})
+@ImportAutoConfiguration({FeignAutoConfiguration.class})
 @Import(SpringBootEventsConfiguration.class)
 public class ImageorchestratorApplication {
 
     public static void main(String[] args) {
-        ConfigurableApplicationContext context = SpringApplication.run(ImageorchestratorApplication.class, args);
+        SpringApplication.run(ImageorchestratorApplication.class, args);
     }
 
     @Bean
diff --git a/stack/application/imageorchestrator/src/main/java/com/github/olly/workshop/imageorchestrator/adapter/ImageController.java b/stack/application/imageorchestrator/src/main/java/com/github/olly/workshop/imageorchestrator/adapter/ImageController.java
index 86857c06..fab9b696 100644
--- a/stack/application/imageorchestrator/src/main/java/com/github/olly/workshop/imageorchestrator/adapter/ImageController.java
+++ b/stack/application/imageorchestrator/src/main/java/com/github/olly/workshop/imageorchestrator/adapter/ImageController.java
@@ -5,9 +5,9 @@
 import com.github.olly.workshop.imageorchestrator.model.TransformationRequest;
 import com.github.olly.workshop.imageorchestrator.service.ImageService;
 import com.github.olly.workshop.springevents.service.EventService;
+import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -19,19 +19,15 @@
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
+@RequiredArgsConstructor
 @RequestMapping(value = "/api/images")
 public class ImageController {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ImageController.class);
 
-    @Autowired
-    private ImageService imageService;
-
-    @Autowired
-    private LogTraceContextUtil contextUtil;
-
-    @Autowired
-    private EventService eventService;
+    private final ImageService imageService;
+    private final LogTraceContextUtil contextUtil;
+    private final EventService eventService;
 
     @PostMapping(value = "transform")
     public ResponseEntity transform(@RequestBody TransformationRequest transformationRequest) {
diff --git a/stack/application/imageorchestrator/src/main/java/com/github/olly/workshop/imageorchestrator/service/ImageService.java b/stack/application/imageorchestrator/src/main/java/com/github/olly/workshop/imageorchestrator/service/ImageService.java
index c304401a..70fab2cd 100755
--- a/stack/application/imageorchestrator/src/main/java/com/github/olly/workshop/imageorchestrator/service/ImageService.java
+++ b/stack/application/imageorchestrator/src/main/java/com/github/olly/workshop/imageorchestrator/service/ImageService.java
@@ -6,32 +6,22 @@
 import com.github.olly.workshop.imageorchestrator.service.clients.ImageHolderClient;
 import com.github.olly.workshop.imageorchestrator.service.clients.ImageHolderUploadClient;
 import com.github.olly.workshop.springevents.service.EventService;
+import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
 @Service
+@RequiredArgsConstructor
 public class ImageService {
 
-    @Autowired
-    TransformationService transformationService;
-
-    @Autowired
-    private ImageOrchestratorMetricsService imageOrchestratorMetricsService;
-
-    @Autowired
-    private EventService eventService;
-
-    @Autowired
-    private ImageHolderClient imageHolderClient;
-
-    @Autowired
-    private ImageHolderUploadClient imageHolderUploadClient;
-
-    @Autowired
-    private LogTraceContextUtil contextUtil;
+    private final TransformationService transformationService;
+    private final ImageOrchestratorMetricsService imageOrchestratorMetricsService;
+    private final EventService eventService;
+    private final ImageHolderClient imageHolderClient;
+    private final ImageHolderUploadClient imageHolderUploadClient;
+    private final LogTraceContextUtil contextUtil;
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ImageService.class);
 
diff --git a/stack/application/imageorchestrator/src/main/java/com/github/olly/workshop/imageorchestrator/service/TransformationService.java b/stack/application/imageorchestrator/src/main/java/com/github/olly/workshop/imageorchestrator/service/TransformationService.java
index 81fc2b69..e2aa365f 100644
--- a/stack/application/imageorchestrator/src/main/java/com/github/olly/workshop/imageorchestrator/service/TransformationService.java
+++ b/stack/application/imageorchestrator/src/main/java/com/github/olly/workshop/imageorchestrator/service/TransformationService.java
@@ -8,9 +8,9 @@
 import com.github.olly.workshop.imageorchestrator.service.clients.ImageResizeClient;
 import com.github.olly.workshop.imageorchestrator.service.clients.ImageRotatorClient;
 import com.github.olly.workshop.springevents.service.EventService;
+import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -19,28 +19,16 @@
 import java.util.stream.IntStream;
 
 @Service
+@RequiredArgsConstructor
 public class TransformationService {
 
-    @Autowired
-    private ImageOrchestratorMetricsService imageOrchestratorMetricsService;
-
-    @Autowired
-    private EventService eventService;
-
-    @Autowired
-    private ImageGrayscaleClient imageGrayscaleClient;
-
-    @Autowired
-    private ImageRotatorClient imageRotatorClient;
-
-    @Autowired
-    private ImageResizeClient imageResizeClient;
-
-    @Autowired
-    private ImageFlipClient imageFlipClient;
-
-    @Autowired
-    private LogTraceContextUtil contextUtil;
+    private final ImageOrchestratorMetricsService imageOrchestratorMetricsService;
+    private final EventService eventService;
+    private final ImageGrayscaleClient imageGrayscaleClient;
+    private final ImageRotatorClient imageRotatorClient;
+    private final ImageResizeClient imageResizeClient;
+    private final ImageFlipClient imageFlipClient;
+    private final LogTraceContextUtil contextUtil;
 
     private static final Logger LOGGER = LoggerFactory.getLogger(TransformationService.class);
 
diff --git a/stack/application/imageorchestrator/src/main/java/com/github/olly/workshop/imageorchestrator/service/clients/ImageFlipClient.java b/stack/application/imageorchestrator/src/main/java/com/github/olly/workshop/imageorchestrator/service/clients/ImageFlipClient.java
index dbd7116a..0eac1b2b 100644
--- a/stack/application/imageorchestrator/src/main/java/com/github/olly/workshop/imageorchestrator/service/clients/ImageFlipClient.java
+++ b/stack/application/imageorchestrator/src/main/java/com/github/olly/workshop/imageorchestrator/service/clients/ImageFlipClient.java
@@ -1,7 +1,7 @@
 package com.github.olly.workshop.imageorchestrator.service.clients;
 
 import com.github.olly.workshop.imageorchestrator.model.Image;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.*;
 import org.springframework.stereotype.Service;
@@ -12,10 +12,10 @@
 import java.util.Collection;
 
 @Service
+@RequiredArgsConstructor
 public class ImageFlipClient {
 
-    @Autowired
-    RestTemplate restTemplate;
+    private final RestTemplate restTemplate;
 
     @Value("${imageflip.baseUrl}")
     private String imageflipBaseUrl;
diff --git a/stack/application/imageorchestrator/src/main/java/com/github/olly/workshop/imageorchestrator/service/clients/ImageGrayscaleClient.java b/stack/application/imageorchestrator/src/main/java/com/github/olly/workshop/imageorchestrator/service/clients/ImageGrayscaleClient.java
index 1c439cc2..97b24bdc 100644
--- a/stack/application/imageorchestrator/src/main/java/com/github/olly/workshop/imageorchestrator/service/clients/ImageGrayscaleClient.java
+++ b/stack/application/imageorchestrator/src/main/java/com/github/olly/workshop/imageorchestrator/service/clients/ImageGrayscaleClient.java
@@ -1,7 +1,7 @@
 package com.github.olly.workshop.imageorchestrator.service.clients;
 
 import com.github.olly.workshop.imageorchestrator.model.Image;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.*;
 import org.springframework.stereotype.Service;
@@ -12,10 +12,10 @@
 import java.util.Collection;
 
 @Service
+@RequiredArgsConstructor
 public class ImageGrayscaleClient {
 
-    @Autowired
-    RestTemplate restTemplate;
+    private final RestTemplate restTemplate;
 
     @Value("${imagegrayscale.baseUrl}")
     private String imagegrayscaleBaseUrl;
diff --git a/stack/application/imageorchestrator/src/main/java/com/github/olly/workshop/imageorchestrator/service/clients/ImageHolderUploadClient.java b/stack/application/imageorchestrator/src/main/java/com/github/olly/workshop/imageorchestrator/service/clients/ImageHolderUploadClient.java
index 791bb8f1..11c4a243 100644
--- a/stack/application/imageorchestrator/src/main/java/com/github/olly/workshop/imageorchestrator/service/clients/ImageHolderUploadClient.java
+++ b/stack/application/imageorchestrator/src/main/java/com/github/olly/workshop/imageorchestrator/service/clients/ImageHolderUploadClient.java
@@ -2,9 +2,9 @@
 
 import com.github.olly.workshop.imageorchestrator.config.LogTraceContextUtil;
 import com.github.olly.workshop.imageorchestrator.model.Image;
+import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.*;
 import org.springframework.stereotype.Service;
@@ -13,13 +13,11 @@
 import org.springframework.web.client.RestTemplate;
 
 @Service
+@RequiredArgsConstructor
 public class ImageHolderUploadClient {
 
-    @Autowired
-    RestTemplate restTemplate;
-
-    @Autowired
-    LogTraceContextUtil contextUtil;
+    private final RestTemplate restTemplate;
+    private final LogTraceContextUtil contextUtil;
 
     @Value("${imageholder.baseUrl}")
     private String imageholderBaseUrl;
diff --git a/stack/application/imageorchestrator/src/main/java/com/github/olly/workshop/imageorchestrator/service/clients/ImageResizeClient.java b/stack/application/imageorchestrator/src/main/java/com/github/olly/workshop/imageorchestrator/service/clients/ImageResizeClient.java
index 8f889405..da43182a 100644
--- a/stack/application/imageorchestrator/src/main/java/com/github/olly/workshop/imageorchestrator/service/clients/ImageResizeClient.java
+++ b/stack/application/imageorchestrator/src/main/java/com/github/olly/workshop/imageorchestrator/service/clients/ImageResizeClient.java
@@ -1,9 +1,9 @@
 package com.github.olly.workshop.imageorchestrator.service.clients;
 
 import com.github.olly.workshop.imageorchestrator.model.Image;
+import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.*;
 import org.springframework.stereotype.Service;
@@ -14,10 +14,10 @@
 import java.util.Collection;
 
 @Service
+@RequiredArgsConstructor
 public class ImageResizeClient {
 
-    @Autowired
-    RestTemplate restTemplate;
+    private final RestTemplate restTemplate;
 
     @Value("${imageresize.baseUrl}")
     private String imageresizeBaseUrl;
diff --git a/stack/application/imageorchestrator/src/main/java/com/github/olly/workshop/imageorchestrator/service/clients/ImageRotatorClient.java b/stack/application/imageorchestrator/src/main/java/com/github/olly/workshop/imageorchestrator/service/clients/ImageRotatorClient.java
index 98d4ea67..fd144bbb 100644
--- a/stack/application/imageorchestrator/src/main/java/com/github/olly/workshop/imageorchestrator/service/clients/ImageRotatorClient.java
+++ b/stack/application/imageorchestrator/src/main/java/com/github/olly/workshop/imageorchestrator/service/clients/ImageRotatorClient.java
@@ -1,9 +1,9 @@
 package com.github.olly.workshop.imageorchestrator.service.clients;
 
 import com.github.olly.workshop.imageorchestrator.model.Image;
+import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.*;
 import org.springframework.stereotype.Service;
@@ -14,55 +14,55 @@
 import java.util.Collection;
 
 @Service
+@RequiredArgsConstructor
 public class ImageRotatorClient {
 
-        @Autowired
-        RestTemplate restTemplate;
+    private final RestTemplate restTemplate;
 
-        @Value("${imagerotator.baseUrl}")
-        private String imagerotatorBaseUrl;
+    @Value("${imagerotator.baseUrl}")
+    private String imagerotatorBaseUrl;
 
-        private static final Logger LOGGER = LoggerFactory.getLogger(ImageRotatorClient.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ImageRotatorClient.class);
 
-        public Image transform(Image image, String degrees) {
+    public Image transform(Image image, String degrees) {
 
-                LOGGER.info("Rotating image by {} degrees", degrees);
+        LOGGER.info("Rotating image by {} degrees", degrees);
 
-                MultiValueMap<String, String> fileMap = new LinkedMultiValueMap<>();
-                ContentDisposition contentDisposition = ContentDisposition
-                                .builder("form-data")
-                                .name("image")
-                                .filename("image")
-                                .build();
-                fileMap.add(HttpHeaders.CONTENT_DISPOSITION, contentDisposition.toString());
-                fileMap.add(HttpHeaders.CONTENT_TYPE, image.getMimeType());
-                org.springframework.http.HttpEntity<byte[]> fileEntity = new org.springframework.http.HttpEntity<>(
-                                image.getData(), fileMap);
+        MultiValueMap<String, String> fileMap = new LinkedMultiValueMap<>();
+        ContentDisposition contentDisposition = ContentDisposition
+                .builder("form-data")
+                .name("image")
+                .filename("image")
+                .build();
+        fileMap.add(HttpHeaders.CONTENT_DISPOSITION, contentDisposition.toString());
+        fileMap.add(HttpHeaders.CONTENT_TYPE, image.getMimeType());
+        org.springframework.http.HttpEntity<byte[]> fileEntity = new org.springframework.http.HttpEntity<>(
+                image.getData(), fileMap);
 
-                MultiValueMap<String, Object> theMulitpartRequest = new LinkedMultiValueMap<>();
+        MultiValueMap<String, Object> theMulitpartRequest = new LinkedMultiValueMap<>();
 
-                theMulitpartRequest.add("image", fileEntity);
-                theMulitpartRequest.add("degrees", degrees);
+        theMulitpartRequest.add("image", fileEntity);
+        theMulitpartRequest.add("degrees", degrees);
 
-                HttpHeaders theMultipartHeaders = new HttpHeaders();
-                theMultipartHeaders.setContentType(MediaType.MULTIPART_FORM_DATA);
-                org.springframework.http.HttpEntity<MultiValueMap<String, Object>> requestEntity = new org.springframework.http.HttpEntity<>(
-                                theMulitpartRequest, theMultipartHeaders);
+        HttpHeaders theMultipartHeaders = new HttpHeaders();
+        theMultipartHeaders.setContentType(MediaType.MULTIPART_FORM_DATA);
+        org.springframework.http.HttpEntity<MultiValueMap<String, Object>> requestEntity = new org.springframework.http.HttpEntity<>(
+                theMulitpartRequest, theMultipartHeaders);
 
-                ResponseEntity<byte[]> response = restTemplate.exchange(
-                                imagerotatorBaseUrl + "/api/image/rotate", HttpMethod.POST, requestEntity,
-                                byte[].class);
+        ResponseEntity<byte[]> response = restTemplate.exchange(
+                imagerotatorBaseUrl + "/api/image/rotate", HttpMethod.POST, requestEntity,
+                byte[].class);
 
-                Collection<String> contentTypes = response.getHeaders().get("content-type");
-                String contentType = "image/png";
-                if (contentTypes.size() > 0) {
-                        String[] temp = new String[contentTypes.size()];
-                        contentTypes.toArray(temp);
-                        contentType = temp[0];
-                }
+        Collection<String> contentTypes = response.getHeaders().get("content-type");
+        String contentType = "image/png";
+        if (contentTypes.size() > 0) {
+            String[] temp = new String[contentTypes.size()];
+            contentTypes.toArray(temp);
+            contentType = temp[0];
+        }
 
-                return new Image(response.getBody(), contentType);
+        return new Image(response.getBody(), contentType);
 
-        }
+    }
 
 }
diff --git a/stack/application/imageorchestrator/src/main/resources/application.properties b/stack/application/imageorchestrator/src/main/resources/application.properties
index 4023f603..10a6452d 100644
--- a/stack/application/imageorchestrator/src/main/resources/application.properties
+++ b/stack/application/imageorchestrator/src/main/resources/application.properties
@@ -1,16 +1,15 @@
-server.error.whitelabel.enabled=false
-spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.web.servlet.error.ErrorMvcAutoConfiguration
 management.endpoint.metrics.enabled=true
 management.endpoints.web.exposure.include=*
 management.endpoint.prometheus.enabled=true
-management.metrics.export.prometheus.enabled=true
+management.prometheus.metrics.export.enabled=true
+server.error.whitelabel.enabled=false
+spring.application.name=imageorchestrator
+spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.web.servlet.error.ErrorMvcAutoConfiguration
 spring.servlet.multipart.max-file-size=10MB
 spring.servlet.multipart.max-request-size=10MB
-spring.sleuth.traceId128=true
-spring.sleuth.sampler.probability=1.0
-spring.zipkin.enabled=${TRACING_ENABLED:true}
-spring.zipkin.baseUrl=http://zipkin.istio-system:9411
-spring.zipkin.service.name=imageorchestrator
+management.tracing.enabled=${TRACING_ENABLED:true}
+management.tracing.sampling.probability=${TRACING_SAMPLING_PROPABILITY:1.0}
+management.zipkin.tracing.endpoint=${SPRING_ZIPKIN_ENDPOINT:http://localhost:9411/api/v2/spans}
 #logging.pattern.console=%date{"yyyy-MM-dd'T'HH:mm:ss.SSSZ", UTC} %5p %t %c{5}:%L [log_framework=logback;app_name=${APP_NAME};app_version=${APP_VERSION};instance_id=${CF_INSTANCE_INDEX}] %m MULTIEXCEPTION %replace(%xException){'\n','\u2028'}%nopex%n</pattern>
 honeycomb.beeline.service-name=imageorchestrator
 honeycomb.beeline.dataset=${HONEYCOMB_DATASET:workshop}
diff --git a/stack/application/imageorchestrator/src/test/java/com/github/olly/workshop/imageorchestrator/ImageorchestratorApplicationTests.java b/stack/application/imageorchestrator/src/test/java/com/github/olly/workshop/imageorchestrator/ImageorchestratorApplicationTests.java
index 1a150598..6fb26775 100644
--- a/stack/application/imageorchestrator/src/test/java/com/github/olly/workshop/imageorchestrator/ImageorchestratorApplicationTests.java
+++ b/stack/application/imageorchestrator/src/test/java/com/github/olly/workshop/imageorchestrator/ImageorchestratorApplicationTests.java
@@ -1,13 +1,10 @@
 package com.github.olly.workshop.imageorchestrator;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.cloud.openfeign.FeignAutoConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringRunner.class)
-@ImportAutoConfiguration({ FeignAutoConfiguration.class })
+@ImportAutoConfiguration({FeignAutoConfiguration.class})
 public class ImageorchestratorApplicationTests {
 
     @Test
diff --git a/stack/application/imageresize/build.gradle b/stack/application/imageresize/build.gradle
index 9459e797..c6dfc49f 100644
--- a/stack/application/imageresize/build.gradle
+++ b/stack/application/imageresize/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'org.springframework.boot' version "2.7.9"
+    id 'org.springframework.boot' version "3.1.4"
     id 'java'
 }
 
diff --git a/stack/application/imageresize/src/main/java/com/github/olly/workshop/imageresize/ImageresizeApplication.java b/stack/application/imageresize/src/main/java/com/github/olly/workshop/imageresize/ImageresizeApplication.java
index ab9cf587..e4d6b410 100644
--- a/stack/application/imageresize/src/main/java/com/github/olly/workshop/imageresize/ImageresizeApplication.java
+++ b/stack/application/imageresize/src/main/java/com/github/olly/workshop/imageresize/ImageresizeApplication.java
@@ -3,7 +3,6 @@
 import com.github.olly.workshop.springevents.SpringBootEventsConfiguration;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Import;
 
 @SpringBootApplication
@@ -11,6 +10,6 @@
 public class ImageresizeApplication {
 
     public static void main(String[] args) {
-        ConfigurableApplicationContext context = SpringApplication.run(ImageresizeApplication.class, args);
+        SpringApplication.run(ImageresizeApplication.class, args);
     }
 }
diff --git a/stack/application/imageresize/src/main/java/com/github/olly/workshop/imageresize/adapter/ImageController.java b/stack/application/imageresize/src/main/java/com/github/olly/workshop/imageresize/adapter/ImageController.java
index 3aabbc91..ce7ee251 100644
--- a/stack/application/imageresize/src/main/java/com/github/olly/workshop/imageresize/adapter/ImageController.java
+++ b/stack/application/imageresize/src/main/java/com/github/olly/workshop/imageresize/adapter/ImageController.java
@@ -3,9 +3,9 @@
 import com.github.olly.workshop.imageresize.config.LoggingContextUtil;
 import com.github.olly.workshop.imageresize.service.ImageService;
 import com.github.olly.workshop.springevents.service.EventService;
+import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -19,23 +19,19 @@
 import java.io.IOException;
 
 @RestController
+@RequiredArgsConstructor
 @RequestMapping(value = "/api/image")
 public class ImageController {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ImageController.class);
 
-    @Autowired
-    private ImageService imageService;
-
-    @Autowired
-    private LoggingContextUtil lcu;
-
-    @Autowired
-    private EventService eventService;
+    private final ImageService imageService;
+    private final LoggingContextUtil lcu;
+    private final EventService eventService;
 
     @PostMapping("resize")
     public ResponseEntity resizeImage(@RequestParam("image") MultipartFile file,
-            @RequestParam(value = "factor") String factor) throws IOException {
+                                      @RequestParam(value = "factor") String factor) throws IOException {
 
         lcu.mdcPut(file.getContentType(), factor);
         this.eventService.addFieldToActiveEvent("action", "resize");
diff --git a/stack/application/imageresize/src/main/java/com/github/olly/workshop/imageresize/service/ImageService.java b/stack/application/imageresize/src/main/java/com/github/olly/workshop/imageresize/service/ImageService.java
index c55ce2db..bc6ac1ea 100755
--- a/stack/application/imageresize/src/main/java/com/github/olly/workshop/imageresize/service/ImageService.java
+++ b/stack/application/imageresize/src/main/java/com/github/olly/workshop/imageresize/service/ImageService.java
@@ -1,9 +1,9 @@
 package com.github.olly.workshop.imageresize.service;
 
 import com.github.olly.workshop.springevents.service.EventService;
+import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -16,13 +16,12 @@
 import java.io.InputStream;
 
 @Service
+@RequiredArgsConstructor
 public class ImageService {
 
-    @Autowired
-    ImageResizeMetricsService imageResizeMetricsService;
+    private final ImageResizeMetricsService imageResizeMetricsService;
 
-    @Autowired
-    private EventService eventService;
+    private final EventService eventService;
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ImageService.class);
 
@@ -47,7 +46,7 @@ public byte[] resize(MultipartFile file, Double factor) {
     }
 
     private boolean isPng(String formatName) {
-        return formatName.toLowerCase().equals("png");
+        return formatName.equalsIgnoreCase("png");
     }
 
     private BufferedImage resize(BufferedImage image, Double factor, boolean preserveAlpha) {
diff --git a/stack/application/imageresize/src/main/resources/application.properties b/stack/application/imageresize/src/main/resources/application.properties
index 4789f514..6faea018 100644
--- a/stack/application/imageresize/src/main/resources/application.properties
+++ b/stack/application/imageresize/src/main/resources/application.properties
@@ -1,18 +1,17 @@
+management.endpoint.metrics.enabled=true
+management.endpoints.web.exposure.include=*
+management.endpoint.prometheus.enabled=true
+management.prometheus.metrics.export.enabled=true
 server.error.whitelabel.enabled=false
+spring.application.name=imageresize
 spring.data.mongodb.host=mongodb
 spring.data.mongodb.port=27017
 spring.data.mongodb.database=imageresize
-management.endpoint.metrics.enabled=true
-management.endpoints.web.exposure.include=*
-management.endpoint.prometheus.enabled=true
-management.metrics.export.prometheus.enabled=true
 spring.servlet.multipart.max-file-size=10MB
 spring.servlet.multipart.max-request-size=10MB
-spring.sleuth.traceId128=true
-spring.sleuth.sampler.probability=1.0
-spring.zipkin.enabled=${TRACING_ENABLED:true}
-spring.zipkin.baseUrl=http://zipkin.istio-system:9411
-spring.zipkin.service.name=imageresize
+management.tracing.enabled=${TRACING_ENABLED:true}
+management.tracing.sampling.probability=${TRACING_SAMPLING_PROPABILITY:1.0}
+management.zipkin.tracing.endpoint=${SPRING_ZIPKIN_ENDPOINT:http://localhost:9411/api/v2/spans}
 #logging.pattern.console=%date{"yyyy-MM-dd'T'HH:mm:ss.SSSZ", UTC} %5p %t %c{5}:%L [log_framework=logback;app_name=${APP_NAME};app_version=${APP_VERSION};instance_id=${CF_INSTANCE_INDEX}] %m MULTIEXCEPTION %replace(%xException){'\n','\u2028'}%nopex%n</pattern>
 honeycomb.beeline.service-name=imageresize
 honeycomb.beeline.dataset=${HONEYCOMB_DATASET:workshop}
diff --git a/stack/application/imageresize/src/test/java/com/github/olly/workshop/imageresize/adapter/ImageControllerTest.java b/stack/application/imageresize/src/test/java/com/github/olly/workshop/imageresize/adapter/ImageControllerTest.java
index 3de0d61c..26a87f97 100644
--- a/stack/application/imageresize/src/test/java/com/github/olly/workshop/imageresize/adapter/ImageControllerTest.java
+++ b/stack/application/imageresize/src/test/java/com/github/olly/workshop/imageresize/adapter/ImageControllerTest.java
@@ -1,12 +1,7 @@
 package com.github.olly.workshop.imageresize.adapter;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
-import java.io.IOException;
 import org.apache.commons.io.IOUtils;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.core.io.Resource;
@@ -14,10 +9,12 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.mock.web.MockMultipartFile;
-import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.web.multipart.MultipartFile;
 
-@RunWith(SpringRunner.class)
+import java.io.IOException;
+
+import static org.junit.jupiter.api.Assertions.*;
+
 @SpringBootTest
 public class ImageControllerTest {
 
@@ -25,7 +22,7 @@ public class ImageControllerTest {
     ImageController imageController;
 
     @Autowired
-    private ResourceLoader resourceLoader = null;
+    private final ResourceLoader resourceLoader = null;
 
     private MultipartFile getMultipartImage(String filename) {
         Resource image = resourceLoader.getResource("classpath:" + filename);
@@ -60,7 +57,7 @@ public void pngImageShouldReturnValidResponse() throws IOException {
     @Test
     public void emptyImageShouldReturnBadRequest() throws IOException {
         MultipartFile emptyImage = new MockMultipartFile("file",
-                "test.jpg", "image/jpg", new byte[] {});
+                "test.jpg", "image/jpg", new byte[]{});
         ResponseEntity response = imageController.resizeImage(emptyImage, "1.0");
         assertEquals(response.getStatusCode(), HttpStatus.BAD_REQUEST);
     }
@@ -68,7 +65,7 @@ public void emptyImageShouldReturnBadRequest() throws IOException {
     @Test
     public void unknownContentTypeShouldReturnBadRequest() throws IOException {
         MultipartFile wrongContent = new MockMultipartFile("file",
-                "test.jpg", "application/json", new byte[] { 0 });
+                "test.jpg", "application/json", new byte[]{0});
         ResponseEntity response = imageController.resizeImage(wrongContent, "1.0");
         assertEquals(response.getStatusCode(), HttpStatus.BAD_REQUEST);
     }
diff --git a/stack/application/imagerotator/build.gradle b/stack/application/imagerotator/build.gradle
index 7dd2477f..f920b826 100644
--- a/stack/application/imagerotator/build.gradle
+++ b/stack/application/imagerotator/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'org.springframework.boot' version "2.7.9"
+    id 'org.springframework.boot' version "3.1.4"
     id 'java'
 }
 
diff --git a/stack/application/imagerotator/src/main/java/com/github/olly/workshop/imagerotator/ImagerotatorApplication.java b/stack/application/imagerotator/src/main/java/com/github/olly/workshop/imagerotator/ImagerotatorApplication.java
index 536ef9f4..b54e1cdf 100644
--- a/stack/application/imagerotator/src/main/java/com/github/olly/workshop/imagerotator/ImagerotatorApplication.java
+++ b/stack/application/imagerotator/src/main/java/com/github/olly/workshop/imagerotator/ImagerotatorApplication.java
@@ -3,7 +3,6 @@
 import com.github.olly.workshop.springevents.SpringBootEventsConfiguration;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Import;
 
 @SpringBootApplication
@@ -11,6 +10,6 @@
 public class ImagerotatorApplication {
 
     public static void main(String[] args) {
-        ConfigurableApplicationContext context = SpringApplication.run(ImagerotatorApplication.class, args);
+        SpringApplication.run(ImagerotatorApplication.class, args);
     }
 }
diff --git a/stack/application/imagerotator/src/main/java/com/github/olly/workshop/imagerotator/adapter/ImageController.java b/stack/application/imagerotator/src/main/java/com/github/olly/workshop/imagerotator/adapter/ImageController.java
index 4e5fce30..19427c49 100644
--- a/stack/application/imagerotator/src/main/java/com/github/olly/workshop/imagerotator/adapter/ImageController.java
+++ b/stack/application/imagerotator/src/main/java/com/github/olly/workshop/imagerotator/adapter/ImageController.java
@@ -3,9 +3,9 @@
 import com.github.olly.workshop.imagerotator.config.LoggingContextUtil;
 import com.github.olly.workshop.imagerotator.service.ImageService;
 import com.github.olly.workshop.springevents.service.EventService;
+import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -19,23 +19,19 @@
 import java.io.IOException;
 
 @RestController
+@RequiredArgsConstructor
 @RequestMapping(value = "/api/image")
 public class ImageController {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ImageController.class);
 
-    @Autowired
-    private ImageService imageService;
-
-    @Autowired
-    private LoggingContextUtil lcu;
-
-    @Autowired
-    private EventService eventService;
+    private final ImageService imageService;
+    private final LoggingContextUtil lcu;
+    private final EventService eventService;
 
     @PostMapping("rotate")
     public ResponseEntity rotateImage(@RequestParam("image") MultipartFile file,
-            @RequestParam(value = "degrees") String degrees) throws IOException {
+                                      @RequestParam(value = "degrees") String degrees) throws IOException {
 
         lcu.mdcPut(file.getContentType(), degrees);
         this.eventService.addFieldToActiveEvent("action", "rotate");
diff --git a/stack/application/imagerotator/src/main/java/com/github/olly/workshop/imagerotator/service/ImageService.java b/stack/application/imagerotator/src/main/java/com/github/olly/workshop/imagerotator/service/ImageService.java
index 3c28966d..ec043f49 100755
--- a/stack/application/imagerotator/src/main/java/com/github/olly/workshop/imagerotator/service/ImageService.java
+++ b/stack/application/imagerotator/src/main/java/com/github/olly/workshop/imagerotator/service/ImageService.java
@@ -1,9 +1,9 @@
 package com.github.olly.workshop.imagerotator.service;
 
 import com.github.olly.workshop.springevents.service.EventService;
+import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -17,13 +17,12 @@
 import java.io.InputStream;
 
 @Service
+@RequiredArgsConstructor
 public class ImageService {
 
-    @Autowired
-    ImageRotatorMetricsService imageRotatorMetricsService;
+    private final ImageRotatorMetricsService imageRotatorMetricsService;
 
-    @Autowired
-    private EventService eventService;
+    private final EventService eventService;
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ImageService.class);
 
diff --git a/stack/application/imagerotator/src/main/resources/application.properties b/stack/application/imagerotator/src/main/resources/application.properties
index da5ace96..cee8b1af 100644
--- a/stack/application/imagerotator/src/main/resources/application.properties
+++ b/stack/application/imagerotator/src/main/resources/application.properties
@@ -1,18 +1,17 @@
+management.endpoint.metrics.enabled=true
+management.endpoints.web.exposure.include=*
+management.endpoint.prometheus.enabled=true
+management.prometheus.metrics.export.enabled=true
 server.error.whitelabel.enabled=false
+spring.application.name=imagerotator
 spring.data.mongodb.host=mongodb
 spring.data.mongodb.port=27017
 spring.data.mongodb.database=imagerotator
-management.endpoint.metrics.enabled=true
-management.endpoints.web.exposure.include=*
-management.endpoint.prometheus.enabled=true
-management.metrics.export.prometheus.enabled=true
 spring.servlet.multipart.max-file-size=10MB
 spring.servlet.multipart.max-request-size=10MB
-spring.sleuth.traceId128=true
-spring.sleuth.sampler.probability=1.0
-spring.zipkin.enabled=${TRACING_ENABLED:true}
-spring.zipkin.baseUrl=http://zipkin.istio-system:9411
-spring.zipkin.service.name=imagerotator
+management.tracing.enabled=${TRACING_ENABLED:true}
+management.tracing.sampling.probability=${TRACING_SAMPLING_PROPABILITY:1.0}
+management.zipkin.tracing.endpoint=${SPRING_ZIPKIN_ENDPOINT:http://localhost:9411/api/v2/spans}
 #logging.pattern.console=%date{"yyyy-MM-dd'T'HH:mm:ss.SSSZ", UTC} %5p %t %c{5}:%L [log_framework=logback;app_name=${APP_NAME};app_version=${APP_VERSION};instance_id=${CF_INSTANCE_INDEX}] %m MULTIEXCEPTION %replace(%xException){'\n','\u2028'}%nopex%n</pattern>
 honeycomb.beeline.service-name=imagerotator
 honeycomb.beeline.dataset=${HONEYCOMB_DATASET:workshop}
diff --git a/stack/application/imagerotator/src/test/java/com/github/olly/workshop/imagerotator/adapter/ImageControllerTest.java b/stack/application/imagerotator/src/test/java/com/github/olly/workshop/imagerotator/adapter/ImageControllerTest.java
index ffa3a53b..c451e186 100644
--- a/stack/application/imagerotator/src/test/java/com/github/olly/workshop/imagerotator/adapter/ImageControllerTest.java
+++ b/stack/application/imagerotator/src/test/java/com/github/olly/workshop/imagerotator/adapter/ImageControllerTest.java
@@ -1,12 +1,7 @@
 package com.github.olly.workshop.imagerotator.adapter;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
-import java.io.IOException;
 import org.apache.commons.io.IOUtils;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.core.io.Resource;
@@ -14,10 +9,12 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.mock.web.MockMultipartFile;
-import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.web.multipart.MultipartFile;
 
-@RunWith(SpringRunner.class)
+import java.io.IOException;
+
+import static org.junit.jupiter.api.Assertions.*;
+
 @SpringBootTest
 public class ImageControllerTest {
 
@@ -25,7 +22,7 @@ public class ImageControllerTest {
     ImageController imageController;
 
     @Autowired
-    private ResourceLoader resourceLoader = null;
+    private final ResourceLoader resourceLoader = null;
 
     private MultipartFile getMultipartImage(String filename) {
         Resource image = resourceLoader.getResource("classpath:" + filename);
@@ -61,7 +58,7 @@ public void pngImageShouldReturnValidResponse() throws IOException {
     @Test
     public void emptyImageShouldReturnBadRequest() throws IOException {
         MultipartFile emptyImage = new MockMultipartFile("file",
-                "test.jpg", "image/jpg", new byte[] {});
+                "test.jpg", "image/jpg", new byte[]{});
         ResponseEntity response = imageController.rotateImage(emptyImage, "0");
         assertEquals(response.getStatusCode(), HttpStatus.BAD_REQUEST);
     }
@@ -69,7 +66,7 @@ public void emptyImageShouldReturnBadRequest() throws IOException {
     @Test
     public void unknownContentTypeShouldReturnBadRequest() throws IOException {
         MultipartFile wrongContent = new MockMultipartFile("file",
-                "test.jpg", "application/json", new byte[] { 0 });
+                "test.jpg", "application/json", new byte[]{0});
         ResponseEntity response = imageController.rotateImage(wrongContent, "0");
         assertEquals(response.getStatusCode(), HttpStatus.BAD_REQUEST);
     }
diff --git a/stack/application/imagethumbnail/build.gradle b/stack/application/imagethumbnail/build.gradle
index f0cb1d54..f20dc888 100644
--- a/stack/application/imagethumbnail/build.gradle
+++ b/stack/application/imagethumbnail/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'org.springframework.boot' version "2.7.9"
+    id 'org.springframework.boot' version "3.1.4"
     id 'java'
 }
 
diff --git a/stack/application/imagethumbnail/src/main/java/com/github/olly/workshop/imagethumbnail/ImagethumbnailApplication.java b/stack/application/imagethumbnail/src/main/java/com/github/olly/workshop/imagethumbnail/ImagethumbnailApplication.java
index 64fd8187..9c1be56d 100644
--- a/stack/application/imagethumbnail/src/main/java/com/github/olly/workshop/imagethumbnail/ImagethumbnailApplication.java
+++ b/stack/application/imagethumbnail/src/main/java/com/github/olly/workshop/imagethumbnail/ImagethumbnailApplication.java
@@ -2,17 +2,19 @@
 
 import com.github.olly.workshop.springevents.SpringBootEventsConfiguration;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.cloud.openfeign.FeignAutoConfiguration;
 import org.springframework.context.annotation.Import;
 
 @SpringBootApplication
 @EnableFeignClients(basePackages = {"com.github"})
+@ImportAutoConfiguration({FeignAutoConfiguration.class})
 @Import(SpringBootEventsConfiguration.class)
 public class ImagethumbnailApplication {
 
     public static void main(String[] args) {
-        ConfigurableApplicationContext context = SpringApplication.run(ImagethumbnailApplication.class, args);
+        SpringApplication.run(ImagethumbnailApplication.class, args);
     }
 }
diff --git a/stack/application/imagethumbnail/src/main/java/com/github/olly/workshop/imagethumbnail/adapter/ImageController.java b/stack/application/imagethumbnail/src/main/java/com/github/olly/workshop/imagethumbnail/adapter/ImageController.java
index 75308e1c..9db4bd4e 100644
--- a/stack/application/imagethumbnail/src/main/java/com/github/olly/workshop/imagethumbnail/adapter/ImageController.java
+++ b/stack/application/imagethumbnail/src/main/java/com/github/olly/workshop/imagethumbnail/adapter/ImageController.java
@@ -6,9 +6,9 @@
 import com.github.olly.workshop.imagethumbnail.service.ImageThumbnailMetricsService;
 import com.github.olly.workshop.springevents.adapter.NotFoundException;
 import com.github.olly.workshop.springevents.service.EventService;
+import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -16,22 +16,16 @@
 import org.springframework.web.bind.annotation.*;
 
 @RestController
+@RequiredArgsConstructor
 @RequestMapping(value = "/api/images")
 public class ImageController {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ImageController.class);
 
-    @Autowired
-    private ImageService imageService;
-
-    @Autowired
-    private ImageThumbnailMetricsService imageThumbnailMetricsService;
-
-    @Autowired
-    private LoggingContextUtil loggingContextUtil;
-
-    @Autowired
-    private EventService eventService;
+    private final ImageService imageService;
+    private final ImageThumbnailMetricsService imageThumbnailMetricsService;
+    private final LoggingContextUtil loggingContextUtil;
+    private final EventService eventService;
 
     @GetMapping(value = "/{id}")
     public ResponseEntity getImage(@PathVariable("id") String id) {
diff --git a/stack/application/imagethumbnail/src/main/java/com/github/olly/workshop/imagethumbnail/service/ImageService.java b/stack/application/imagethumbnail/src/main/java/com/github/olly/workshop/imagethumbnail/service/ImageService.java
index 1e8d175e..c707afb3 100755
--- a/stack/application/imagethumbnail/src/main/java/com/github/olly/workshop/imagethumbnail/service/ImageService.java
+++ b/stack/application/imagethumbnail/src/main/java/com/github/olly/workshop/imagethumbnail/service/ImageService.java
@@ -3,9 +3,9 @@
 import com.github.olly.workshop.imagethumbnail.model.Image;
 import com.github.olly.workshop.imagethumbnail.service.clients.ImageHolderClient;
 import com.github.olly.workshop.springevents.service.EventService;
+import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
@@ -20,16 +20,12 @@
 import java.util.Map;
 
 @Service
+@RequiredArgsConstructor
 public class ImageService {
 
-    @Autowired
-    ImageThumbnailMetricsService imageThumbnailMetricsService;
-
-    @Autowired
-    ImageHolderClient imageHolderClient;
-
-    @Autowired
-    private EventService eventService;
+    private final ImageThumbnailMetricsService imageThumbnailMetricsService;
+    private final ImageHolderClient imageHolderClient;
+    private final EventService eventService;
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ImageService.class);
 
@@ -93,7 +89,7 @@ private byte[] thumbnailBytes(Image image) {
 
     private boolean isPng(String formatName) {
         this.eventService.addFieldToActiveEvent("content.is_png", formatName.toLowerCase());
-        return formatName.toLowerCase().equals("png");
+        return formatName.equalsIgnoreCase("png");
     }
 
     private BufferedImage resize(BufferedImage image, int width, int height, boolean preserveAlpha) {
diff --git a/stack/application/imagethumbnail/src/main/resources/application.properties b/stack/application/imagethumbnail/src/main/resources/application.properties
index 5912376b..99406dd8 100644
--- a/stack/application/imagethumbnail/src/main/resources/application.properties
+++ b/stack/application/imagethumbnail/src/main/resources/application.properties
@@ -1,22 +1,21 @@
+management.endpoint.metrics.enabled=true
+management.endpoints.web.exposure.include=*
+management.endpoint.prometheus.enabled=true
+management.prometheus.metrics.export.enabled=true
 server.error.whitelabel.enabled=false
+spring.application.name=imagethumbnail
 spring.data.mongodb.host=mongodb
 spring.data.mongodb.port=27017
 spring.data.mongodb.database=imagethumbnail
-management.endpoint.metrics.enabled=true
-management.endpoints.web.exposure.include=*
-management.endpoint.prometheus.enabled=true
-management.metrics.export.prometheus.enabled=true
 spring.servlet.multipart.max-file-size=10MB
 spring.servlet.multipart.max-request-size=10MB
-spring.sleuth.traceId128=true
-spring.sleuth.sampler.probability=1.0
-spring.zipkin.enabled=${TRACING_ENABLED:true}
-spring.zipkin.baseUrl=http://zipkin.istio-system:9411
-spring.zipkin.service.name=imagethumbnail
+management.tracing.enabled=${TRACING_ENABLED:true}
+management.tracing.sampling.probability=${TRACING_SAMPLING_PROPABILITY:1.0}
+management.zipkin.tracing.endpoint=${SPRING_ZIPKIN_ENDPOINT:http://localhost:9411/api/v2/spans}
 #logging.pattern.console=%date{"yyyy-MM-dd'T'HH:mm:ss.SSSZ", UTC} %5p %t %c{5}:%L [log_framework=logback;app_name=${APP_NAME};app_version=${APP_VERSION};instance_id=${CF_INSTANCE_INDEX}] %m MULTIEXCEPTION %replace(%xException){'\n','\u2028'}%nopex%n</pattern>
 honeycomb.beeline.service-name=imagethumbnail
 honeycomb.beeline.dataset=${HONEYCOMB_DATASET:workshop}
 honeycomb.beeline.write-key=${HONEYCOMB_KEY}
 honeycomb.beeline.enabled=${HONEYCOMB_ENABLED:false}
 honeycomb.beeline.log-honeycomb-responses=true
-imageholder.baseUrl=http://imageholder-service:8080
\ No newline at end of file
+imageholder.baseUrl=${IMAGEHOLDER_BASEURL:http://imageholder-service:8080}
diff --git a/stack/application/imagethumbnail/src/test/java/com/github/olly/workshop/imagethumbnail/ImagethumbnailApplicationTests.java b/stack/application/imagethumbnail/src/test/java/com/github/olly/workshop/imagethumbnail/ImagethumbnailApplicationTests.java
index 93b5ee84..e073eb1a 100644
--- a/stack/application/imagethumbnail/src/test/java/com/github/olly/workshop/imagethumbnail/ImagethumbnailApplicationTests.java
+++ b/stack/application/imagethumbnail/src/test/java/com/github/olly/workshop/imagethumbnail/ImagethumbnailApplicationTests.java
@@ -1,15 +1,12 @@
 package com.github.olly.workshop.imagethumbnail;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.test.autoconfigure.data.mongo.DataMongoTest;
 import org.springframework.cloud.openfeign.FeignAutoConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringRunner.class)
 @DataMongoTest
-@ImportAutoConfiguration({ FeignAutoConfiguration.class })
+@ImportAutoConfiguration({FeignAutoConfiguration.class})
 public class ImagethumbnailApplicationTests {
 
     @Test
diff --git a/stack/application/springevents/src/main/java/com/github/olly/workshop/springevents/adapter/ExceptionHandlerHttp.java b/stack/application/springevents/src/main/java/com/github/olly/workshop/springevents/adapter/ExceptionHandlerHttp.java
index 284001b6..cac8370f 100644
--- a/stack/application/springevents/src/main/java/com/github/olly/workshop/springevents/adapter/ExceptionHandlerHttp.java
+++ b/stack/application/springevents/src/main/java/com/github/olly/workshop/springevents/adapter/ExceptionHandlerHttp.java
@@ -27,7 +27,7 @@ public ExceptionHandlerHttp(EventService eventService) {
     ResponseEntity<Exception> handleNotFoundException(Exception ex) throws Exception {
         ResponseStatusException rex = new ResponseStatusException(HttpStatus.NOT_FOUND, "not found", ex);
         logAndAppendToEvent(rex);
-        return new ResponseEntity<>(rex.getStatus());
+        return new ResponseEntity<>(rex.getStatusCode());
     }
 
     @ExceptionHandler({Throwable.class})
@@ -35,13 +35,13 @@ ResponseEntity<Exception> handleNotFoundException(Exception ex) throws Exception
     ResponseEntity<Exception> handleThrowable(Exception ex) throws Exception {
         ResponseStatusException rex = new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, "unexpected exception thrown", ex);
         logAndAppendToEvent(rex);
-        return new ResponseEntity<>((rex).getStatus());
+        return new ResponseEntity<>((rex).getStatusCode());
     }
 
     private void logAndAppendToEvent(ResponseStatusException ex) {
         LOGGER.error(ex.getLocalizedMessage(), ex);
 
-        eventService.addFieldToActiveEvent("response_status", ex.getStatus());
+        eventService.addFieldToActiveEvent("response_status", ex.getStatusCode());
         eventService.addFieldToActiveEvent("exception_thrown", "true");
         eventService.addFieldToActiveEvent("exception_message", ex.getMessage());
         eventService.addFieldToActiveEvent("exception_stacktrace", ExceptionUtils.getStackTrace(ex));
diff --git a/stack/application/springevents/src/main/java/com/github/olly/workshop/springevents/adapter/InterceptorConfiguration.java b/stack/application/springevents/src/main/java/com/github/olly/workshop/springevents/adapter/InterceptorConfiguration.java
index 80478f7b..2029db06 100644
--- a/stack/application/springevents/src/main/java/com/github/olly/workshop/springevents/adapter/InterceptorConfiguration.java
+++ b/stack/application/springevents/src/main/java/com/github/olly/workshop/springevents/adapter/InterceptorConfiguration.java
@@ -1,14 +1,14 @@
 package com.github.olly.workshop.springevents.adapter;
 
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @Component
+@RequiredArgsConstructor
 public class InterceptorConfiguration implements WebMvcConfigurer {
-    @Autowired
-    RequestInterceptor requestInterceptor;
+    private final RequestInterceptor requestInterceptor;
 
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
diff --git a/stack/application/springevents/src/main/java/com/github/olly/workshop/springevents/adapter/RequestInterceptor.java b/stack/application/springevents/src/main/java/com/github/olly/workshop/springevents/adapter/RequestInterceptor.java
index b8dfc799..a0f4ffe9 100644
--- a/stack/application/springevents/src/main/java/com/github/olly/workshop/springevents/adapter/RequestInterceptor.java
+++ b/stack/application/springevents/src/main/java/com/github/olly/workshop/springevents/adapter/RequestInterceptor.java
@@ -3,27 +3,25 @@
 import com.github.olly.workshop.springevents.service.Event;
 import com.github.olly.workshop.springevents.service.EventService;
 import com.github.olly.workshop.springevents.service.MetricsService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
 
 @Component
+@RequiredArgsConstructor
 public class RequestInterceptor implements HandlerInterceptor {
 
-    @Autowired
-    MetricsService metricsService;
-
-    @Autowired
-    EventService eventService;
+    private final MetricsService metricsService;
+    private final EventService eventService;
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
diff --git a/stack/application/trafficgen/build.gradle b/stack/application/trafficgen/build.gradle
index 7c40af78..34a680d3 100644
--- a/stack/application/trafficgen/build.gradle
+++ b/stack/application/trafficgen/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'org.springframework.boot' version "2.7.9"
+    id 'org.springframework.boot' version "3.1.4"
     id 'java'
 }
 
diff --git a/stack/application/trafficgen/src/main/java/com/github/olly/workshop/trafficgen/TrafficGenApplication.java b/stack/application/trafficgen/src/main/java/com/github/olly/workshop/trafficgen/TrafficGenApplication.java
index d4e6d0c7..cb44d1d2 100644
--- a/stack/application/trafficgen/src/main/java/com/github/olly/workshop/trafficgen/TrafficGenApplication.java
+++ b/stack/application/trafficgen/src/main/java/com/github/olly/workshop/trafficgen/TrafficGenApplication.java
@@ -1,23 +1,25 @@
 package com.github.olly.workshop.trafficgen;
 
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.cloud.openfeign.FeignAutoConfiguration;
 import org.springframework.context.annotation.Bean;
-import org.springframework.web.client.RestTemplate;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.web.client.RestTemplate;
 
 @SpringBootApplication
-@EnableFeignClients(basePackages = { "com.github" })
+@EnableFeignClients(basePackages = {"com.github"})
+@ImportAutoConfiguration({FeignAutoConfiguration.class})
 @EnableAsync
 @EnableScheduling
 public class TrafficGenApplication {
 
     public static void main(String[] args) {
-        ConfigurableApplicationContext context = SpringApplication.run(TrafficGenApplication.class, args);
+        SpringApplication.run(TrafficGenApplication.class, args);
     }
 
     @Bean
diff --git a/stack/application/trafficgen/src/main/java/com/github/olly/workshop/trafficgen/adapter/TrafficGenController.java b/stack/application/trafficgen/src/main/java/com/github/olly/workshop/trafficgen/adapter/TrafficGenController.java
index 38f28a5e..cc17d147 100644
--- a/stack/application/trafficgen/src/main/java/com/github/olly/workshop/trafficgen/adapter/TrafficGenController.java
+++ b/stack/application/trafficgen/src/main/java/com/github/olly/workshop/trafficgen/adapter/TrafficGenController.java
@@ -1,23 +1,22 @@
 package com.github.olly.workshop.trafficgen.adapter;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.RequestParam;
-
 import com.github.olly.workshop.trafficgen.service.ConfigurationService;
 import com.github.olly.workshop.trafficgen.service.tranformation.TransformationTrafficService;
 import com.github.olly.workshop.trafficgen.service.upload.UploadService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 @RestController
+@RequiredArgsConstructor
 @RequestMapping(value = "/api/traffic/image")
 public class TrafficGenController {
-    @Autowired
-    private UploadService randomUploadService;
 
-    @Autowired
-    private ConfigurationService configurationService;
+    private final UploadService randomUploadService;
+
+    private final ConfigurationService configurationService;
 
     @PostMapping(value = "transform/start")
     public void transformStart(@RequestParam(value = "transformationsPerSecond") int transformationsPerSecond) {
diff --git a/stack/application/trafficgen/src/main/java/com/github/olly/workshop/trafficgen/service/SpringEventTriggeredServiceSchedulerBase.java b/stack/application/trafficgen/src/main/java/com/github/olly/workshop/trafficgen/service/SpringEventTriggeredServiceSchedulerBase.java
index ae5fc160..03e302e5 100644
--- a/stack/application/trafficgen/src/main/java/com/github/olly/workshop/trafficgen/service/SpringEventTriggeredServiceSchedulerBase.java
+++ b/stack/application/trafficgen/src/main/java/com/github/olly/workshop/trafficgen/service/SpringEventTriggeredServiceSchedulerBase.java
@@ -1,28 +1,27 @@
 package com.github.olly.workshop.trafficgen.service;
 
-import java.util.Set;
-
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.event.ContextRefreshedEvent;
-import org.springframework.scheduling.TaskScheduler;
 import org.springframework.context.event.EventListener;
+import org.springframework.scheduling.TaskScheduler;
 
-public abstract class SpringEventTriggeredServiceSchedulerBase<T extends TriggeredService> {
+import java.util.Objects;
+import java.util.Set;
 
-    @Autowired
-    private ApplicationContext applicationContextToReactOn;
+@RequiredArgsConstructor
+public abstract class SpringEventTriggeredServiceSchedulerBase<T extends TriggeredService> {
 
-    @Autowired
-    private ConfigurationService configurationService;
+    private final ApplicationContext applicationContextToReactOn;
+    private final ConfigurationService configurationService;
 
     @EventListener
     public void onApplicationEvent(ContextRefreshedEvent event) {
-        if (!this.applicationContextToReactOn.getId().equals(event.getApplicationContext().getId())) {
+        if (!Objects.equals(this.applicationContextToReactOn.getId(), event.getApplicationContext().getId())) {
             return;
         }
 
-        getServices().stream().forEach(this::startService);
+        getServices().forEach(this::startService);
     }
 
     private final void startService(T service) {
diff --git a/stack/application/trafficgen/src/main/java/com/github/olly/workshop/trafficgen/service/TriggeredService.java b/stack/application/trafficgen/src/main/java/com/github/olly/workshop/trafficgen/service/TriggeredService.java
index 137a99c0..63106a64 100644
--- a/stack/application/trafficgen/src/main/java/com/github/olly/workshop/trafficgen/service/TriggeredService.java
+++ b/stack/application/trafficgen/src/main/java/com/github/olly/workshop/trafficgen/service/TriggeredService.java
@@ -1,12 +1,18 @@
 package com.github.olly.workshop.trafficgen.service;
 
-import java.util.Optional;
-
 import org.springframework.scheduling.Trigger;
+import org.springframework.scheduling.support.CronTrigger;
+import org.springframework.scheduling.support.PeriodicTrigger;
+
+import java.time.Duration;
+import java.util.Optional;
 
 public interface TriggeredService extends Runnable {
 
     long NO_CONFIG_VALUE = 0L;
+    long S_IN_MS = 1000L;
+    Trigger NEVER_RUN_TRIGGER = new CronTrigger("0 0 0 31 2 *");
+    Trigger ONCE_NOW_TRIGGER = new PeriodicTrigger(Duration.ofSeconds(Long.MAX_VALUE));
 
     Optional<String> getKey();
 
diff --git a/stack/application/trafficgen/src/main/java/com/github/olly/workshop/trafficgen/service/tranformation/TransformationService.java b/stack/application/trafficgen/src/main/java/com/github/olly/workshop/trafficgen/service/tranformation/TransformationService.java
index adbcbf11..cb38f32b 100644
--- a/stack/application/trafficgen/src/main/java/com/github/olly/workshop/trafficgen/service/tranformation/TransformationService.java
+++ b/stack/application/trafficgen/src/main/java/com/github/olly/workshop/trafficgen/service/tranformation/TransformationService.java
@@ -1,33 +1,30 @@
 package com.github.olly.workshop.trafficgen.service.tranformation;
 
-import com.github.olly.workshop.trafficgen.clients.*;
+import com.github.olly.workshop.trafficgen.clients.ImageHolderClient;
+import com.github.olly.workshop.trafficgen.clients.ImageOrchestratorClient;
 import com.github.olly.workshop.trafficgen.model.Transformation;
 import com.github.olly.workshop.trafficgen.model.TransformationRequest;
 import com.github.olly.workshop.trafficgen.model.TransformationType;
 import com.github.olly.workshop.trafficgen.service.TrafficGenMetricsService;
-
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
-import org.apache.commons.lang3.RandomStringUtils;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
 import java.util.stream.Collectors;
 
 @Service
+@RequiredArgsConstructor
 public class TransformationService {
 
-    @Autowired
-    private TrafficGenMetricsService trafficGenMetricsService;
-
-    @Autowired
-    private ImageHolderClient imageHolderClient;
-    @Autowired
-    private ImageOrchestratorClient imageOrchestratorClient;
+    private final TrafficGenMetricsService trafficGenMetricsService;
+    private final ImageHolderClient imageHolderClient;
+    private final ImageOrchestratorClient imageOrchestratorClient;
 
     private static final Logger LOGGER = LoggerFactory.getLogger(TransformationService.class);
 
@@ -37,7 +34,7 @@ public class TransformationService {
     private static final int MAX_RESIZE_FACTOR = 3;
     private static final float PERSISTENCE_PROBABILITY = 1 / 100;
 
-    private Random random = new Random();
+    private final Random random = new Random();
 
     @Async
     public void sendRandomRequest() {
@@ -64,13 +61,13 @@ private Transformation randomTransformation() {
                 TransformationType.values().length)];
 
         Map<String, String> randomTransformationProperties = switch (randomType) {
-            case rotate -> Map.<String, String>of("degrees",
+            case rotate -> Map.of("degrees",
                     String.valueOf((random.nextBoolean() ? 1 : -1) * random.nextInt(360)));
-            case flip -> Map.<String, String>of(
+            case flip -> Map.of(
                     "vertical", String.valueOf(random.nextBoolean()),
                     "horizontal", String.valueOf(random.nextBoolean()));
             case grayscale -> Map.of();
-            case resize -> Map.<String, String>of("factor",
+            case resize -> Map.of("factor",
                     String.valueOf(MIN_RESIZE_FACTOR * random.nextInt((int) (MAX_RESIZE_FACTOR / MIN_RESIZE_FACTOR))));
         };
 
@@ -78,10 +75,10 @@ private Transformation randomTransformation() {
     }
 
     private TransformationRequest createRandomTransformationRequest(String imageId) {
-        final Boolean persist = random.nextInt((int) (1 / PERSISTENCE_PROBABILITY)) == 0 ? true : false;
+        final Boolean persist = random.nextInt((int) (1 / PERSISTENCE_PROBABILITY)) == 0;
         final String name = imageId + RandomStringUtils.randomAlphanumeric(RANDOM_NAME_SUFFIX_LENGTH).toLowerCase();
         List<Transformation> transformations = random.ints(random.nextInt(
-                MAX_NUMBER_OF_TRANSFORMATION_PER_IMAGE)).mapToObj(i -> randomTransformation())
+                        MAX_NUMBER_OF_TRANSFORMATION_PER_IMAGE)).mapToObj(i -> randomTransformation())
                 .collect(Collectors.toList());
 
         return new TransformationRequest(imageId, transformations, persist, name);
diff --git a/stack/application/trafficgen/src/main/java/com/github/olly/workshop/trafficgen/service/tranformation/TransformationTrafficService.java b/stack/application/trafficgen/src/main/java/com/github/olly/workshop/trafficgen/service/tranformation/TransformationTrafficService.java
index fdd5dfb7..d81ff08b 100644
--- a/stack/application/trafficgen/src/main/java/com/github/olly/workshop/trafficgen/service/tranformation/TransformationTrafficService.java
+++ b/stack/application/trafficgen/src/main/java/com/github/olly/workshop/trafficgen/service/tranformation/TransformationTrafficService.java
@@ -1,44 +1,39 @@
 package com.github.olly.workshop.trafficgen.service.tranformation;
 
-import org.springframework.stereotype.Service;
-
 import com.github.olly.workshop.trafficgen.service.TriggeredService;
-
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.scheduling.Trigger;
 import org.springframework.scheduling.support.PeriodicTrigger;
+import org.springframework.stereotype.Service;
 
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
 import java.util.Optional;
-import java.util.concurrent.TimeUnit;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 @Service
+@RequiredArgsConstructor
 public class TransformationTrafficService implements TriggeredService {
-    private static final long S_IN_MS = 1000L;
 
-    public static String SERVICE_KEY = "tranformation-traffic-service";
+    public static final String SERVICE_KEY = "tranformation-traffic-service";
 
     private static final Logger LOGGER = LoggerFactory.getLogger(TransformationTrafficService.class);
 
-    @Autowired
-    private TransformationService randomTransformationService;
+    private final TransformationService randomTransformationService;
 
     @Override
     public Optional<String> getKey() {
         return Optional.of(SERVICE_KEY);
-    };
+    }
 
     @Override
     public Trigger constructTrigger(long transformationsPerSecond) {
         LOGGER.info("Constructing trigger with transformationsPerSecond " + transformationsPerSecond);
         if (transformationsPerSecond > 0) {
-            return new PeriodicTrigger(S_IN_MS / transformationsPerSecond);
+            return new PeriodicTrigger(Duration.of(S_IN_MS / transformationsPerSecond, ChronoUnit.MILLIS));
         }
-        PeriodicTrigger never = new PeriodicTrigger(Long.MAX_VALUE, TimeUnit.HOURS);
-        never.setInitialDelay(Long.MAX_VALUE);
-        return never;
+        return NEVER_RUN_TRIGGER;
     }
 
     @Override
diff --git a/stack/application/trafficgen/src/main/java/com/github/olly/workshop/trafficgen/service/tranformation/TransformationTrafficServiceScheduler.java b/stack/application/trafficgen/src/main/java/com/github/olly/workshop/trafficgen/service/tranformation/TransformationTrafficServiceScheduler.java
index a2d2facf..65231a47 100644
--- a/stack/application/trafficgen/src/main/java/com/github/olly/workshop/trafficgen/service/tranformation/TransformationTrafficServiceScheduler.java
+++ b/stack/application/trafficgen/src/main/java/com/github/olly/workshop/trafficgen/service/tranformation/TransformationTrafficServiceScheduler.java
@@ -1,24 +1,26 @@
 package com.github.olly.workshop.trafficgen.service.tranformation;
 
-import java.util.Set;
-
-import org.springframework.beans.factory.annotation.Autowired;
+import com.github.olly.workshop.trafficgen.service.ConfigurationService;
+import com.github.olly.workshop.trafficgen.service.SpringEventTriggeredServiceSchedulerBase;
+import org.springframework.context.ApplicationContext;
 import org.springframework.scheduling.TaskScheduler;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
-
 import org.springframework.stereotype.Service;
 
-import com.github.olly.workshop.trafficgen.service.SpringEventTriggeredServiceSchedulerBase;
+import java.util.Set;
 
 @Service
 public class TransformationTrafficServiceScheduler
         extends SpringEventTriggeredServiceSchedulerBase<TransformationTrafficService> {
 
-    @Autowired
-    private ThreadPoolTaskScheduler scheduler;
+    private final ThreadPoolTaskScheduler scheduler;
+    private final TransformationTrafficService services;
 
-    @Autowired
-    private TransformationTrafficService services;
+    public TransformationTrafficServiceScheduler(ApplicationContext applicationContextToReactOn, ConfigurationService configurationService, ThreadPoolTaskScheduler scheduler, TransformationTrafficService services) {
+        super(applicationContextToReactOn, configurationService);
+        this.scheduler = scheduler;
+        this.services = services;
+    }
 
     @Override
     protected Set<TransformationTrafficService> getServices() {
diff --git a/stack/application/trafficgen/src/main/java/com/github/olly/workshop/trafficgen/service/upload/UploadService.java b/stack/application/trafficgen/src/main/java/com/github/olly/workshop/trafficgen/service/upload/UploadService.java
index 3bc9dc19..a682b1c7 100644
--- a/stack/application/trafficgen/src/main/java/com/github/olly/workshop/trafficgen/service/upload/UploadService.java
+++ b/stack/application/trafficgen/src/main/java/com/github/olly/workshop/trafficgen/service/upload/UploadService.java
@@ -1,35 +1,30 @@
 package com.github.olly.workshop.trafficgen.service.upload;
 
+import com.github.olly.workshop.trafficgen.clients.ImageHolderClient;
+import com.github.olly.workshop.trafficgen.service.TrafficGenMetricsService;
+import com.github.olly.workshop.trafficgen.service.tranformation.TransformationService;
 import feign.FeignException;
-
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.io.InputStream;
-import java.io.IOException;
-import org.springframework.mock.web.MockMultipartFile;
-import org.apache.commons.io.IOUtils;
-import org.springframework.web.multipart.MultipartFile;
-
-import com.github.olly.workshop.trafficgen.clients.*;
-import com.github.olly.workshop.trafficgen.service.TrafficGenMetricsService;
-import com.github.olly.workshop.trafficgen.service.tranformation.TransformationService;
-
 import org.springframework.core.io.Resource;
-import org.springframework.core.io.support.ResourcePatternResolver;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.core.io.support.ResourcePatternResolver;
+import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.io.InputStream;
 
 @Service
+@RequiredArgsConstructor
 public class UploadService {
 
-    @Autowired
-    private ImageHolderClient imageHolderClient;
-
-    @Autowired
-    private TrafficGenMetricsService trafficGenMetricsService;
+    private final ImageHolderClient imageHolderClient;
+    private final TrafficGenMetricsService trafficGenMetricsService;
 
     private static final Logger LOGGER = LoggerFactory.getLogger(TransformationService.class);
 
diff --git a/stack/application/trafficgen/src/main/java/com/github/olly/workshop/trafficgen/service/upload/UploadTrafficService.java b/stack/application/trafficgen/src/main/java/com/github/olly/workshop/trafficgen/service/upload/UploadTrafficService.java
index 6b74d1d5..b981ab12 100644
--- a/stack/application/trafficgen/src/main/java/com/github/olly/workshop/trafficgen/service/upload/UploadTrafficService.java
+++ b/stack/application/trafficgen/src/main/java/com/github/olly/workshop/trafficgen/service/upload/UploadTrafficService.java
@@ -1,43 +1,38 @@
 package com.github.olly.workshop.trafficgen.service.upload;
 
-import org.springframework.stereotype.Service;
-
 import com.github.olly.workshop.trafficgen.service.TriggeredService;
-
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.scheduling.Trigger;
 import org.springframework.scheduling.support.PeriodicTrigger;
+import org.springframework.stereotype.Service;
 
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
 import java.util.Optional;
-import java.util.concurrent.TimeUnit;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 @Service
+@RequiredArgsConstructor
 public class UploadTrafficService implements TriggeredService {
-    private static final long S_IN_MS = 1000L;
-
-    public static String SERVICE_KEY = "upload-traffic-service";
+    public static final String SERVICE_KEY = "upload-traffic-service";
 
     private static final Logger LOGGER = LoggerFactory.getLogger(UploadTrafficService.class);
 
-    @Autowired
-    private UploadService uploadService;
+    private final UploadService uploadService;
 
     @Override
     public Optional<String> getKey() {
         return Optional.of(SERVICE_KEY);
-    };
+    }
 
     @Override
     public Trigger constructTrigger(long transformationsPerSecond) {
         LOGGER.info("Constructing trigger with uploadsPerSecond " + transformationsPerSecond);
         if (transformationsPerSecond > 0) {
-            return new PeriodicTrigger(S_IN_MS / transformationsPerSecond);
+            return new PeriodicTrigger(Duration.of(S_IN_MS / transformationsPerSecond, ChronoUnit.MILLIS));
         }
-        PeriodicTrigger onceNow = new PeriodicTrigger(Long.MAX_VALUE, TimeUnit.HOURS);
-        return onceNow;
+        return ONCE_NOW_TRIGGER;
     }
 
     @Override
diff --git a/stack/application/trafficgen/src/main/java/com/github/olly/workshop/trafficgen/service/upload/UploadTrafficServiceScheduler.java b/stack/application/trafficgen/src/main/java/com/github/olly/workshop/trafficgen/service/upload/UploadTrafficServiceScheduler.java
index 51bee5b5..cb31713b 100644
--- a/stack/application/trafficgen/src/main/java/com/github/olly/workshop/trafficgen/service/upload/UploadTrafficServiceScheduler.java
+++ b/stack/application/trafficgen/src/main/java/com/github/olly/workshop/trafficgen/service/upload/UploadTrafficServiceScheduler.java
@@ -1,24 +1,26 @@
 package com.github.olly.workshop.trafficgen.service.upload;
 
-import java.util.Set;
-
-import org.springframework.beans.factory.annotation.Autowired;
+import com.github.olly.workshop.trafficgen.service.ConfigurationService;
+import com.github.olly.workshop.trafficgen.service.SpringEventTriggeredServiceSchedulerBase;
+import org.springframework.context.ApplicationContext;
 import org.springframework.scheduling.TaskScheduler;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
-
 import org.springframework.stereotype.Service;
 
-import com.github.olly.workshop.trafficgen.service.SpringEventTriggeredServiceSchedulerBase;
+import java.util.Set;
 
 @Service
 public class UploadTrafficServiceScheduler
         extends SpringEventTriggeredServiceSchedulerBase<UploadTrafficService> {
 
-    @Autowired
-    private ThreadPoolTaskScheduler scheduler;
+    private final ThreadPoolTaskScheduler scheduler;
+    private final UploadTrafficService services;
 
-    @Autowired
-    private UploadTrafficService services;
+    public UploadTrafficServiceScheduler(ApplicationContext applicationContextToReactOn, ConfigurationService configurationService, ThreadPoolTaskScheduler scheduler, UploadTrafficService services) {
+        super(applicationContextToReactOn, configurationService);
+        this.scheduler = scheduler;
+        this.services = services;
+    }
 
     @Override
     protected Set<UploadTrafficService> getServices() {
diff --git a/stack/application/trafficgen/src/main/resources/application.properties b/stack/application/trafficgen/src/main/resources/application.properties
index 76216f67..20f8bce6 100644
--- a/stack/application/trafficgen/src/main/resources/application.properties
+++ b/stack/application/trafficgen/src/main/resources/application.properties
@@ -1,20 +1,19 @@
-server.error.whitelabel.enabled=false
-spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.web.servlet.error.ErrorMvcAutoConfiguration
 management.endpoint.metrics.enabled=true
 management.endpoints.web.exposure.include=*
 management.endpoint.prometheus.enabled=true
-management.metrics.export.prometheus.enabled=true
+management.prometheus.metrics.export.enabled=true
+server.error.whitelabel.enabled=false
 spring.servlet.multipart.max-file-size=10MB
 spring.servlet.multipart.max-request-size=10MB
-spring.sleuth.async.enabled=false
-spring.sleuth.scheduled.enabled=false
-spring.sleuth.web.client.enabled=false
-spring.zipkin.enabled=false
-#logging.pattern.console=%date{"yyyy-MM-dd'T'HH:mm:ss.SSSZ", UTC} %5p %t %c{5}:%L [log_framework=logback;app_name=${APP_NAME};app_version=${APP_VERSION};instance_id=${CF_INSTANCE_INDEX}] %m MULTIEXCEPTION %replace(%xException){'\n','\u2028'}%nopex%n</pattern>
+spring.application.name=trafficgen
+spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.web.servlet.error.ErrorMvcAutoConfiguration
+management.tracing.enabled=${TRACING_ENABLED:true}
+management.tracing.sampling.probability=${TRACING_SAMPLING_PROPABILITY:1.0}
+management.zipkin.tracing.endpoint=${SPRING_ZIPKIN_ENDPOINT:http://localhost:9411/api/v2/spans}
 honeycomb.beeline.service-name=trafficgen
 honeycomb.beeline.dataset=${HONEYCOMB_DATASET:workshop}
 honeycomb.beeline.write-key=${HONEYCOMB_KEY}
 honeycomb.beeline.enabled=${HONEYCOMB_ENABLED:false}
 honeycomb.beeline.log-honeycomb-responses=true
-imageholder.baseUrl=https://o11y.fans/proxy/imageholder
-imageorchestrator.baseUrl=https://o11y.fans/proxy/imageorchestrator
\ No newline at end of file
+#imageholder.baseUrl=${IMAGEHOLDER_BASEURL:https://o11y.fans/proxy/imageholder}
+#imageorchestrator.baseUrl=${IMAGEORCHESTRATOR_BASEURL:https://o11y.fans/proxy/imageorchestrator}
diff --git a/stack/kubernetes/24_deploy_logging.sh b/stack/kubernetes/24_deploy_logging.sh
index 27891085..af57f4f9 100755
--- a/stack/kubernetes/24_deploy_logging.sh
+++ b/stack/kubernetes/24_deploy_logging.sh
@@ -3,6 +3,7 @@ set -euo pipefail
 
 NAMESPACE=logging
 ELASTIC_VERSION="7.17.3"
+FLUENTD_VERSION="0.4.3"
 
 echo "=== Deploy logging stack in namespace ${NAMESPACE}"
 
@@ -22,7 +23,7 @@ echo "--- install curator"
 helm upgrade --install -n "$NAMESPACE" -f tools/logging/curator.yaml elasticsearch-curator lebenitza/elasticsearch-curator
 
 echo "--- install fluentd"
-helm upgrade --install -n "$NAMESPACE" -f tools/logging/fluentd.yaml fluentd fluent/fluentd
+helm upgrade --install -n "$NAMESPACE" -f tools/logging/fluentd.yaml fluentd fluent/fluentd --version ${FLUENTD_VERSION}
 #  kubectl delete -n "$NAMESPACE" configmaps/kibana-kibana-helm-scripts serviceaccounts/pre-install-kibana-kibana roles/pre-install-kibana-kibana rolebindings.rbac.authorization.k8s.io/pre-install-kibana-kibana jobs.batch/pre-install-kibana-kibana
 
 echo "--- install kibana"
@@ -38,4 +39,10 @@ helm upgrade --install -n "$NAMESPACE" --version ${ELASTIC_VERSION} apm-server e
 # kubectl apply -f tools/logging/heartbeat-v7.17.yaml
 
 echo "--- apply kibana index mappings and patterns"
-./tools/logging/kibana-index/build_deploy.sh "$NAMESPACE"
\ No newline at end of file
+
+if ! cat ~/.docker/config.json | grep "gcr.io" >/dev/null; then
+  gcloud auth configure-docker gcr.io --quiet
+fi
+
+./tools/logging/kibana-index/build_deploy.sh "$NAMESPACE"
+
diff --git a/stack/kubernetes/30_deploy_dima.sh b/stack/kubernetes/30_deploy_dima.sh
index 3a2518c3..b53f6a99 100755
--- a/stack/kubernetes/30_deploy_dima.sh
+++ b/stack/kubernetes/30_deploy_dima.sh
@@ -6,9 +6,14 @@ IMAGE_TAG=${1:-"latest"}
 
 echo "=== Deploy application stack with image tag ${IMAGE_TAG} in namespace ${NAMESPACE}"
 
+if [[ "$IMAGE_TAG" == "latest" ]]; then
+  echo "!!! Warning: Do not use latest for workshop preparation, can cause issues with unavailable references!"
+fi
+
 echo "--- create dima namespace"
 kubectl get namespace "$NAMESPACE" || kubectl create namespace "$NAMESPACE"
 kubectl label namespace "$NAMESPACE" istio-injection=enabled --overwrite
 
 echo "--- deploy dima"
-helm upgrade --install -n "$NAMESPACE" --set global.image.tag=$IMAGE_TAG dima application
\ No newline at end of file
+helm upgrade --install -n "$NAMESPACE" --set global.image.tag=$IMAGE_TAG dima application
+
diff --git a/stack/kubernetes/application/charts/frontend/templates/ingress.yaml b/stack/kubernetes/application/charts/frontend/templates/ingress.yaml
index 58aef13e..1b5c2595 100644
--- a/stack/kubernetes/application/charts/frontend/templates/ingress.yaml
+++ b/stack/kubernetes/application/charts/frontend/templates/ingress.yaml
@@ -22,7 +22,7 @@ spec:
                 port:
                   number: 80
             path: /(.*)
-            pathType: Prefix
+            pathType: ImplementationSpecific
   {{- if .Values.global.tls.enabled }}
   tls:
     - hosts:
diff --git a/stack/kubernetes/application/charts/imageflip/templates/deployment.yaml b/stack/kubernetes/application/charts/imageflip/templates/deployment.yaml
index eb8d1ab2..83ef205f 100644
--- a/stack/kubernetes/application/charts/imageflip/templates/deployment.yaml
+++ b/stack/kubernetes/application/charts/imageflip/templates/deployment.yaml
@@ -46,8 +46,8 @@ spec:
           value: {{ .Values.tracing.enabled | quote }}
         - name: APM_ENABLED
           value: {{ .Values.apm.enabled | quote }}
-        - name: SPRING_ZIPKIN_BASEURL
-          value: {{ .Values.global.tracing.url }}
+        - name: SPRING_ZIPKIN_ENDPOINT
+          value: {{ .Values.global.tracing.endpoint }}
         ports:
         - containerPort: 8080
         resources:
diff --git a/stack/kubernetes/application/charts/imageflip/templates/ingress.yaml b/stack/kubernetes/application/charts/imageflip/templates/ingress.yaml
index ee6ca3dc..120018dc 100644
--- a/stack/kubernetes/application/charts/imageflip/templates/ingress.yaml
+++ b/stack/kubernetes/application/charts/imageflip/templates/ingress.yaml
@@ -22,7 +22,7 @@ spec:
                 port:
                   number: 8080
             path: /proxy/imageflip/(.*)
-            pathType: Prefix
+            pathType: ImplementationSpecific
   {{- if .Values.global.tls.enabled }}
   tls:
     - hosts:
diff --git a/stack/kubernetes/application/charts/imageflip/values.yaml b/stack/kubernetes/application/charts/imageflip/values.yaml
index 05d2a3f8..4c31fc7e 100644
--- a/stack/kubernetes/application/charts/imageflip/values.yaml
+++ b/stack/kubernetes/application/charts/imageflip/values.yaml
@@ -10,4 +10,5 @@ ingress:
   host: o11y.fans
 
 tracing:
-  enabled: true
\ No newline at end of file
+  enabled: true
+  samplingPropability: 1.0
\ No newline at end of file
diff --git a/stack/kubernetes/application/charts/imagegrayscale/templates/deployment.yaml b/stack/kubernetes/application/charts/imagegrayscale/templates/deployment.yaml
index 22d51fbb..0b83474b 100644
--- a/stack/kubernetes/application/charts/imagegrayscale/templates/deployment.yaml
+++ b/stack/kubernetes/application/charts/imagegrayscale/templates/deployment.yaml
@@ -44,8 +44,10 @@ spec:
           value: "true"
         - name: TRACING_ENABLED
           value: {{ .Values.tracing.enabled | quote }}
-        - name: SPRING_ZIPKIN_BASEURL
-          value: {{ .Values.global.tracing.url }}
+        - name: TRACING_SAMPLING_PROPABILITY
+          value: {{ .Values.tracing.samplingPropability | quote }}
+        - name: SPRING_ZIPKIN_ENDPOINT
+          value: {{ .Values.global.tracing.endpoint }}
         - name: APM_ENABLED
           value: {{ .Values.apm.enabled | quote }}
         ports:
diff --git a/stack/kubernetes/application/charts/imagegrayscale/templates/ingress.yaml b/stack/kubernetes/application/charts/imagegrayscale/templates/ingress.yaml
index 950aa0a2..5da65b47 100644
--- a/stack/kubernetes/application/charts/imagegrayscale/templates/ingress.yaml
+++ b/stack/kubernetes/application/charts/imagegrayscale/templates/ingress.yaml
@@ -22,7 +22,7 @@ spec:
                 port:
                   number: 8080
             path: /proxy/imagegrayscale/(.*)
-            pathType: Prefix
+            pathType: ImplementationSpecific
   {{- if .Values.global.tls.enabled }}
   tls:
     - hosts:
diff --git a/stack/kubernetes/application/charts/imagegrayscale/values.yaml b/stack/kubernetes/application/charts/imagegrayscale/values.yaml
index 315935b5..f5c53cc4 100644
--- a/stack/kubernetes/application/charts/imagegrayscale/values.yaml
+++ b/stack/kubernetes/application/charts/imagegrayscale/values.yaml
@@ -9,4 +9,5 @@ ingress:
   host: o11y.fans
 
 tracing:
-  enabled: true
\ No newline at end of file
+  enabled: true
+  samplingPropability: 1.0
\ No newline at end of file
diff --git a/stack/kubernetes/application/charts/imageholder/templates/deployment.yaml b/stack/kubernetes/application/charts/imageholder/templates/deployment.yaml
index 97f6df88..bb1f7044 100644
--- a/stack/kubernetes/application/charts/imageholder/templates/deployment.yaml
+++ b/stack/kubernetes/application/charts/imageholder/templates/deployment.yaml
@@ -48,8 +48,10 @@ spec:
           value: "true"
         - name: TRACING_ENABLED
           value: {{ .Values.tracing.enabled | quote }}
-        - name: SPRING_ZIPKIN_BASEURL
-          value: {{ .Values.global.tracing.url }}
+        - name: TRACING_SAMPLING_PROPABILITY
+          value: {{ .Values.tracing.samplingPropability | quote }}
+        - name: SPRING_ZIPKIN_ENDPOINT
+          value: {{ .Values.global.tracing.endpoint }}
         - name: APM_ENABLED
           value: {{ .Values.apm.enabled | quote }}
         - name: IMAGETHUMBNAIL_BASEURL
diff --git a/stack/kubernetes/application/charts/imageholder/templates/ingress.yaml b/stack/kubernetes/application/charts/imageholder/templates/ingress.yaml
index 949af14e..15c546a2 100644
--- a/stack/kubernetes/application/charts/imageholder/templates/ingress.yaml
+++ b/stack/kubernetes/application/charts/imageholder/templates/ingress.yaml
@@ -22,7 +22,7 @@ spec:
                 port:
                   number: 8080
             path: /proxy/imageholder/(.*)
-            pathType: Prefix
+            pathType: ImplementationSpecific
   {{- if .Values.global.tls.enabled }}
   tls:
     - hosts:
diff --git a/stack/kubernetes/application/charts/imageholder/values.yaml b/stack/kubernetes/application/charts/imageholder/values.yaml
index c53fea3d..fe7468ba 100644
--- a/stack/kubernetes/application/charts/imageholder/values.yaml
+++ b/stack/kubernetes/application/charts/imageholder/values.yaml
@@ -13,4 +13,5 @@ mongodb:
   port: 27017
 
 tracing:
-  enabled: true
\ No newline at end of file
+  enabled: true
+  samplingPropability: 1.0
\ No newline at end of file
diff --git a/stack/kubernetes/application/charts/imageorchestrator/templates/deployment.yaml b/stack/kubernetes/application/charts/imageorchestrator/templates/deployment.yaml
index 97e90713..9cd55496 100644
--- a/stack/kubernetes/application/charts/imageorchestrator/templates/deployment.yaml
+++ b/stack/kubernetes/application/charts/imageorchestrator/templates/deployment.yaml
@@ -44,8 +44,10 @@ spec:
           value: "true"
         - name: TRACING_ENABLED
           value: {{ .Values.tracing.enabled | quote }}
-        - name: SPRING_ZIPKIN_BASEURL
-          value: {{ .Values.global.tracing.url }}
+        - name: TRACING_SAMPLING_PROPABILITY
+          value: {{ .Values.tracing.samplingPropability | quote }}
+        - name: SPRING_ZIPKIN_ENDPOINT
+          value: {{ .Values.global.tracing.endpoint }}
         - name: APM_ENABLED
           value: {{ .Values.apm.enabled | quote }}
         - name: IMAGEROTATOR_BASEURL
diff --git a/stack/kubernetes/application/charts/imageorchestrator/templates/ingress.yaml b/stack/kubernetes/application/charts/imageorchestrator/templates/ingress.yaml
index 5b9b757a..724a9c8b 100644
--- a/stack/kubernetes/application/charts/imageorchestrator/templates/ingress.yaml
+++ b/stack/kubernetes/application/charts/imageorchestrator/templates/ingress.yaml
@@ -22,7 +22,7 @@ spec:
                 port:
                   number: 8080
             path: /proxy/imageorchestrator/(.*)
-            pathType: Prefix
+            pathType: ImplementationSpecific
   {{- if .Values.global.tls.enabled }}
   tls:
     - hosts:
diff --git a/stack/kubernetes/application/charts/imageorchestrator/values.yaml b/stack/kubernetes/application/charts/imageorchestrator/values.yaml
index 9dd1efeb..d45b7c2b 100644
--- a/stack/kubernetes/application/charts/imageorchestrator/values.yaml
+++ b/stack/kubernetes/application/charts/imageorchestrator/values.yaml
@@ -10,4 +10,5 @@ ingress:
   host: o11y.fans
   
 tracing:
-  enabled: true
\ No newline at end of file
+  enabled: true
+  samplingPropability: 1.0
\ No newline at end of file
diff --git a/stack/kubernetes/application/charts/imageresize/templates/deployment.yaml b/stack/kubernetes/application/charts/imageresize/templates/deployment.yaml
index d0df6898..d748077e 100644
--- a/stack/kubernetes/application/charts/imageresize/templates/deployment.yaml
+++ b/stack/kubernetes/application/charts/imageresize/templates/deployment.yaml
@@ -44,8 +44,10 @@ spec:
           value: "true"
         - name: TRACING_ENABLED
           value: {{ .Values.tracing.enabled | quote }}
-        - name: SPRING_ZIPKIN_BASEURL
-          value: {{ .Values.global.tracing.url }}
+        - name: TRACING_SAMPLING_PROPABILITY
+          value: {{ .Values.tracing.samplingPropability | quote }}
+        - name: SPRING_ZIPKIN_ENDPOINT
+          value: {{ .Values.global.tracing.endpoint }}
         - name: APM_ENABLED
           value: {{ .Values.apm.enabled | quote }}
         ports:
diff --git a/stack/kubernetes/application/charts/imageresize/templates/ingress.yaml b/stack/kubernetes/application/charts/imageresize/templates/ingress.yaml
index 7342f60f..2d471239 100644
--- a/stack/kubernetes/application/charts/imageresize/templates/ingress.yaml
+++ b/stack/kubernetes/application/charts/imageresize/templates/ingress.yaml
@@ -22,7 +22,7 @@ spec:
                 port:
                   number: 8080
             path: /proxy/imageresize/(.*)
-            pathType: Prefix
+            pathType: ImplementationSpecific
   {{- if .Values.global.tls.enabled }}
   tls:
     - hosts:
diff --git a/stack/kubernetes/application/charts/imageresize/values.yaml b/stack/kubernetes/application/charts/imageresize/values.yaml
index eff05446..ddcb3523 100644
--- a/stack/kubernetes/application/charts/imageresize/values.yaml
+++ b/stack/kubernetes/application/charts/imageresize/values.yaml
@@ -10,4 +10,5 @@ ingress:
   host: o11y.fans
 
 tracing:
-  enabled: true
\ No newline at end of file
+  enabled: true
+  samplingPropability: 1.0
\ No newline at end of file
diff --git a/stack/kubernetes/application/charts/imagerotator/templates/deployment.yaml b/stack/kubernetes/application/charts/imagerotator/templates/deployment.yaml
index 22d51fbb..0b83474b 100644
--- a/stack/kubernetes/application/charts/imagerotator/templates/deployment.yaml
+++ b/stack/kubernetes/application/charts/imagerotator/templates/deployment.yaml
@@ -44,8 +44,10 @@ spec:
           value: "true"
         - name: TRACING_ENABLED
           value: {{ .Values.tracing.enabled | quote }}
-        - name: SPRING_ZIPKIN_BASEURL
-          value: {{ .Values.global.tracing.url }}
+        - name: TRACING_SAMPLING_PROPABILITY
+          value: {{ .Values.tracing.samplingPropability | quote }}
+        - name: SPRING_ZIPKIN_ENDPOINT
+          value: {{ .Values.global.tracing.endpoint }}
         - name: APM_ENABLED
           value: {{ .Values.apm.enabled | quote }}
         ports:
diff --git a/stack/kubernetes/application/charts/imagerotator/templates/ingress.yaml b/stack/kubernetes/application/charts/imagerotator/templates/ingress.yaml
index a8b2fe5b..7ff4e4fe 100644
--- a/stack/kubernetes/application/charts/imagerotator/templates/ingress.yaml
+++ b/stack/kubernetes/application/charts/imagerotator/templates/ingress.yaml
@@ -22,7 +22,7 @@ spec:
                 port:
                   number: 8080
             path: /proxy/imagerotator/(.*)
-            pathType: Prefix
+            pathType: ImplementationSpecific
   {{- if .Values.global.tls.enabled }}
   tls:
     - hosts:
diff --git a/stack/kubernetes/application/charts/imagerotator/values.yaml b/stack/kubernetes/application/charts/imagerotator/values.yaml
index 32b454e3..452edd33 100644
--- a/stack/kubernetes/application/charts/imagerotator/values.yaml
+++ b/stack/kubernetes/application/charts/imagerotator/values.yaml
@@ -10,4 +10,5 @@ ingress:
   host: o11y.fans
 
 tracing:
-  enabled: true
\ No newline at end of file
+  enabled: true
+  samplingPropability: 1.0
\ No newline at end of file
diff --git a/stack/kubernetes/application/charts/imagethumbnail/templates/deployment.yaml b/stack/kubernetes/application/charts/imagethumbnail/templates/deployment.yaml
index 0cb3472a..ab5f9cf5 100644
--- a/stack/kubernetes/application/charts/imagethumbnail/templates/deployment.yaml
+++ b/stack/kubernetes/application/charts/imagethumbnail/templates/deployment.yaml
@@ -45,8 +45,10 @@ spec:
           value: "true"
         - name: TRACING_ENABLED
           value: {{ .Values.tracing.enabled | quote }}
-        - name: SPRING_ZIPKIN_BASEURL
-          value: {{ .Values.global.tracing.url }}
+        - name: TRACING_SAMPLING_PROPABILITY
+          value: {{ .Values.tracing.samplingPropability | quote }}
+        - name: SPRING_ZIPKIN_ENDPOINT
+          value: {{ .Values.global.tracing.endpoint }}
         - name: APM_ENABLED
           value: {{ .Values.apm.enabled | quote }}
         - name: IMAGEHOLDER_BASEURL
diff --git a/stack/kubernetes/application/charts/imagethumbnail/templates/ingress.yaml b/stack/kubernetes/application/charts/imagethumbnail/templates/ingress.yaml
index 2e58ddde..9299c48b 100644
--- a/stack/kubernetes/application/charts/imagethumbnail/templates/ingress.yaml
+++ b/stack/kubernetes/application/charts/imagethumbnail/templates/ingress.yaml
@@ -22,7 +22,7 @@ spec:
                 port:
                   number: 8080
             path: /proxy/imagethumbnail/(.*)
-            pathType: Prefix
+            pathType: ImplementationSpecific
   {{- if .Values.global.tls.enabled }}
   tls:
     - hosts:
diff --git a/stack/kubernetes/application/charts/imagethumbnail/values.yaml b/stack/kubernetes/application/charts/imagethumbnail/values.yaml
index 2b3c2e41..1c86fbf7 100644
--- a/stack/kubernetes/application/charts/imagethumbnail/values.yaml
+++ b/stack/kubernetes/application/charts/imagethumbnail/values.yaml
@@ -10,4 +10,5 @@ ingress:
   host: o11y.fans
 
 tracing:
-  enabled: true
\ No newline at end of file
+  enabled: true
+  samplingPropability: 1.0
\ No newline at end of file
diff --git a/stack/kubernetes/application/charts/mongodb/values.yaml b/stack/kubernetes/application/charts/mongodb/values.yaml
index befba32a..ec0856a8 100644
--- a/stack/kubernetes/application/charts/mongodb/values.yaml
+++ b/stack/kubernetes/application/charts/mongodb/values.yaml
@@ -1 +1 @@
-image: mongo:3.2.12
\ No newline at end of file
+image: mongo:5.0.16
\ No newline at end of file
diff --git a/stack/kubernetes/application/charts/trafficgen/templates/ingress.yaml b/stack/kubernetes/application/charts/trafficgen/templates/ingress.yaml
index 7ac3619f..55011a31 100644
--- a/stack/kubernetes/application/charts/trafficgen/templates/ingress.yaml
+++ b/stack/kubernetes/application/charts/trafficgen/templates/ingress.yaml
@@ -22,7 +22,7 @@ spec:
                 port:
                   number: 8080
             path: /proxy/trafficgen/(.*)
-            pathType: Prefix
+            pathType: ImplementationSpecific
   {{- if .Values.global.tls.enabled }}
   tls:
     - hosts:
diff --git a/stack/kubernetes/application/values.yaml b/stack/kubernetes/application/values.yaml
index 60160814..fbf907f6 100644
--- a/stack/kubernetes/application/values.yaml
+++ b/stack/kubernetes/application/values.yaml
@@ -2,8 +2,7 @@ global:
   image:
     tag: 9762646c83543be559ec11d2ef81d2442ddf837d
   tracing:
-    url: http://zipkin.istio-system:9411
-    # url: http://tempo-distributor.monitoring.svc.cluster.local:9411
+    endpoint: http://zipkin.istio-system:9411/api/v2/spans
   tls:
     enabled: true
 dima-trafficgen:
diff --git a/stack/kubernetes/tools/ingress/jaeger-ingress.yaml b/stack/kubernetes/tools/ingress/jaeger-ingress.yaml
index efa2cacc..8520a40f 100644
--- a/stack/kubernetes/tools/ingress/jaeger-ingress.yaml
+++ b/stack/kubernetes/tools/ingress/jaeger-ingress.yaml
@@ -18,7 +18,7 @@ spec:
                 port:
                   number: 80
             path: /(.*)
-            pathType: Prefix
+            pathType: ImplementationSpecific
   tls:
     - hosts:
         - "jaeger.o11y.fans"
diff --git a/stack/kubernetes/tools/istio/kiali.yaml b/stack/kubernetes/tools/istio/kiali.yaml
index 3e097268..60c514ec 100644
--- a/stack/kubernetes/tools/istio/kiali.yaml
+++ b/stack/kubernetes/tools/istio/kiali.yaml
@@ -11,6 +11,7 @@ deployment:
         annotations:
           nginx.ingress.kubernetes.io/rewrite-target: /$1
           cert-manager.io/cluster-issuer: letsencrypt-prod
+          nginx.ingress.kubernetes.io/use-regex: "true"
       spec:
         ingressClassName: nginx
         rules:
@@ -23,11 +24,11 @@ deployment:
                       port:
                         number: 20001
                   path: /(.*)
-                  pathType: Prefix        
+                  pathType: ImplementationSpecific
         tls:
           - hosts:
               - kiali.o11y.fans
-            secretName: kiali-tls-cert                 
+            secretName: kiali-tls-cert
   pod_annotations:
     prometheus.io/scrape: "true"
     prometheus.io/port: "9090"
@@ -39,4 +40,4 @@ external_services:
     grafana:
       enabled: true
       in_cluster_url: "http://grafana.monitoring/"
-      url: "https://grafana.o11y.fans/"
\ No newline at end of file
+      url: "https://grafana.o11y.fans/"
diff --git a/stack/kubernetes/tools/logging/curator.yaml b/stack/kubernetes/tools/logging/curator.yaml
index e0db844a..df522fab 100644
--- a/stack/kubernetes/tools/logging/curator.yaml
+++ b/stack/kubernetes/tools/logging/curator.yaml
@@ -1,4 +1,7 @@
 ---
+image:
+  repository: bitnami/elasticsearch-curator-archived
+
 configMaps:
   action_file_yml: |-
     ---
@@ -20,7 +23,7 @@ configMaps:
           unit_count: 3
         - filtertype: pattern
           kind: regex
-          value: '^[^\.].*'    
+          value: '^[^\.].*'
   config_yml: |-
     ---
     client:
@@ -44,4 +47,4 @@ configMaps:
       loglevel: INFO
       logfile:
       logformat: default
-      blacklist: [‘elasticsearch’]
+      blacklist: ['elasticsearch']
diff --git a/stack/kubernetes/tools/logging/elasticsearch.yaml b/stack/kubernetes/tools/logging/elasticsearch.yaml
index 70ecccab..11647c35 100644
--- a/stack/kubernetes/tools/logging/elasticsearch.yaml
+++ b/stack/kubernetes/tools/logging/elasticsearch.yaml
@@ -1,21 +1,27 @@
 ---
 replicas: 1
+
+esJavaOpts: "-Xms1024m -Xmx1024m"
+
 resources:
   requests:
     cpu: "250m"
-    memory: "1500Mi"
+    memory: "2Gi"
   limits:
     cpu: "500m"
-    memory: "1500Mi"
+    memory: "2Gi"
+
 secret:
   enabled: true
   password: "changeme"
-replicas: 1
+
 clusterHealthCheckParams: "wait_for_status=yellow&timeout=1s"
+
 volumeClaimTemplate:
   resources:
     requests:
-      storage: 10Gi
+      storage: 20Gi
+
 lifecycle:
   postStart:
     exec:
diff --git a/stack/kubernetes/tools/logging/fluentd.yaml b/stack/kubernetes/tools/logging/fluentd.yaml
index 24afe0d4..fbba0815 100644
--- a/stack/kubernetes/tools/logging/fluentd.yaml
+++ b/stack/kubernetes/tools/logging/fluentd.yaml
@@ -1,7 +1,11 @@
+podSecurityPolicy:
+  enabled: false
+
 plugins:
   - "fluent-plugin-elasticsearch -v 5.2.5"
   - "fluent-plugin-prometheus"
   - "fluent-plugin-rewrite-tag-filter"
+
 fileConfigs:
   01_sources.conf: |-
     ## logs from podman
@@ -32,6 +36,12 @@ fileConfigs:
       </parse>
       emit_unmatched_lines true
     </source>
+    <source>
+      @type prometheus
+      bind 0.0.0.0
+      port 24231
+      metrics_path /metrics
+    </source>
   02_filters.conf: |-
     <label @KUBERNETES>
       <match kubernetes.var.log.containers.fluentd**>
diff --git a/stack/kubernetes/tools/logging/kibana.yaml b/stack/kubernetes/tools/logging/kibana.yaml
index ca9e22d0..c7d34861 100644
--- a/stack/kubernetes/tools/logging/kibana.yaml
+++ b/stack/kubernetes/tools/logging/kibana.yaml
@@ -16,7 +16,7 @@ resources:
 ingress:
   enabled: true
   className: "nginx"
-  pathtype: Prefix
+  pathType: ImplementationSpecific
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-prod
     nginx.ingress.kubernetes.io/rewrite-target: /$1