diff --git a/inventory/service/host_vars/review-test.openstack.org.yaml b/inventory/service/host_vars/review-test.openstack.org.yaml
index 3ad618cb23..c101ae7dfd 100644
--- a/inventory/service/host_vars/review-test.openstack.org.yaml
+++ b/inventory/service/host_vars/review-test.openstack.org.yaml
@@ -7,6 +7,7 @@ gerrit_replication:
 gerrit_storyboard_url: https://storyboard.openstack.org
 gerrit_vhost_name: review-test.opendev.org
 gerrit_heap_limit: 48g
+gerrit_track_upstream: false
 letsencrypt_certs:
   review-test-opendev-org-main:
     - review-test.opendev.org
diff --git a/playbooks/roles/gerrit/defaults/main.yaml b/playbooks/roles/gerrit/defaults/main.yaml
index f103a21459..5d4b171c25 100644
--- a/playbooks/roles/gerrit/defaults/main.yaml
+++ b/playbooks/roles/gerrit/defaults/main.yaml
@@ -23,3 +23,4 @@ gerrit_container_volumes:
 gerrit_database_type: MYSQL
 gerrit_project_creator_user: openstack-project-creator
 gerrit_manage_projects_args: "-v"
+gerrit_track_upstream: true
diff --git a/playbooks/roles/gerrit/tasks/main.yaml b/playbooks/roles/gerrit/tasks/main.yaml
index 6e62ff6b14..2b911a5f01 100644
--- a/playbooks/roles/gerrit/tasks/main.yaml
+++ b/playbooks/roles/gerrit/tasks/main.yaml
@@ -316,6 +316,7 @@
     job: '/usr/local/bin/track-upstream'
     user: root
     minute: 42
+    state: "{{ gerrit_track_upstream | bool | ternary('present', 'absent') }}"
 
 - name: Set up cron job to back up gerrit db
   cron: