diff --git a/Makefile b/Makefile
index 7bd0c445a..12b5a4874 100644
--- a/Makefile
+++ b/Makefile
@@ -29,9 +29,9 @@ HAVE_SYSTEMD := $(shell pkg-config --exists systemd 2>/dev/null && echo 'yes')
 
 ifeq ($(HAVE_SYSTEMD),yes)
 UNIT_DIR := $(shell pkg-config --variable=systemdsystemunitdir systemd)
-UNIT_FILES = clear-containers.service
+UNIT_FILES = clear-containers.service clear-containers-debug.service
 GENERATED_FILES := $(UNIT_FILES)
-UNIT_FILES += clear-containers.target
+UNIT_FILES += clear-containers.target clear-containers-debug.target
 endif
 
 SED = sed
diff --git a/clear-containers-debug.service.in b/clear-containers-debug.service.in
new file mode 100644
index 000000000..37469fb87
--- /dev/null
+++ b/clear-containers-debug.service.in
@@ -0,0 +1,10 @@
+[Unit]
+Description=Clear Container debug console
+
+[Service]
+Environment=PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+StandardInput=tty
+StandardOutput=tty
+PrivateDevices=yes
+Type=simple
+ExecStart=/usr/bin/bash
diff --git a/clear-containers-debug.target b/clear-containers-debug.target
new file mode 100644
index 000000000..b2483594d
--- /dev/null
+++ b/clear-containers-debug.target
@@ -0,0 +1,8 @@
+[Unit]
+Description=Clear Containers Agent Target
+Requires=basic.target
+Requires=clear-containers.service
+Wants=clear-containers-debug-console.service
+Conflicts=rescue.service rescue.target
+After=basic.target rescue.service rescue.target
+AllowIsolate=yes