diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index ccffa78..d83e735 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -3,8 +3,8 @@ FROM maven:3-eclipse-temurin-21  AS dind
 ARG DEBIAN_FRONTEND=noninteractive
 ENV PIP_ROOT_USER_ACTION=ignore
 
-RUN set -eux; \
-    apt-get update; \
+RUN set -eux && \
+    apt-get update && \
     apt-get install -y --no-install-recommends \
     sudo \
     ca-certificates \
@@ -27,20 +27,20 @@ RUN update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy
 
 VOLUME /var/lib/docker
 
-RUN apt-get update; \
+RUN apt-get update && \
     apt-get install --yes --no-install-recommends \
     sudo \
     bash \
     curl \
     build-essential \
-    python3 \
+    python3.12 \
     python-is-python3 \
     python3-dev \
     python3-pip \
     python3-setuptools \
     python3-wheel \
-    python3-psutil; \
-    apt clean; \
+    python3-psutil && \
+    apt clean && \
     rm -rf /var/lib/apt/lists/*
 
 RUN rm -rf /usr/lib/python3*/EXTERNALLY-MANAGED
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 3ae9819..aeaa964 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,10 +1,7 @@
 {
 	"name": "otel-getting-started",
 	"workspaceFolder": "/workspaces/opentelemetry-training/exercises",
-	// "image": "ghcr.io/novatecconsulting/opentelemetry-training-application:latest",
-	"build": {
-		"dockerfile": "Dockerfile"
-	},
+	"image": "ghcr.io/novatecconsulting/opentelemetry-training-application:latest",
 	"overrideCommand": false,
 	"runArgs": [
 		"--privileged"
diff --git a/exercises/collector/initial/docker-compose.yml b/exercises/collector/initial/docker-compose.yml
index 9c2770a..c5743f7 100644
--- a/exercises/collector/initial/docker-compose.yml
+++ b/exercises/collector/initial/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   otelcol:
-    image: otel/opentelemetry-collector-contrib:0.97.0
+    image: otel/opentelemetry-collector-contrib:0.109.0
     restart: unless-stopped
     command: ["--config=/etc/otel-collector-config.yml", "${OTELCOL_ARGS}"]
     volumes:
diff --git a/exercises/collector/solution/docker-compose.yml b/exercises/collector/solution/docker-compose.yml
index 9c2770a..c5743f7 100644
--- a/exercises/collector/solution/docker-compose.yml
+++ b/exercises/collector/solution/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   otelcol:
-    image: otel/opentelemetry-collector-contrib:0.97.0
+    image: otel/opentelemetry-collector-contrib:0.109.0
     restart: unless-stopped
     command: ["--config=/etc/otel-collector-config.yml", "${OTELCOL_ARGS}"]
     volumes: