diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6c82d8c..6910a91 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,6 +12,8 @@ jobs:
       matrix:
         image: [
           development-target,
+          circe-stable,
+          circe-unstable,
           horus-stable,
           horus-unstable,
           odin-stable,
@@ -22,7 +24,6 @@ jobs:
           loki-unstable,
           next-unstable,
           stable,
-          ubuntu-noble-unstable,
           unstable,
           latest
         ]
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4735b8a..f2f6334 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,6 +7,8 @@ jobs:
       fail-fast: false
       matrix:
         image:
+          - circe-stable
+          - circe-unstable
           - horus-stable
           - horus-unstable
           - odin-stable
@@ -17,7 +19,6 @@ jobs:
           - loki-unstable
           - next-unstable
           - stable
-          - ubuntu-noble-unstable
           - unstable
           - latest
 
diff --git a/circe-stable/Dockerfile b/circe-stable/Dockerfile
new file mode 100644
index 0000000..077ebb4
--- /dev/null
+++ b/circe-stable/Dockerfile
@@ -0,0 +1,18 @@
+# elementary OS Circe based on Ubuntu Noble
+FROM ubuntu:noble
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && \
+  apt-get -y install --no-install-recommends gpg-agent software-properties-common git && \
+  add-apt-repository -u -y ppa:elementary-os/os-patches && \
+  add-apt-repository -u -y ppa:elementary-os/stable && \
+  apt-get install -y --no-install-recommends elementary-os-overlay && \
+  mv /usr/sbin/telinit /usr/sbin/telinit.bak && \
+  ln -s /usr/bin/true /usr/sbin/telinit &&\
+  apt-get update && \
+  apt-get -y dist-upgrade && \
+  apt-get install --no-install-recommends -y elementary-sdk elementary-icon-theme && \
+  apt-get -y autoremove && \
+  apt-get autoclean && \
+  rm -rf /var/lib/apt/lists/*
diff --git a/ubuntu-noble-unstable/Dockerfile b/circe-unstable/Dockerfile
similarity index 100%
rename from ubuntu-noble-unstable/Dockerfile
rename to circe-unstable/Dockerfile
diff --git a/development-target b/development-target
index b081bb8..1323ebd 120000
--- a/development-target
+++ b/development-target
@@ -1 +1 @@
-ubuntu-noble-unstable
\ No newline at end of file
+circe-unstable/
\ No newline at end of file