diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6a7dcf0..1daf25c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4,7 +4,7 @@ name: cactus-rt
 
 jobs:
   build-and-test:
-    runs-on: [self-hosted, jammy, real-time]
+    runs-on: [self-hosted, noble, real-time]
     env:
       CACTUS_RT_BUILD_DIR: build
     steps:
@@ -29,7 +29,7 @@ jobs:
       #   run: docker/scripts/04-example.sh
 
   build-and-test-no-tracing:
-    runs-on: [self-hosted, jammy, real-time]
+    runs-on: [self-hosted, noble, real-time]
     env:
       CACTUS_RT_BUILD_DIR: build
       ENABLE_TRACING: "OFF"
@@ -53,4 +53,3 @@ jobs:
 
       # - name: Run example
       #   run: docker/scripts/04-example.sh
-
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 644a6c7..5c313d3 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:jammy
+FROM ubuntu:noble
 
 RUN set -xe; \
     export DEBIAN_FRONTEND=noninteractive; \
diff --git a/examples/lockless_example/main.cc b/examples/lockless_example/main.cc
index 1cccae4..c55f08f 100644
--- a/examples/lockless_example/main.cc
+++ b/examples/lockless_example/main.cc
@@ -61,7 +61,7 @@ struct Context {
  */
 class RTThread : public CyclicThread {
   Context& ctx_;
-  Pose     current_target_pose_ = {};
+  Pose     current_target_pose_;
 
   static cactus_rt::CyclicThreadConfig CreateThreadConfig() {
     cactus_rt::CyclicThreadConfig thread_config;
diff --git a/include/cactus_rt/config.h b/include/cactus_rt/config.h
index 075e69e..73d9e9a 100644
--- a/include/cactus_rt/config.h
+++ b/include/cactus_rt/config.h
@@ -4,7 +4,6 @@
 #include <quill/Quill.h>
 
 #include <memory>
-#include <string>
 
 #include "cactus_rt/scheduler.h"
 
diff --git a/include/cactus_rt/thread.h b/include/cactus_rt/thread.h
index 04b988c..d8fd5fc 100644
--- a/include/cactus_rt/thread.h
+++ b/include/cactus_rt/thread.h
@@ -12,7 +12,6 @@
 #include "config.h"
 #include "quill/Quill.h"
 #include "tracing/thread_tracer.h"
-#include "tracing/trace_aggregator.h"
 
 namespace cactus_rt {
 
diff --git a/include/cactus_rt/tracing/track_event_internal.h b/include/cactus_rt/tracing/track_event_internal.h
index 9b6df58..229fac5 100644
--- a/include/cactus_rt/tracing/track_event_internal.h
+++ b/include/cactus_rt/tracing/track_event_internal.h
@@ -3,8 +3,6 @@
 
 #ifdef CACTUS_RT_TRACING_ENABLED
 #include <cstdint>
-#include <optional>
-#include <variant>
 
 #include "track_event.pb.h"
 
diff --git a/src/cactus_rt/cyclic_thread.cc b/src/cactus_rt/cyclic_thread.cc
index 3c0366e..8fc3b1e 100644
--- a/src/cactus_rt/cyclic_thread.cc
+++ b/src/cactus_rt/cyclic_thread.cc
@@ -1,7 +1,5 @@
 #include "cactus_rt/cyclic_thread.h"
 
-#include "cactus_rt/scheduler.h"
-
 namespace cactus_rt {
 
 void CyclicThread::Run() noexcept {
diff --git a/src/cactus_rt/thread.cc b/src/cactus_rt/thread.cc
index 1bf9c5e..315c8dc 100644
--- a/src/cactus_rt/thread.cc
+++ b/src/cactus_rt/thread.cc
@@ -5,12 +5,10 @@
 #include <cerrno>
 #include <cstring>
 #include <ctime>
-#include <iostream>
 #include <stdexcept>
 
 #include "cactus_rt/app.h"
 #include "cactus_rt/config.h"
-#include "cactus_rt/linux/sched_ext.h"
 
 namespace cactus_rt {
 
diff --git a/src/cactus_rt/tracing/thread_tracer.cc b/src/cactus_rt/tracing/thread_tracer.cc
index 647c7d0..a4e2ae3 100644
--- a/src/cactus_rt/tracing/thread_tracer.cc
+++ b/src/cactus_rt/tracing/thread_tracer.cc
@@ -1,7 +1,5 @@
 #include "cactus_rt/tracing/thread_tracer.h"
 
-#include <mutex>
-
 #include "cactus_rt/tracing/tracing_enabled.h"
 #include "cactus_rt/utils.h"