diff --git a/jenkins/client/job/kill_stuck_jobs.yml b/jenkins/client/job/kill_stuck_jobs.yml
new file mode 100644
index 0000000..57f0b3f
--- /dev/null
+++ b/jenkins/client/job/kill_stuck_jobs.yml
@@ -0,0 +1,25 @@
+parameters:
+  jenkins:
+    client:
+      job:
+        kill-stuck-jobs:
+          name: kill-stuck-jobs
+          discard:
+            build:
+              keep_num: 3
+            artifact:
+              keep_num: 3
+          type: workflow-scm
+          concurrent: true
+          scm:
+            type: git
+            url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+            credentials: "gerrit"
+            script: abort-long-running-jobs.groovy
+          trigger:
+            timer:
+              spec: "H H * * *"
+          param:
+            MAX_DURATION_IN_HOURS:
+              type: string
+              default: "24"
diff --git a/jenkins/client/job/test_pipelines.yml b/jenkins/client/job/test_pipelines.yml
index 3a4149c..02a64f2 100644
--- a/jenkins/client/job/test_pipelines.yml
+++ b/jenkins/client/job/test_pipelines.yml
@@ -3,41 +3,41 @@
     client:
       job:
         test-mk-pipelines-pipeline:
-        name: test-mk-pipelines
-        discard:
-          build:
-            keep_num: 25
-          artifact:
-            keep_num: 25
-        type: workflow-scm
-        concurrent: true
-        scm:
-          type: git
-          url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
-          credentials: "gerrit"
-          script: git-mirror-2way-pipeline.groovy
-        trigger:
-          gerrit:
-            project:
-              mk/mk-pipelines":
-                branches:
-                  - master
-            event:
-              patchset:
-                - created:
-                    excludeDrafts: false
-                    excludeTrivialRebase: false
-                    excludeNoCodeChange: false
-              comment:
-                - addedContains:
-                    commentAddedCommentContains: '(recheck|reverify)'
-        param:
-          CREDENTIALS_ID:
-            type: string
-            default: "gerrit"
-          GRADLE_IMAGE:
-            type: string
-            default: niaquinto/gradle
-          GRADLE_CMD:
-            type: string
-            default: check
+          name: test-mk-pipelines
+          discard:
+            build:
+              keep_num: 25
+            artifact:
+              keep_num: 25
+          type: workflow-scm
+          concurrent: true
+          scm:
+            type: git
+            url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+            credentials: "gerrit"
+            script: git-mirror-2way-pipeline.groovy
+          trigger:
+            gerrit:
+              project:
+                mk/mk-pipelines":
+                  branches:
+                    - master
+              event:
+                patchset:
+                  - created:
+                      excludeDrafts: false
+                      excludeTrivialRebase: false
+                      excludeNoCodeChange: false
+                comment:
+                  - addedContains:
+                      commentAddedCommentContains: '(recheck|reverify)'
+          param:
+            CREDENTIALS_ID:
+              type: string
+              default: "gerrit"
+            GRADLE_IMAGE:
+              type: string
+              default: niaquinto/gradle
+            GRADLE_CMD:
+              type: string
+              default: check