diff --git a/ansible/roles/sonicv2/templates/etc/systemd/system/orchagent.j2 b/ansible/roles/sonicv2/templates/etc/systemd/system/orchagent.j2
index 5bd8c68eee0..e60cefaf641 100644
--- a/ansible/roles/sonicv2/templates/etc/systemd/system/orchagent.j2
+++ b/ansible/roles/sonicv2/templates/etc/systemd/system/orchagent.j2
@@ -8,7 +8,6 @@ User={{ sonicadmin_user }}
 ExecStart=/usr/bin/docker start -a orchagent
 ExecStop=/usr/bin/docker stop orchagent
 ExecStopPost=/usr/bin/docker stop syncd
-ExecStopPost=/usr/bin/docker exec database redis-cli FLUSHALL
 
 [Install]
 WantedBy=multi-user.target
diff --git a/ansible/roles/sonicv2/templates/etc/systemd/system/syncd.j2 b/ansible/roles/sonicv2/templates/etc/systemd/system/syncd.j2
index a59e23c2b4a..136c4fb1a9c 100644
--- a/ansible/roles/sonicv2/templates/etc/systemd/system/syncd.j2
+++ b/ansible/roles/sonicv2/templates/etc/systemd/system/syncd.j2
@@ -9,6 +9,7 @@ User=root
 ExecStartPre=/etc/init.d/sxdkernel start
 ExecStartPre=/usr/bin/mst start
 {% endif %}
+ExecStartPre=/usr/bin/docker exec database redis-cli FLUSHALL
 ExecStart=/usr/bin/docker start -a syncd
 ExecStop=/usr/bin/docker stop syncd
 {% if sonic_hwsku == 'ACS-MSN2700' %}