diff --git a/ansible/roles/sonicv2/tasks/sonic-brcm.yml b/ansible/roles/sonicv2/tasks/sonic-brcm.yml
index 4b752750d20..9377d114f70 100644
--- a/ansible/roles/sonicv2/tasks/sonic-brcm.yml
+++ b/ansible/roles/sonicv2/tasks/sonic-brcm.yml
@@ -33,7 +33,7 @@
 
 # Install docker containers
 - name: Start syncd docker container
-  include: ../../sonic-common/tasks/sonicdocker.yml
+  include: sonicdocker.yml
   vars:
     docker_container: syncd
     docker_image: "{{ image_id_syncd_rpc if host_saithrift is defined else image_id_syncd }}"
@@ -57,12 +57,22 @@
         group=root
         mode=0755
 
-- name: Start orchagent docker container
-  include: ../../sonic-common/tasks/sonicdocker.yml
+# Remove deprecated orchagent container
+- name: Remove orchagent docker container
+  include: sonicdocker.yml
   vars:
     docker_container: orchagent
     docker_image: "{{ image_id_orchagent }}"
     docker_privileged: yes
+    docker_state: absent
+  tags: orchagent
+
+- name: Start swss docker container
+  include: sonicdocker.yml
+  vars:
+    docker_container: swss
+    docker_image: "{{ image_id_orchagent }}"
+    docker_privileged: yes
     docker_state: reloaded
     docker_volumes: "{{ orchagent_docker_volumes }}"
     docker_volumes_from:
diff --git a/ansible/roles/sonicv2/tasks/sonic-mlnx.yml b/ansible/roles/sonicv2/tasks/sonic-mlnx.yml
index 1c31c445382..18ed6bfb395 100644
--- a/ansible/roles/sonicv2/tasks/sonic-mlnx.yml
+++ b/ansible/roles/sonicv2/tasks/sonic-mlnx.yml
@@ -26,7 +26,7 @@
 
 # Install docker containers
 - name: Start syncd docker container
-  include: ../../sonic-common/tasks/sonicdocker.yml
+  include: sonicdocker.yml
   vars:
     docker_container: syncd
     docker_image: "{{ image_id_syncd_mlnx_rpc if host_saithrift is defined else image_id_syncd_mlnx }}"
@@ -37,12 +37,22 @@
     - database
   tags: syncd
 
-- name: Start orchagent docker container
-  include: ../../sonic-common/tasks/sonicdocker.yml
+# Remove deprecated orchagent container
+- name: Remove orchagent docker container
+  include: sonicdocker.yml
   vars:
     docker_container: orchagent
     docker_image: "{{ image_id_orchagent_mlnx }}"
     docker_privileged: yes
+    docker_state: absent
+  tags: orchagent
+
+- name: Start swss docker container
+  include: sonicdocker.yml
+  vars:
+    docker_container: swss
+    docker_image: "{{ image_id_orchagent_mlnx }}"
+    docker_privileged: yes
     docker_state: reloaded
     docker_volumes: "{{ orchagent_docker_volumes }}"
     docker_volumes_from:
diff --git a/ansible/roles/sonicv2/templates/etc/systemd/system/orchagent.j2 b/ansible/roles/sonicv2/templates/etc/systemd/system/swss.j2
similarity index 59%
rename from ansible/roles/sonicv2/templates/etc/systemd/system/orchagent.j2
rename to ansible/roles/sonicv2/templates/etc/systemd/system/swss.j2
index e60cefaf641..ce25ca56227 100644
--- a/ansible/roles/sonicv2/templates/etc/systemd/system/orchagent.j2
+++ b/ansible/roles/sonicv2/templates/etc/systemd/system/swss.j2
@@ -1,12 +1,12 @@
 [Unit]
-Description=orchagent container
+Description=switch state service container
 Requires=database.service
 After=database.service
 
 [Service]
 User={{ sonicadmin_user }}
-ExecStart=/usr/bin/docker start -a orchagent
-ExecStop=/usr/bin/docker stop orchagent
+ExecStart=/usr/bin/docker start -a swss
+ExecStop=/usr/bin/docker stop swss
 ExecStopPost=/usr/bin/docker stop syncd
 
 [Install]