diff --git a/playbookconfig/src/playbooks/roles/bootstrap/apply-manifest/tasks/apply_bootstrap_manifest.yml b/playbookconfig/src/playbooks/roles/bootstrap/apply-manifest/tasks/apply_bootstrap_manifest.yml
index f1119589b..e4ea5fcaf 100644
--- a/playbookconfig/src/playbooks/roles/bootstrap/apply-manifest/tasks/apply_bootstrap_manifest.yml
+++ b/playbookconfig/src/playbooks/roles/bootstrap/apply-manifest/tasks/apply_bootstrap_manifest.yml
@@ -340,7 +340,7 @@
     command: psql -d keystone -c "update public.project set
            id='{{ system_controller_keystone_services_project_id }}' where name='services'"
   become_user: postgres
-  when: distributed_cloud_role == 'subcloud'
+  when: distributed_cloud_role == 'subcloud' and mode == 'bootstrap'
 
 - name: Import fm bootstrap tasks
   import_tasks: fm_bootstrap.yml
diff --git a/playbookconfig/src/playbooks/roles/bootstrap/persist-config/tasks/update_sysinv_database.yml b/playbookconfig/src/playbooks/roles/bootstrap/persist-config/tasks/update_sysinv_database.yml
index 42b670567..cdfbd51be 100644
--- a/playbookconfig/src/playbooks/roles/bootstrap/persist-config/tasks/update_sysinv_database.yml
+++ b/playbookconfig/src/playbooks/roles/bootstrap/persist-config/tasks/update_sysinv_database.yml
@@ -96,7 +96,7 @@
            public.user.id=public.local_user.user_id and
            public.local_user.name='dcmanager'"
   become_user: postgres
-  when: distributed_cloud_role == 'subcloud'
+  when: distributed_cloud_role == 'subcloud' and mode == 'bootstrap'
 
 # If this is initial play or replay with management and/or oam network
 # config change, must wait for the keystone endpoint runtime manifest