diff --git a/rules/dhcpmon.mk b/rules/dhcpmon.mk
index 8f9d6403a677..560061380340 100644
--- a/rules/dhcpmon.mk
+++ b/rules/dhcpmon.mk
@@ -4,7 +4,7 @@ SONIC_DHCPMON_VERSION = 1.0.0-0
 SONIC_DHCPMON_PKG_NAME = dhcpmon
 
 SONIC_DHCPMON = sonic-$(SONIC_DHCPMON_PKG_NAME)_$(SONIC_DHCPMON_VERSION)_$(CONFIGURED_ARCH).deb
-$(SONIC_DHCPMON)_DEPENDS = $(LIBSWSSCOMMON) $(LIBHIREDIS) $(LIBSWSSCOMMON_DEV) $(LIBHIREDIS_DEV)
+$(SONIC_DHCPMON)_DEPENDS = $(LIBSWSSCOMMON) $(LIBSWSSCOMMON_DEV)
 $(SONIC_DHCPMON)_SRC_PATH = $(SRC_PATH)/$(SONIC_DHCPMON_PKG_NAME)
 SONIC_DPKG_DEBS += $(SONIC_DHCPMON)
 
diff --git a/rules/dhcprelay.mk b/rules/dhcprelay.mk
index 0a32d7d54297..80c3cb6341f3 100644
--- a/rules/dhcprelay.mk
+++ b/rules/dhcprelay.mk
@@ -4,7 +4,7 @@ SONIC_DHCPRELAY_VERSION = 1.0.0-0
 SONIC_DHCPRELAY_PKG_NAME = dhcp6relay
 
 SONIC_DHCPRELAY = sonic-$(SONIC_DHCPRELAY_PKG_NAME)_$(SONIC_DHCPRELAY_VERSION)_$(CONFIGURED_ARCH).deb
-$(SONIC_DHCPRELAY)_DEPENDS = $(LIBSWSSCOMMON) $(LIBHIREDIS) $(LIBSWSSCOMMON_DEV) $(LIBHIREDIS_DEV)
+$(SONIC_DHCPRELAY)_DEPENDS = $(LIBSWSSCOMMON) $(LIBSWSSCOMMON_DEV)
 $(SONIC_DHCPRELAY)_SRC_PATH = $(SRC_PATH)/dhcprelay
 SONIC_DPKG_DEBS += $(SONIC_DHCPRELAY)
 
