diff --git a/playbooks/rename_repos.yaml b/playbooks/rename_repos.yaml
index 0e328137d4..83c8e18cab 100644
--- a/playbooks/rename_repos.yaml
+++ b/playbooks/rename_repos.yaml
@@ -6,7 +6,9 @@
     - include_vars: "{{ repolist }}"
 
     - name: Stop Gerrit
-      shell: invoke-rc.d gerrit stop
+      shell:
+        cmd: docker-compose down
+        chdir: /etc/gerrit-compose/
 
     - name: Update account_project_watches in gerrit database
       shell: echo 'update account_project_watches set project_name = "{{ item.new }}" where project_name = "{{ item.old }}";' | mysql --defaults-file=/root/.gerrit_db.cnf reviewdb
@@ -120,7 +122,12 @@
   tasks:
 
     - name: Start gerrit
-      shell: invoke-rc.d gerrit start
+      include_role:
+        name: gerrit
+        vars:
+          gerrit_run_init: true
+          gerrit_run_compose_up: true
+        tasks_from: start
 
 - hosts: review
   gather_facts: False