diff --git a/files/build_templates/teamd.service.j2 b/files/build_templates/teamd.service.j2
index 58c858effb..8034698ecc 100644
--- a/files/build_templates/teamd.service.j2
+++ b/files/build_templates/teamd.service.j2
@@ -1,6 +1,6 @@
 [Unit]
 Description=TEAMD container
-Requires=updategraph.service swss.service
+Requires=updategraph.service
 After=updategraph.service swss.service
 Before=ntp-config.service
 
@@ -11,4 +11,4 @@ ExecStart=/usr/bin/{{docker_container_name}}.sh wait
 ExecStop=/usr/bin/{{docker_container_name}}.sh stop
 
 [Install]
-WantedBy=multi-user.target swss.service
+WantedBy=multi-user.target
diff --git a/files/scripts/swss.sh b/files/scripts/swss.sh
index 88bce037b9..7b6ae6b5db 100755
--- a/files/scripts/swss.sh
+++ b/files/scripts/swss.sh
@@ -2,6 +2,7 @@
 
 SERVICE="swss"
 PEER="syncd"
+DEPENDENT="teamd"
 DEBUGLOG="/tmp/swss-syncd-debug.log"
 LOCKFILE="/tmp/swss-syncd-lock"
 
@@ -78,11 +79,24 @@ function clean_up_tables()
     end" 0
 }
 
-startPeerService() {
+start_peer_and_dependent_services() {
     check_warm_boot
 
     if [[ x"$WARM_BOOT" != x"true" ]]; then
         /bin/systemctl start ${PEER}
+        for dep in ${DEPENDENT}; do
+            /bin/systemctl start ${dep}
+        done
+    fi
+}
+
+stop_peer_and_dependent_services() {
+    # if warm start enabled or peer lock exists, don't stop peer service docker
+    if [[ x"$WARM_BOOT" != x"true" ]]; then
+        /bin/systemctl stop ${PEER}
+        for dep in ${DEPENDENT}; do
+            /bin/systemctl stop ${dep}
+        done
     fi
 }
 
@@ -116,7 +130,7 @@ start() {
 }
 
 wait() {
-    startPeerService
+    start_peer_and_dependent_services
     /usr/bin/${SERVICE}.sh wait
 }
 
@@ -135,10 +149,7 @@ stop() {
     # Unlock has to happen before reaching out to peer service
     unlock_service_state_change
 
-    # if warm start enabled or peer lock exists, don't stop peer service docker
-    if [[ x"$WARM_BOOT" != x"true" ]]; then
-        /bin/systemctl stop ${PEER}
-    fi
+    stop_peer_and_dependent_services
 }
 
 case "$1" in