diff --git a/rules/docker-config-engine-bullseye.mk b/rules/docker-config-engine-bullseye.mk
index 9548391a6917..905c69711017 100644
--- a/rules/docker-config-engine-bullseye.mk
+++ b/rules/docker-config-engine-bullseye.mk
@@ -21,8 +21,7 @@ $(DOCKER_CONFIG_ENGINE_BULLSEYE)_FILES += $(RSYSLOG_PLUGIN_CONF_J2)
 $(DOCKER_CONFIG_ENGINE_BULLSEYE)_FILES += $($(SONIC_CTRMGRD)_CONTAINER_SCRIPT)
 
 $(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_DEPENDS = $($(DOCKER_BASE_BULLSEYE)_DBG_DEPENDS) \
-                                             $(LIBSWSSCOMMON_DBG) \
-                                             $(LIBHIREDIS_DBG)
+                                             $(LIBSWSSCOMMON_DBG)
 $(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_IMAGE_PACKAGES = $($(DOCKER_BASE_BULLSEYE)_DBG_IMAGE_PACKAGES)
 
 SONIC_DOCKER_IMAGES += $(DOCKER_CONFIG_ENGINE_BULLSEYE)
diff --git a/rules/docker-config-engine-buster.mk b/rules/docker-config-engine-buster.mk
index cd6d6f43b46d..69e62dc8687f 100644
--- a/rules/docker-config-engine-buster.mk
+++ b/rules/docker-config-engine-buster.mk
@@ -20,8 +20,7 @@ $(DOCKER_CONFIG_ENGINE_BUSTER)_FILES += $(RSYSLOG_PLUGIN_CONF_J2)
 $(DOCKER_CONFIG_ENGINE_BUSTER)_FILES += $($(SONIC_CTRMGRD)_CONTAINER_SCRIPT)
 
 $(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_DEPENDS = $($(DOCKER_BASE_BUSTER)_DBG_DEPENDS) \
-                                             $(LIBSWSSCOMMON_DBG) \
-                                             $(LIBHIREDIS_DBG)
+                                             $(LIBSWSSCOMMON_DBG)
 $(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_IMAGE_PACKAGES = $($(DOCKER_BASE_BUSTER)_DBG_IMAGE_PACKAGES)
 
 SONIC_DOCKER_IMAGES += $(DOCKER_CONFIG_ENGINE_BUSTER)
diff --git a/rules/docker-mux.mk b/rules/docker-mux.mk
index cbdc1c06510d..3d42529c0b29 100644
--- a/rules/docker-mux.mk
+++ b/rules/docker-mux.mk
@@ -6,9 +6,9 @@ DOCKER_MUX_DBG = $(DOCKER_MUX_STEM)-$(DBG_IMAGE_MARK).gz
 
 $(DOCKER_MUX)_PATH = $(DOCKERS_PATH)/$(DOCKER_MUX_STEM)
 
-$(DOCKER_MUX)_DEPENDS = $(SONIC_LINKMGRD) $(LIBSWSSCOMMON) $(LIBHIREDIS)
+$(DOCKER_MUX)_DEPENDS = $(SONIC_LINKMGRD) $(LIBSWSSCOMMON)
 $(DOCKER_MUX)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_DEPENDS)
-$(DOCKER_MUX)_DBG_DEPENDS += $(SONIC_LINKMGRD_DBG) $(LIBSWSSCOMMON_DBG) $(LIBHIREDIS_DBG)
+$(DOCKER_MUX)_DBG_DEPENDS += $(SONIC_LINKMGRD_DBG) $(LIBSWSSCOMMON_DBG)
 
 $(DOCKER_MUX)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_IMAGE_PACKAGES)
 
diff --git a/rules/docker-restapi.mk b/rules/docker-restapi.mk
index 81ea57a89846..541c362912f5 100644
--- a/rules/docker-restapi.mk
+++ b/rules/docker-restapi.mk
@@ -3,7 +3,7 @@
 DOCKER_RESTAPI_STEM = docker-sonic-restapi
 DOCKER_RESTAPI = $(DOCKER_RESTAPI_STEM).gz
 
-$(DOCKER_RESTAPI)_DEPENDS += $(LIBHIREDIS) $(LIBNL3) $(LIBNL_GENL3) \
+$(DOCKER_RESTAPI)_DEPENDS += $(LIBNL3) $(LIBNL_GENL3) \
                              $(LIBNL_ROUTE3) $(LIBSWSSCOMMON) $(RESTAPI)
 
 $(DOCKER_RESTAPI)_PATH = $(DOCKERS_PATH)/$(DOCKER_RESTAPI_STEM)
diff --git a/rules/docker-sonic-sdk-buildenv.mk b/rules/docker-sonic-sdk-buildenv.mk
index 8410d2d12cb9..2ab1a99d9b72 100644
--- a/rules/docker-sonic-sdk-buildenv.mk
+++ b/rules/docker-sonic-sdk-buildenv.mk
@@ -11,7 +11,6 @@ $(DOCKER_SONIC_SDK_BUILDENV)_DEPENDS += $(LIBSAIVS) \
                                         $(LIBSAIREDIS_DEV) \
                                         $(LIBSAIMETADATA_DEV) \
                                         $(LIBSWSSCOMMON_DEV) \
-                                        $(LIBHIREDIS_DEV) \
                                         $(LIBNL3_DEV) \
                                         $(LIBNL_GENL3_DEV) \
                                         $(LIBNL_ROUTE3_DEV) \
diff --git a/rules/hiredis.dep b/rules/hiredis.dep
deleted file mode 100644
index 93bea540289f..000000000000
--- a/rules/hiredis.dep
+++ /dev/null
@@ -1,10 +0,0 @@
-
-SPATH       := $($(LIBHIREDIS)_SRC_PATH)
-DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/hiredis.mk rules/hiredis.dep   
-DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
-DEP_FILES   += $(shell git ls-files $(SPATH))
-
-$(LIBHIREDIS)_CACHE_MODE  := GIT_CONTENT_SHA 
-$(LIBHIREDIS)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
-$(LIBHIREDIS)_DEP_FILES   := $(DEP_FILES)
-
diff --git a/rules/hiredis.mk b/rules/hiredis.mk
deleted file mode 100644
index a97e0bf1bb83..000000000000
--- a/rules/hiredis.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# libhiredis package
-
-HIREDIS_VERSION = 0.14.1
-HIREDIS_VERSION_FULL = ${HIREDIS_VERSION}-1
-
-export HIREDIS_VERSION HIREDIS_VERSION_FULL
-
-LIBHIREDIS = libhiredis0.14_$(HIREDIS_VERSION_FULL)_$(CONFIGURED_ARCH).deb
-$(LIBHIREDIS)_SRC_PATH = $(SRC_PATH)/hiredis
-SONIC_MAKE_DEBS += $(LIBHIREDIS)
-
-LIBHIREDIS_DEV = libhiredis-dev_$(HIREDIS_VERSION_FULL)_$(CONFIGURED_ARCH).deb
-$(eval $(call add_derived_package,$(LIBHIREDIS),$(LIBHIREDIS_DEV)))
-
-LIBHIREDIS_DBG = libhiredis0.14-dbgsym_$(HIREDIS_VERSION_FULL)_$(CONFIGURED_ARCH).deb
-$(eval $(call add_derived_package,$(LIBHIREDIS),$(LIBHIREDIS_DBG)))
-
-export LIBHIREDIS LIBHIREDIS_DEV LIBHIREDIS_DBG
diff --git a/rules/linkmgrd.mk b/rules/linkmgrd.mk
index 07101f0c47fb..6a53b579edd9 100644
--- a/rules/linkmgrd.mk
+++ b/rules/linkmgrd.mk
@@ -7,14 +7,14 @@ export SONIC_LINKMGRD_VERSION SONIC_LINKMGRD_PKG_NAME
 
 SONIC_LINKMGRD = sonic-$(SONIC_LINKMGRD_PKG_NAME)_$(SONIC_LINKMGRD_VERSION)_$(CONFIGURED_ARCH).deb
 $(SONIC_LINKMGRD)_SRC_PATH = $(SRC_PATH)/$(SONIC_LINKMGRD_PKG_NAME)
-$(SONIC_LINKMGRD)_DEPENDS = $(LIBSWSSCOMMON_DEV) $(LIBHIREDIS_DEV)
-$(SONIC_LINKMGRD)_RDEPENDS = $(LIBSWSSCOMMON) $(LIBHIREDIS)
+$(SONIC_LINKMGRD)_DEPENDS = $(LIBSWSSCOMMON_DEV)
+$(SONIC_LINKMGRD)_RDEPENDS = $(LIBSWSSCOMMON)
 
 SONIC_DPKG_DEBS += $(SONIC_LINKMGRD)
 
 SONIC_LINKMGRD_DBG = sonic-$(SONIC_LINKMGRD_PKG_NAME)-dbgsym_$(SONIC_LINKMGRD_VERSION)_$(CONFIGURED_ARCH).deb
-$(SONIC_LINKMGRD)_DBG_DEPENDS = $(LIBSWSSCOMMON_DEV) $(LIBHIREDIS_DEV)
-$(SONIC_LINKMGRD)_DBG_RDEPENDS = $(LIBSWSSCOMMON_DBG) $(LIBHIREDIS_DBG)
+$(SONIC_LINKMGRD)_DBG_DEPENDS = $(LIBSWSSCOMMON_DEV)
+$(SONIC_LINKMGRD)_DBG_RDEPENDS = $(LIBSWSSCOMMON_DBG)
 $(eval $(call add_derived_package,$(SONIC_LINKMGRD),$(SONIC_LINKMGRD_DBG)))
 
 export SONIC_LINKMGRD SONIC_LINKMGRD_DBG
diff --git a/rules/redis.mk b/rules/redis.mk
index 53566b5cdf8b..f7f9ab41a307 100644
--- a/rules/redis.mk
+++ b/rules/redis.mk
@@ -7,8 +7,6 @@ ifneq ($(BLDENV),buster)
 
     REDIS_TOOLS = redis-tools_$(REDIS_VERSION)_$(CONFIGURED_ARCH).deb
     $(REDIS_TOOLS)_SRC_PATH = $(SRC_PATH)/redis
-    $(REDIS_TOOLS)_DEPENDS += $(LIBHIREDIS_DEV)
-    $(REDIS_TOOLS)_RDEPENDS += $(LIBHIREDIS)
     SONIC_MAKE_DEBS += $(REDIS_TOOLS)
 
     REDIS_TOOLS_DBG = redis-tools-dbgsym_$(REDIS_VERSION)_$(CONFIGURED_ARCH).deb
diff --git a/rules/restapi.mk b/rules/restapi.mk
index 21eed4cfbb51..9be5be9ae06a 100644
--- a/rules/restapi.mk
+++ b/rules/restapi.mk
@@ -2,8 +2,8 @@
 
 RESTAPI = sonic-rest-api_1.0.1_$(CONFIGURED_ARCH).deb
 $(RESTAPI)_SRC_PATH = $(SRC_PATH)/sonic-restapi
-$(RESTAPI)_DEPENDS += $(LIBHIREDIS_DEV) $(LIBNL3_DEV) $(LIBNL_GENL3_DEV) \
+$(RESTAPI)_DEPENDS += $(LIBNL3_DEV) $(LIBNL_GENL3_DEV) \
                             $(LIBNL_ROUTE3_DEV) $(LIBSWSSCOMMON_DEV) $(LIBSWSSCOMMON)
-$(RESTAPI)_RDEPENDS += $(LIBHIREDIS) $(LIBNL3) $(LIBNL_GENL3) \
+$(RESTAPI)_RDEPENDS += $(LIBNL3) $(LIBNL_GENL3) \
                              $(LIBNL_ROUTE3) $(LIBSWSSCOMMON)
 SONIC_DPKG_DEBS += $(RESTAPI)
diff --git a/rules/sflow.mk b/rules/sflow.mk
index d99f81504ee2..41cf518399b2 100644
--- a/rules/sflow.mk
+++ b/rules/sflow.mk
@@ -7,7 +7,6 @@ export ENABLE_SFLOW_DROPMON
 export HSFLOWD_VERSION HSFLOWD_SUBVERSION
 
 HSFLOWD = hsflowd_$(HSFLOWD_VERSION)-$(HSFLOWD_SUBVERSION)_$(CONFIGURED_ARCH).deb
-$(HSFLOWD)_DEPENDS += $(LIBHIREDIS_DEV)
 $(HSFLOWD)_SRC_PATH = $(SRC_PATH)/sflow/hsflowd
 
 SONIC_MAKE_DEBS += $(HSFLOWD)
diff --git a/rules/swss-common.mk b/rules/swss-common.mk
index 462e0b3e96f3..3c624aec4b04 100644
--- a/rules/swss-common.mk
+++ b/rules/swss-common.mk
@@ -7,10 +7,10 @@ LIBSWSSCOMMON = $(LIBSWSSCOMMON_NAME)_$(LIBSWSSCOMMON_VERSION)_$(CONFIGURED_ARCH
 $(LIBSWSSCOMMON)_SRC_PATH = $(SRC_PATH)/sonic-swss-common
 $(LIBSWSSCOMMON)_VERSION = $(LIBSWSSCOMMON_VERSION)
 $(LIBSWSSCOMMON)_NAME = $(LIBSWSSCOMMON_NAME)
-$(LIBSWSSCOMMON)_DEPENDS += $(LIBHIREDIS_DEV) $(LIBNL3_DEV) $(LIBNL_GENL3_DEV) \
+$(LIBSWSSCOMMON)_DEPENDS += $(LIBNL3_DEV) $(LIBNL_GENL3_DEV) \
                             $(LIBNL_ROUTE3_DEV) $(LIBNL_NF3_DEV) \
                             $(LIBNL_CLI_DEV) $(LIBYANG_DEV) $(LIBYANG) 
-$(LIBSWSSCOMMON)_RDEPENDS += $(LIBHIREDIS) $(LIBNL3) $(LIBNL_GENL3) \
+$(LIBSWSSCOMMON)_RDEPENDS += $(LIBNL3) $(LIBNL_GENL3) \
                              $(LIBNL_ROUTE3) $(LIBNL_NF3) $(LIBNL_CLI) $(LIBYANG) 
 SONIC_DPKG_DEBS += $(LIBSWSSCOMMON)
 
diff --git a/sonic-slave-bullseye/Dockerfile.j2 b/sonic-slave-bullseye/Dockerfile.j2
index 89b1240bb1b4..1d55779f90d3 100644
--- a/sonic-slave-bullseye/Dockerfile.j2
+++ b/sonic-slave-bullseye/Dockerfile.j2
@@ -406,6 +406,8 @@ RUN apt-get update && apt-get install -y \
         libgirepository1.0-dev \
         libsystemd-dev \
         pkg-config \
+# For sonic-swss-common build
+        libhiredis-dev \
 # For audisp-tacplus
         libauparse-dev \
         auditd
diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2
index 8c292e2105a0..a85b0dc0c543 100644
--- a/sonic-slave-buster/Dockerfile.j2
+++ b/sonic-slave-buster/Dockerfile.j2
@@ -409,6 +409,8 @@ RUN apt-get update && apt-get install -y \
         libgirepository1.0-dev \
         libsystemd-dev \
         pkg-config \
+# For sonic-swss-common build
+        libhiredis-dev \
 # For audisp-tacplus
         libauparse-dev \
         auditd
diff --git a/src/hiredis/.gitignore b/src/hiredis/.gitignore
deleted file mode 100644
index a0991ff4402b..000000000000
--- a/src/hiredis/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*
-!.gitignore
-!Makefile
diff --git a/src/hiredis/Makefile b/src/hiredis/Makefile
deleted file mode 100644
index 7e94e2c091ca..000000000000
--- a/src/hiredis/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-.ONESHELL:
-SHELL = /bin/bash
-.SHELLFLAGS += -e
-
-MAIN_TARGET = $(LIBHIREDIS)
-DERIVED_TARGETS = $(LIBHIREDIS_DBG) $(LIBHIREDIS_DEV)
-
-$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
-	# Remove any stale files
-	rm -rf ./hiredis-$(HIREDIS_VERSION)
-
-	# Get hiredis release, debian files
-	dget -u http://http.debian.net/debian/pool/main/h/hiredis/hiredis_$(HIREDIS_VERSION_FULL).dsc
-
-	# Build source and Debian packages
-	pushd ./hiredis-$(HIREDIS_VERSION)
-ifeq ($(CROSS_BUILD_ENVIRON), y)
-	dpkg-buildpackage -rfakeroot -d -b -us -uc -a$(CONFIGURED_ARCH) -Pcross,nocheck -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
-else
-	dpkg-buildpackage -rfakeroot -d -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
-endif
-	popd
-
-	# Move the newly-built .deb packages to the destination directory
-	mv $* $(DERIVED_TARGETS) $(DEST)/
-
-$(addprefix $(DEST)/, $(DERIVED_TARGETS)): $(DEST)/% : $(DEST)/$(MAIN_TARGET)