diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 68a6017..1b38552 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -19,7 +19,7 @@ jobs:
 
     services:
       chall-manager: 
-        image: ctferio/chall-manager:v0.1.1@sha256:196f0e1ebf5c0c900b8be04560824538a30cb851baced98fa7276fce727aba95
+        image: ctferio/chall-manager:v0.2.0@sha256:088b8871a55dff8d215ab024c3e1dbfb4dcecd90432abb49fdf1a3c6a6bf8532
         ports:
           - 8080:8080
 
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 42cd64f..6db57e2 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -19,7 +19,7 @@ jobs:
 
     services:
       chall-manager: 
-        image: ctferio/chall-manager:v0.1.1@sha256:196f0e1ebf5c0c900b8be04560824538a30cb851baced98fa7276fce727aba95
+        image: ctferio/chall-manager:v0.2.0@sha256:088b8871a55dff8d215ab024c3e1dbfb4dcecd90432abb49fdf1a3c6a6bf8532
         ports:
           - 8080:8080
 
diff --git a/.github/workflows/redis.yaml b/.github/workflows/redis.yaml
index f48fb8d..ba9d320 100644
--- a/.github/workflows/redis.yaml
+++ b/.github/workflows/redis.yaml
@@ -19,7 +19,7 @@ jobs:
 
     services:
       chall-manager: 
-        image: ctferio/chall-manager:v0.1.1@sha256:196f0e1ebf5c0c900b8be04560824538a30cb851baced98fa7276fce727aba95
+        image: ctferio/chall-manager:v0.2.0@sha256:088b8871a55dff8d215ab024c3e1dbfb4dcecd90432abb49fdf1a3c6a6bf8532
         ports:
           - 8080:8080
 
diff --git a/hack/docker-compose.yml b/hack/docker-compose.yml
index 6b2a7aa..eb08308 100644
--- a/hack/docker-compose.yml
+++ b/hack/docker-compose.yml
@@ -24,7 +24,7 @@ services:
       timeout: 10s
 
   chall-manager:
-    image: ctferio/chall-manager:v0.1.1@sha256:196f0e1ebf5c0c900b8be04560824538a30cb851baced98fa7276fce727aba95
+    image: ctferio/chall-manager:v0.2.0@sha256:088b8871a55dff8d215ab024c3e1dbfb4dcecd90432abb49fdf1a3c6a6bf8532
     ports:
       - 8080:8080
     environment:
@@ -32,6 +32,14 @@ services:
     networks:
       - testing
 
+  chall-manager-janitor:
+    image: ctferio/chall-manager-janitor:v0.2.0@sha256:6ac7dc0fa50d870f5297bd9b8a7c118b68ec965f59e7b5083b36b79001a0186d
+    environment:
+      URL: chall-manager:8080
+      TICKER: 30s
+    networks:
+      - testing
+
   # redis-svc:
   #   image: redis:7.0.10@sha256:92b8b307ee28ed74da17578064c73307ad41e43f422f0b7e4e91498b406c59e3
   #   ports: