diff --git a/tutorial/content/exercises/instrumentation/automatic/code-based/images/jaeger_trace_annotated.png b/tutorial/content/exercises/instrumentation/automatic/code-based/images/jaeger_trace_annotated.png
new file mode 100644
index 0000000..3074245
Binary files /dev/null and b/tutorial/content/exercises/instrumentation/automatic/code-based/images/jaeger_trace_annotated.png differ
diff --git a/tutorial/content/exercises/instrumentation/automatic/code-based/images/jaeger_trace_auto_instrument.png b/tutorial/content/exercises/instrumentation/automatic/code-based/images/jaeger_trace_auto_instrument.png
new file mode 100644
index 0000000..0abb481
Binary files /dev/null and b/tutorial/content/exercises/instrumentation/automatic/code-based/images/jaeger_trace_auto_instrument.png differ
diff --git a/tutorial/content/exercises/instrumentation/automatic/code-based/images/jaeger_trace_span_detail.jpg b/tutorial/content/exercises/instrumentation/automatic/code-based/images/jaeger_trace_span_detail.jpg
new file mode 100644
index 0000000..f7a5feb
Binary files /dev/null and b/tutorial/content/exercises/instrumentation/automatic/code-based/images/jaeger_trace_span_detail.jpg differ
diff --git a/tutorial/content/exercises/instrumentation/automatic/code-based/images/jaeger_trace_span_detail_todo.png b/tutorial/content/exercises/instrumentation/automatic/code-based/images/jaeger_trace_span_detail_todo.png
new file mode 100644
index 0000000..462f714
Binary files /dev/null and b/tutorial/content/exercises/instrumentation/automatic/code-based/images/jaeger_trace_span_detail_todo.png differ
diff --git a/tutorial/content/exercises/instrumentation/automatic/code-based/index.md b/tutorial/content/exercises/instrumentation/automatic/code-based/index.md
index aae649d..ac400de 100644
--- a/tutorial/content/exercises/instrumentation/automatic/code-based/index.md
+++ b/tutorial/content/exercises/instrumentation/automatic/code-based/index.md
@@ -124,7 +124,7 @@ curl -X POST localhost:8080/todos/NEW
 
 Open the Jaeger Web UI and search for the last trace we just generated. It will look like this:
 
-TODO Screenshot
+{{< figure src="images/jaeger_trace_auto_instrument.png" width=700 caption="Jaeger trace - Auto instrumentation" >}}
 
 Now open the Java source file under `todobackend-springboot/src/main/java/io/novatec/todobackend/TodobackendApplication.java` directly here in the editor.
 
@@ -153,7 +153,7 @@ You will see the two following methods:
 
 The `addTodo` method is the entry point when the REST call arrives at the application. We can see that in the Jaeger trace. This is visible in the entry span called `POST/todos/{todo}`:
 
-screenshot
+{{< figure src="images/jaeger_trace_auto_instrument.png" width=700 caption="Jaeger trace - Auto instrumentation" >}}
 
 With the invocation of `todoRepository.save(new Todo(todo));` the new item will be persisted in the database.
 This is also visible in the Jaeger trace.
@@ -209,8 +209,12 @@ Observe the `POST` call once more.
 
 You will now see that between the entry span `POST/todos/{todo}` and the third span `todoRepository.save` there is one called `todoRepository.someInternalMethod`. This is due to the annotation we did.
 
+{{< figure src="images/jaeger_trace_annotated.png" width=700 caption="Jaeger trace - Auto instrumentation with annotations" >}}
+
 If you expand the line of trace in the Jaeger UI you will get `Tags` and `Process` details. Expand all of it.
 
+{{< figure src="images/jaeger_trace_span_detail.jpg" width=700 caption="Jaeger trace - Span Detail" >}}
+
 Among other details you will be able to see the details of the method and name of the used library.
 
 ```
@@ -257,7 +261,7 @@ As the latest entry you should now see
 todo - SMILE
 ```
 
-Screenshot
+{{< figure src="images/jaeger_trace_span_detail_todo.png" width=700 caption="Jaeger trace - Span Detail with value" >}}
 
 This means you can now also see the specific parameter which has been passed and relate it to a slow performing call in case it happens.
 
diff --git a/tutorial/content/exercises/instrumentation/manual_java/metrics/index.md b/tutorial/content/exercises/instrumentation/manual_java/metrics/index.md
index 1663350..ce40a03 100644
--- a/tutorial/content/exercises/instrumentation/manual_java/metrics/index.md
+++ b/tutorial/content/exercises/instrumentation/manual_java/metrics/index.md
@@ -259,7 +259,6 @@ If there are any errors review the changes and repeat.
 
 ### Generate metrics
 
-{{< figure src="images/tracer_generates_spans.drawio.png" width=650 caption="Tracing signal" >}}
 
 To show a very simple form of metric collection we'll try to define a counter for the amount of invocations of a REST call.
 We need to initialize the counter outside of this method.