diff --git a/Jenkinsfile b/Jenkinsfile
index 3d78af11..2897b7c6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -36,9 +36,9 @@ pipeline {
           python -V
           pip3 install -U pip
           pip3 install -e .
-          ceph-devstack doctor
           echo "data_dir: ${env.WORKSPACE}/data" > ${env.CDS_CONF}
           echo "teuthology_repo: ${env.WORKSPACE}/teuthology" >> ${env.CDS_CONF}
+          ceph-devstack --config-file ${env.CDS_CONF} doctor
         """
       }
     }
diff --git a/ceph_devstack/resources/ceph/containers.py b/ceph_devstack/resources/ceph/containers.py
index 34a40946..5456e433 100644
--- a/ceph_devstack/resources/ceph/containers.py
+++ b/ceph_devstack/resources/ceph/containers.py
@@ -329,6 +329,7 @@ def create_cmd(self):
             f"testnode_count={Config.args.testnode_count}",
             "--network",
             "ceph-devstack",
+            "--systemd=always",
             "--secret",
             "id_rsa",
             "-v",