diff --git a/files/build_templates/gbsyncd-cisco.service.j2 b/files/build_templates/gbsyncd-cisco.service.j2
deleted file mode 120000
index 69f613b0d8..0000000000
--- a/files/build_templates/gbsyncd-cisco.service.j2
+++ /dev/null
@@ -1 +0,0 @@
-gbsyncd.service.j2
\ No newline at end of file
diff --git a/files/build_templates/gbsyncd-credo.service.j2 b/files/build_templates/gbsyncd-credo.service.j2
deleted file mode 120000
index 69f613b0d8..0000000000
--- a/files/build_templates/gbsyncd-credo.service.j2
+++ /dev/null
@@ -1 +0,0 @@
-gbsyncd.service.j2
\ No newline at end of file
diff --git a/files/scripts/gbsyncd-platform.sh b/files/scripts/gbsyncd-platform.sh
index cb83e0e39e..c0db897d65 100755
--- a/files/scripts/gbsyncd-platform.sh
+++ b/files/scripts/gbsyncd-platform.sh
@@ -7,17 +7,17 @@ PLATFORM=${PLATFORM:-`sonic-cfggen -H -v DEVICE_METADATA.localhost.platform`}
 DEVPATH="/usr/share/sonic/device"
 CONFIGFILE="${DEVPATH}/${PLATFORM}/gbsyncd.ini"
 
+# Skip checking the service for vs
+[ "$sonic_asic_platform" = vs ] && exit 0
+
 if [ ! -f "$CONFIGFILE" ]; then
-    if [ gbsyncd = "$SERVICE" ]; then
-       exit 0
-    fi
     exit 1
 fi
 
 while IFS="=" read -r key value; do
     case "$key" in
         platform)
-            if [ "$value" = "$SERVICE" ]; then
+            if [[ "$value" = "$SERVICE"* ]]; then
                 exit 0
             fi
             ;;
diff --git a/platform/components/docker-gbsyncd-credo.mk b/platform/components/docker-gbsyncd-credo.mk
index 0dc6875efe..5261ce00bc 100644
--- a/platform/components/docker-gbsyncd-credo.mk
+++ b/platform/components/docker-gbsyncd-credo.mk
@@ -9,7 +9,6 @@ ifneq ($($(LIBSAI_CREDO)_URL),)
 include $(PLATFORM_PATH)/../template/docker-gbsyncd-base.mk
 $(DOCKER_GBSYNCD_BASE)_VERSION = 1.0.0
 $(DOCKER_GBSYNCD_BASE)_PACKAGE_NAME = gbsyncd
-$(DOCKER_GBSYNCD_BASE)_CONTAINER_NAME = gbsyncd-$(DOCKER_GBSYNCD_PLATFORM_CODE)
 $(DOCKER_GBSYNCD_BASE)_PATH = $(PLATFORM_PATH)/../components/docker-gbsyncd-$(DOCKER_GBSYNCD_PLATFORM_CODE)
 SONIC_ONLINE_DEBS += $(LIBSAI_CREDO) $(LIBSAI_CREDO_OWL)
 $(DOCKER_GBSYNCD_BASE)_DEPENDS += $(SYNCD) $(LIBSAI_CREDO) $(LIBSAI_CREDO_OWL)