diff --git a/dockers/docker-team/Dockerfile.j2 b/dockers/docker-teamd/Dockerfile.j2
similarity index 87%
rename from dockers/docker-team/Dockerfile.j2
rename to dockers/docker-teamd/Dockerfile.j2
index 27c5704234..3cbb500750 100644
--- a/dockers/docker-team/Dockerfile.j2
+++ b/dockers/docker-teamd/Dockerfile.j2
@@ -5,7 +5,7 @@ RUN apt-get update && apt-get install -f -y libdbus-1-3 libdaemon0 libjansson4
 COPY debs /debs
 
 RUN dpkg -i \
-{% for deb in docker_team_debs.split(' ') -%}
+{% for deb in docker_teamd_debs.split(' ') -%}
 debs/{{ deb }}{{' '}}
 {%- endfor %}
 
diff --git a/dockers/docker-team/start.sh b/dockers/docker-teamd/start.sh
similarity index 100%
rename from dockers/docker-team/start.sh
rename to dockers/docker-teamd/start.sh
diff --git a/platform/generic/rules.mk b/platform/generic/rules.mk
index 5ef6468b2f..cff64a8b60 100644
--- a/platform/generic/rules.mk
+++ b/platform/generic/rules.mk
@@ -1,6 +1,6 @@
 SONIC_ALL += $(DOCKER_DATABASE) \
          $(DOCKER_FPM) \
-         $(DOCKER_TEAM) \
+         $(DOCKER_TEAMD) \
          $(DOCKER_LLDP_SV2) \
          $(DOCKER_SNMP_SV2) \
          $(DOCKER_PLATFORM_MONITOR)
diff --git a/platform/mellanox/rules.mk b/platform/mellanox/rules.mk
index bb07273417..debf4a4606 100644
--- a/platform/mellanox/rules.mk
+++ b/platform/mellanox/rules.mk
@@ -14,7 +14,7 @@ SONIC_ALL += $(DOCKER_SYNCD_MLNX) \
 	     $(DOCKER_DATABASE) \
 	     $(DOCKER_LLDP_SV2) \
 	     $(DOCKER_SNMP_SV2) \
-	     $(DOCKER_TEAM) \
+	     $(DOCKER_TEAMD) \
 	     $(DOCKER_PLATFORM_MONITOR) \
 	     debs/$(MLNX_HW_MANAGEMENT) \
 	     debs/$(SX_KERNEL)
diff --git a/rules/docker-team.mk b/rules/docker-team.mk
deleted file mode 100644
index 3f5b99ac96..0000000000
--- a/rules/docker-team.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# docker image for team agent
-
-DOCKER_TEAM = docker-team.gz
-$(DOCKER_TEAM)_PATH = $(DOCKERS_PATH)/docker-team
-$(DOCKER_TEAM)_DEPENDS += $(SWSS) $(LIBTEAMDCT) $(LIBTEAM_UTILS)
-$(DOCKER_TEAM)_LOAD_DOCKERS += $(DOCKER_BASE)
-SONIC_DOCKER_IMAGES += $(DOCKER_TEAM)
diff --git a/rules/docker-teamd.mk b/rules/docker-teamd.mk
new file mode 100644
index 0000000000..0760f27902
--- /dev/null
+++ b/rules/docker-teamd.mk
@@ -0,0 +1,7 @@
+# docker image for teamd agent
+
+DOCKER_TEAMD = docker-teamd.gz
+$(DOCKER_TEAMD)_PATH = $(DOCKERS_PATH)/docker-teamd
+$(DOCKER_TEAMD)_DEPENDS += $(SWSS) $(LIBTEAMDCT) $(LIBTEAM_UTILS)
+$(DOCKER_TEAMD)_LOAD_DOCKERS += $(DOCKER_BASE)
+SONIC_DOCKER_IMAGES += $(DOCKER_TEAMD)