diff --git a/.zuul.yaml b/.zuul.yaml
index ab47b447c6..478b565125 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1770,6 +1770,36 @@
       - playbooks/roles/install-docker/.*
       - playbooks/roles/gerrit/.*
 
+- job:
+    name: infra-prod-service-gitea
+    parent: infra-prod-service-base
+    description: Run service-gitea.yaml playbook
+    vars:
+      playbook_name: service-gitea.yaml
+    dependencies:
+      - name: infra-prod-update-system-config
+      - name: infra-prod-install-ansible
+        soft: true
+      - name: infra-prod-base
+        soft: true
+      - name: infra-prod-service-letsencrypt
+        soft: true
+      - name: system-config-promote-image-gitea-init
+        soft: true
+      - name: system-config-promote-image-gitea
+        soft: true
+    files:
+      - playbooks/service-gitea.yaml
+      - playbooks/group_vars/gitea.yaml
+      - playbooks/host_vars/gitea[0-9].*
+      - playbooks/roles/install-docker/.*
+      - playbooks/roles/gitea/.*
+      - playbooks/roles/logrotate/.*
+      - docker/gitea/.*
+      - docker/gitea-init/.*
+      - docker/jinja-init/.*
+      - docker/python-base/.*
+
 - job:
     name: system-config-goaccess-report
     description: |
@@ -2134,6 +2164,7 @@
         - infra-prod-service-zuul-preview
         - infra-prod-service-review
         - infra-prod-service-review-dev
+        - infra-prod-service-gitea
     periodic:
       jobs:
         - developer-openstack-goaccess-report
@@ -2162,6 +2193,7 @@
         - infra-prod-service-backup
         - infra-prod-service-review
         - infra-prod-service-review-dev
+        - infra-prod-service-gitea
     opendev-prod-hourly:
       jobs:
         - infra-prod-update-system-config
diff --git a/run_all.sh b/run_all.sh
index 02dbc9e766..9b3edcee7e 100755
--- a/run_all.sh
+++ b/run_all.sh
@@ -72,10 +72,6 @@ set +e
 # Run all the ansible playbooks under timeout to prevent them from getting
 # stuck if they are oomkilled
 
-start_timer
-timeout -k 2m 30m ansible-playbook -f 50 ${ANSIBLE_PLAYBOOKS}/service-gitea.yaml
-send_timer nodepool
-
 # Run AFS changes separately so we can make sure to only do one at a time
 # (turns out quorum is nice to have)
 start_timer