diff --git a/files/build_templates/manifest.json.j2 b/files/build_templates/manifest.json.j2
index 431b2dd2243..dff92ac2163 100644
--- a/files/build_templates/manifest.json.j2
+++ b/files/build_templates/manifest.json.j2
@@ -1,3 +1,11 @@
+{%- if version_suffix %}
+{#- append build metadata suffix to the version #}
+{%- if '+' in version %}
+{%- set version = version + '.' + version_suffix %}
+{%- else %}
+{%- set version = version + '+' + version_suffix %}
+{%- endif %}
+{%- endif %}
 {
     "version": "1.0.0",
     "package": {
diff --git a/platform/barefoot/docker-syncd-bfn-rpc.mk b/platform/barefoot/docker-syncd-bfn-rpc.mk
index 1203c99aa7a..9fc0ca9cd6f 100644
--- a/platform/barefoot/docker-syncd-bfn-rpc.mk
+++ b/platform/barefoot/docker-syncd-bfn-rpc.mk
@@ -17,7 +17,7 @@ SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_BFN_RPC)
 endif
 
 $(DOCKER_SYNCD_BFN_RPC)_CONTAINER_NAME = syncd
-$(DOCKER_SYNCD_BFN_RPC)_VERSION = 1.0.0-rpc
+$(DOCKER_SYNCD_BFN_RPC)_VERSION = 1.0.0+rpc
 $(DOCKER_SYNCD_BFN_RPC)_PACKAGE_NAME = syncd
 $(DOCKER_SYNCD_BFN_RPC)_RUN_OPT += --privileged -t
 $(DOCKER_SYNCD_BFN_RPC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
diff --git a/platform/broadcom/docker-syncd-brcm-dnx-rpc.mk b/platform/broadcom/docker-syncd-brcm-dnx-rpc.mk
index c4ccf51f653..63fd7b08664 100644
--- a/platform/broadcom/docker-syncd-brcm-dnx-rpc.mk
+++ b/platform/broadcom/docker-syncd-brcm-dnx-rpc.mk
@@ -18,7 +18,7 @@ SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_BRCM_DNX_RPC)
 endif
 
 $(DOCKER_SYNCD_BRCM_DNX_RPC)_CONTAINER_NAME = syncd
-$(DOCKER_SYNCD_BRCM_DNX_RPC)_VERSION = 1.0.0-rpc
+$(DOCKER_SYNCD_BRCM_DNX_RPC)_VERSION = 1.0.0+rpc
 $(DOCKER_SYNCD_BRCM_DNX_RPC)_PACKAGE_NAME = syncd-dnx
 $(DOCKER_SYNCD_BRCM_DNX_RPC)_RUN_OPT += --privileged -t
 $(DOCKER_SYNCD_BRCM_DNX_RPC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
diff --git a/platform/broadcom/docker-syncd-brcm-rpc.mk b/platform/broadcom/docker-syncd-brcm-rpc.mk
index 554c603e63e..a43755708c6 100644
--- a/platform/broadcom/docker-syncd-brcm-rpc.mk
+++ b/platform/broadcom/docker-syncd-brcm-rpc.mk
@@ -17,7 +17,7 @@ SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_BRCM_RPC)
 endif
 
 $(DOCKER_SYNCD_BRCM_RPC)_CONTAINER_NAME = syncd
-$(DOCKER_SYNCD_BRCM_RPC)_VERSION = 1.0.0-rpc
+$(DOCKER_SYNCD_BRCM_RPC)_VERSION = 1.0.0+rpc
 $(DOCKER_SYNCD_BRCM_RPC)_PACKAGE_NAME = syncd
 $(DOCKER_SYNCD_BRCM_RPC)_RUN_OPT += --privileged -t
 $(DOCKER_SYNCD_BRCM_RPC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
diff --git a/platform/cavium/docker-syncd-cavm-rpc.mk b/platform/cavium/docker-syncd-cavm-rpc.mk
index a49f12fb38b..b6add442469 100644
--- a/platform/cavium/docker-syncd-cavm-rpc.mk
+++ b/platform/cavium/docker-syncd-cavm-rpc.mk
@@ -17,7 +17,7 @@ SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_CAVM_RPC)
 endif
 
 $(DOCKER_SYNCD_CAVM_RPC)_CONTAINER_NAME = syncd
-$(DOCKER_SYNCD_CAVM_RPC)_VERSION = 1.0.0-rpc
+$(DOCKER_SYNCD_CAVM_RPC)_VERSION = 1.0.0+rpc
 $(DOCKER_SYNCD_CAVM_RPC)_PACKAGE_NAME = syncd
 $(DOCKER_SYNCD_CAVM_RPC)_RUN_OPT += --privileged -t
 $(DOCKER_SYNCD_CAVM_RPC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
diff --git a/platform/centec-arm64/docker-syncd-centec-rpc.mk b/platform/centec-arm64/docker-syncd-centec-rpc.mk
index 7b6be9cdb3c..8aaf4beecc6 100755
--- a/platform/centec-arm64/docker-syncd-centec-rpc.mk
+++ b/platform/centec-arm64/docker-syncd-centec-rpc.mk
@@ -17,7 +17,7 @@ SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_CENTEC_RPC)
 endif
 
 $(DOCKER_SYNCD_CENTEC_RPC)_CONTAINER_NAME = syncd
-$(DOCKER_SYNCD_CENTEC_RPC)_VERSION = 1.0.0-rpc
+$(DOCKER_SYNCD_CENTEC_RPC)_VERSION = 1.0.0+rpc
 $(DOCKER_SYNCD_CENTEC_RPC)_PACKAGE_NAME = syncd
 $(DOCKER_SYNCD_CENTEC_RPC)_RUN_OPT += --privileged -t
 $(DOCKER_SYNCD_CENTEC_RPC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
diff --git a/platform/centec/docker-syncd-centec-rpc.mk b/platform/centec/docker-syncd-centec-rpc.mk
index 88c101182bb..f8b7fe03009 100644
--- a/platform/centec/docker-syncd-centec-rpc.mk
+++ b/platform/centec/docker-syncd-centec-rpc.mk
@@ -17,7 +17,7 @@ SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_CENTEC_RPC)
 endif
 
 $(DOCKER_SYNCD_CENTEC_RPC)_CONTAINER_NAME = syncd
-$(DOCKER_SYNCD_CENTEC_RPC)_VERSION = 1.0.0-rpc
+$(DOCKER_SYNCD_CENTEC_RPC)_VERSION = 1.0.0+rpc
 $(DOCKER_SYNCD_CENTEC_RPC)_PACKAGE_NAME = syncd
 $(DOCKER_SYNCD_CENTEC_RPC)_RUN_OPT += --privileged -t
 $(DOCKER_SYNCD_CENTEC_RPC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
diff --git a/platform/innovium/docker-syncd-invm-rpc.mk b/platform/innovium/docker-syncd-invm-rpc.mk
index 8ccbef57dd4..fc526fc22f6 100755
--- a/platform/innovium/docker-syncd-invm-rpc.mk
+++ b/platform/innovium/docker-syncd-invm-rpc.mk
@@ -10,7 +10,7 @@ SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_INVM_RPC)
 endif
 
 $(DOCKER_SYNCD_INVM_RPC)_CONTAINER_NAME = syncd
-$(DOCKER_SYNCD_INVM_RPC)_VERSION = 1.0.0-rpc
+$(DOCKER_SYNCD_INVM_RPC)_VERSION = 1.0.0+rpc
 $(DOCKER_SYNCD_INVM_RPC)_PACKAGE_NAME = syncd
 $(DOCKER_SYNCD_INVM_RPC)_RUN_OPT += --privileged -t
 $(DOCKER_SYNCD_INVM_RPC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
diff --git a/platform/marvell-arm64/docker-syncd-mrvl-rpc.mk b/platform/marvell-arm64/docker-syncd-mrvl-rpc.mk
index c8a94878956..7d59aec8490 100644
--- a/platform/marvell-arm64/docker-syncd-mrvl-rpc.mk
+++ b/platform/marvell-arm64/docker-syncd-mrvl-rpc.mk
@@ -18,7 +18,7 @@ SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_MRVL_RPC)
 endif
 
 $(DOCKER_SYNCD_MRVL_RPC)_CONTAINER_NAME = syncd
-$(DOCKER_SYNCD_MRVL_RPC)_VERSION = 1.0.0-rpc
+$(DOCKER_SYNCD_MRVL_RPC)_VERSION = 1.0.0+rpc
 $(DOCKER_SYNCD_MRVL_RPC)_PACKAGE_NAME = syncd
 $(DOCKER_SYNCD_MRVL_RPC)_RUN_OPT += --privileged -t
 $(DOCKER_SYNCD_MRVL_RPC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
diff --git a/platform/marvell-armhf/docker-syncd-mrvl-rpc.mk b/platform/marvell-armhf/docker-syncd-mrvl-rpc.mk
index efd1e96f3d8..20698efdf9e 100644
--- a/platform/marvell-armhf/docker-syncd-mrvl-rpc.mk
+++ b/platform/marvell-armhf/docker-syncd-mrvl-rpc.mk
@@ -17,7 +17,7 @@ SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_MRVL_RPC)
 endif
 
 $(DOCKER_SYNCD_MRVL_RPC)_CONTAINER_NAME = syncd
-$(DOCKER_SYNCD_MRVL_RPC)_VERSION = 1.0.0-rpc
+$(DOCKER_SYNCD_MRVL_RPC)_VERSION = 1.0.0+rpc
 $(DOCKER_SYNCD_MRVL_RPC)_PACKAGE_NAME = syncd
 $(DOCKER_SYNCD_MRVL_RPC)_RUN_OPT += --privileged -t
 $(DOCKER_SYNCD_MRVL_RPC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
diff --git a/platform/marvell/docker-syncd-mrvl-rpc.mk b/platform/marvell/docker-syncd-mrvl-rpc.mk
index c8a94878956..7d59aec8490 100644
--- a/platform/marvell/docker-syncd-mrvl-rpc.mk
+++ b/platform/marvell/docker-syncd-mrvl-rpc.mk
@@ -18,7 +18,7 @@ SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_MRVL_RPC)
 endif
 
 $(DOCKER_SYNCD_MRVL_RPC)_CONTAINER_NAME = syncd
-$(DOCKER_SYNCD_MRVL_RPC)_VERSION = 1.0.0-rpc
+$(DOCKER_SYNCD_MRVL_RPC)_VERSION = 1.0.0+rpc
 $(DOCKER_SYNCD_MRVL_RPC)_PACKAGE_NAME = syncd
 $(DOCKER_SYNCD_MRVL_RPC)_RUN_OPT += --privileged -t
 $(DOCKER_SYNCD_MRVL_RPC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
diff --git a/platform/mellanox/docker-syncd-mlnx-rpc.mk b/platform/mellanox/docker-syncd-mlnx-rpc.mk
index fe2ff591649..197c2463820 100644
--- a/platform/mellanox/docker-syncd-mlnx-rpc.mk
+++ b/platform/mellanox/docker-syncd-mlnx-rpc.mk
@@ -20,7 +20,7 @@ SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_MLNX_RPC)
 endif
 
 $(DOCKER_SYNCD_MLNX_RPC)_CONTAINER_NAME = syncd
-$(DOCKER_SYNCD_MLNX_RPC)_VERSION = 1.0.0-rpc
+$(DOCKER_SYNCD_MLNX_RPC)_VERSION = 1.0.0+rpc
 $(DOCKER_SYNCD_MLNX_RPC)_PACKAGE_NAME = syncd
 $(DOCKER_SYNCD_MLNX_RPC)_RUN_OPT += --privileged -t
 $(DOCKER_SYNCD_MLNX_RPC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
diff --git a/platform/nephos/docker-syncd-nephos-rpc.mk b/platform/nephos/docker-syncd-nephos-rpc.mk
index 94ba95b15dc..5ead18609db 100644
--- a/platform/nephos/docker-syncd-nephos-rpc.mk
+++ b/platform/nephos/docker-syncd-nephos-rpc.mk
@@ -18,7 +18,7 @@ SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_NEPHOS_RPC)
 endif
 
 $(DOCKER_SYNCD_NEPHOS_RPC)_CONTAINER_NAME = syncd
-$(DOCKER_SYNCD_NEPHOS_RPC)_VERSION = 1.0.0-rpc
+$(DOCKER_SYNCD_NEPHOS_RPC)_VERSION = 1.0.0+rpc
 $(DOCKER_SYNCD_NEPHOS_RPC)_PACKAGE_NAME = syncd
 $(DOCKER_SYNCD_NEPHOS_RPC)_RUN_OPT += --privileged -t
 $(DOCKER_SYNCD_NEPHOS_RPC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
diff --git a/rules/functions b/rules/functions
index 6f62b87797c..d86d714b4a2 100644
--- a/rules/functions
+++ b/rules/functions
@@ -177,7 +177,8 @@ endef
 # call:
 #     generate_manifest some_docker.gz, version_suffix
 define generate_manifest
-    $(eval export version=$($(1).gz_VERSION)$(2))
+    $(eval export version=$($(1).gz_VERSION))
+    $(eval export version_suffix=$(2))
     $(eval export name=$($(1).gz_CONTAINER_NAME))
     $(eval export package_name=$($(1).gz_PACKAGE_NAME))
     $(eval export asic_service=$(shell [ -f files/build_templates/per_namespace/$(name).service.j2 ] && echo true || echo false))
diff --git a/slave.mk b/slave.mk
index 9e4bf532bfd..5e90f41c0f1 100644
--- a/slave.mk
+++ b/slave.mk
@@ -840,7 +840,7 @@ $(addprefix $(TARGET_PATH)/, $(DOCKER_DBG_IMAGES)) : $(TARGET_PATH)/%-$(DBG_IMAG
 		$(eval export $(subst -,_,$(notdir $($*.gz_PATH)))_dbg_pkgs=$(shell printf "$(subst $(SPACE),\n,$(call expand,$($*.gz_DBG_APT_PACKAGES),RDEPENDS))\n" | awk '!a[$$0]++'))
 		./build_debug_docker_j2.sh $* $(subst -,_,$(notdir $($*.gz_PATH)))_dbg_debs $(subst -,_,$(notdir $($*.gz_PATH)))_image_dbgs > $($*.gz_PATH)/Dockerfile-dbg.j2
 		j2 $($*.gz_PATH)/Dockerfile-dbg.j2 > $($*.gz_PATH)/Dockerfile-dbg
-		$(call generate_manifest,$*,-dbg)
+		$(call generate_manifest,$*,dbg)
 		# Prepare docker build info
 		PACKAGE_URL_PREFIX=$(PACKAGE_URL_PREFIX) \
 		SONIC_ENFORCE_VERSIONS=$(SONIC_ENFORCE_VERSIONS) \