diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 277d23e8..52965202 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -7,24 +7,19 @@
 - job:
     name: sf-operator
     parent: sf-operator-microshift
-    timeout: 3600
-    pre-run:
+    pre-run: &pre-run
       - playbooks/health-check/dev-keys.yaml
       - playbooks/health-check/dstat-pre.yaml
-    post-run:
+    post-run: &post-run
       - playbooks/health-check/dstat-post.yaml
       - playbooks/post.yaml
     run: playbooks/main.yaml
     abstract: true
-    irrelevant-files:
+    irrelevant-files: &irrelevant-files
       - ".*.md$"
       - "doc/.*"
       - ".github/.*"
-    required-projects:
-      - name: software-factory/sf-infra
-    roles:
-      - zuul: software-factory/sf-infra
-    vars:
+    vars: &vars
       logreduce_optin: true
       # microshift deployment
       disk_file_sparsed: true
@@ -47,36 +42,12 @@
 - job:
     name: sf-operator-multinode
     parent: sf-operator-microshift-multinode
-    timeout: 3600
-    pre-run:
-      - playbooks/health-check/dstat-pre.yaml
-    post-run:
-      - playbooks/health-check/dstat-post.yaml
-      - playbooks/post.yaml
+    pre-run: *pre-run
+    post-run: *post-run
     run: playbooks/main.yaml
     abstract: true
-    irrelevant-files:
-      - ".*.md$"
-      - "doc/.*"
-      - ".github/.*"
-    required-projects:
-      - name: software-factory/sf-infra
-    roles:
-      - zuul: software-factory/sf-infra
-    vars:
-      logreduce_optin: true
-      # microshift deployment
-      disk_file_sparsed: true
-      disk_file_size: 40G
-      standard_user: false
-      create_pv: false
-      setup_olm: true
-      # post tasks artifacts directory
-      output_logs_dir: ~/zuul-output/logs
-      # dnsmasq
-      microshift_additional_addresses:
-        - "sfop.me"
-        - "microshift.dev"
+    irrelevant-files: *irrelevant-files
+    vars: *vars
 
 - secret:
     name: zuul_quay_sf
@@ -113,28 +84,31 @@
 # Deploy sf-operator on microshift
 - job:
     name: sf-operator-olm
-    description: This test validates a sf-operator deployment via OLM
+    description: Validates a sf-operator deployment via OLM
+    timeout: 3600
     parent: sf-operator
     vars:
       mode: "olm"
 
 - job:
     name: sf-operator-upgrade
+    description: Validates a sf-operator upgrade via OLM
+    timeout: 3600
     parent: sf-operator
     run: playbooks/upgrade.yaml
-    timeout: 3600
 
 - job:
     name: sf-operator-dev-multinode
-    description: >
-      This test validates a sf-operator multinode deployment
-      via the dev mode described in the contributor doc
+    description: Validates a sf-operator multinode deployment
+    timeout: 3600
     parent: sf-operator-multinode
     vars:
       mode: "dev"
 
 - job:
     name: sf-operator-ansible-lint
+    description: Lint Ansible playbooks located in playbooks directory
+    timeout: 900
     parent: ansible-lint
     vars:
       # NOTE(dpawlik): We don't need to add roles dir, due there is a symlink