diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5ce6e76..5bb283e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,6 +22,7 @@ jobs:
           juno-unstable,
           loki-stable,
           loki-unstable,
+          tanit-unstable,
           next-unstable,
           stable,
           unstable,
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 212e977..e7d4fc5 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -17,6 +17,7 @@ jobs:
           - juno-unstable
           - loki-stable
           - loki-unstable
+          - tanit-unstable
           - next-unstable
           - stable
           - unstable
diff --git a/development-target b/development-target
index 1323ebd..bc842c6 120000
--- a/development-target
+++ b/development-target
@@ -1 +1 @@
-circe-unstable/
\ No newline at end of file
+tanit-unstable
\ No newline at end of file
diff --git a/next-unstable b/next-unstable
index 1323ebd..bc842c6 120000
--- a/next-unstable
+++ b/next-unstable
@@ -1 +1 @@
-circe-unstable/
\ No newline at end of file
+tanit-unstable
\ No newline at end of file
diff --git a/tanit-stable/Dockerfile b/tanit-stable/Dockerfile
new file mode 100644
index 0000000..0de6dc9
--- /dev/null
+++ b/tanit-stable/Dockerfile
@@ -0,0 +1,16 @@
+# elementary OS Circe based on Ubuntu Resolute
+FROM ubuntu:resolute
+
+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 && \
+  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/tanit-unstable/Dockerfile b/tanit-unstable/Dockerfile
new file mode 100644
index 0000000..35840e0
--- /dev/null
+++ b/tanit-unstable/Dockerfile
@@ -0,0 +1,16 @@
+# elementary OS UNSTABLE based on Ubuntu Resolute
+FROM ubuntu:resolute
+
+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/daily && \
+  apt-get install -y --no-install-recommends elementary-os-overlay && \
+  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/*