diff --git a/Makefile.work b/Makefile.work
index 628f770a8..743a70551 100644
--- a/Makefile.work
+++ b/Makefile.work
@@ -580,6 +580,7 @@ SONIC_BUILD_INSTRUCTION :=  $(MAKE) \
                            SONIC_OS_VERSION=$(SONIC_OS_VERSION) \
                            PIP_HTTP_TIMEOUT=$(PIP_HTTP_TIMEOUT) \
                            LEGACY_SONIC_MGMT_DOCKER=$(LEGACY_SONIC_MGMT_DOCKER) \
+                           INCLUDE_OLS_UCENTRAL_CLIENT=$(INCLUDE_OLS_UCENTRAL_CLIENT) \
                            $(SONIC_OVERRIDE_BUILD_VARS)
 
 .PHONY: sonic-slave-build sonic-slave-bash init reset
diff --git a/rules/config b/rules/config
index b9a7efa81..0b5386204 100644
--- a/rules/config
+++ b/rules/config
@@ -321,3 +321,6 @@ PIP_HTTP_TIMEOUT ?= 60
 
 # BUILD_REDUCE_IMAGE_SIZE - reduce the image size as much as possbible
 BUILD_REDUCE_IMAGE_SIZE = n
+
+# OLS (OpenLAN Switching) uCentral client
+INCLUDE_OLS_UCENTRAL_CLIENT = y
diff --git a/rules/sonic-packages.mk b/rules/sonic-packages.mk
index 47e02001f..31d7aaf4f 100644
--- a/rules/sonic-packages.mk
+++ b/rules/sonic-packages.mk
@@ -7,3 +7,11 @@
 ## $(PACKAGE)_VERSION = 1.0.0
 ## SONIC_PACKAGES += $(PACKAGE)
 
+DOCKER_OLS_UCENTRAL_CLIENT = docker-ols-ucentral-client
+$(DOCKER_OLS_UCENTRAL_CLIENT)_REPOSITORY = vmytnykplv/ols-ucentral-client
+$(DOCKER_OLS_UCENTRAL_CLIENT)_VERSION = 1.0.0
+$(DOCKER_OLS_UCENTRAL_CLIENT)_DEFAULT_FEATURE_STATE_ENABLED = y
+
+ifeq ($(INCLUDE_OLS_UCENTRAL_CLIENT),y)
+SONIC_PACKAGES += $(DOCKER_OLS_UCENTRAL_CLIENT)
+endif
diff --git a/slave.mk b/slave.mk
index bf4f22463..25bc0a193 100644
--- a/slave.mk
+++ b/slave.mk
@@ -449,6 +449,7 @@ endif
 $(info "CROSS_BUILD_ENVIRON"             : "$(CROSS_BUILD_ENVIRON)")
 $(info "GZ_COMPRESS_PROGRAM"             : "$(GZ_COMPRESS_PROGRAM)")
 $(info "LEGACY_SONIC_MGMT_DOCKER"        : "$(LEGACY_SONIC_MGMT_DOCKER)")
+$(info "INCLUDE_OLS_UCENTRAL_CLIENT"     : "$(INCLUDE_OLS_UCENTRAL_CLIENT)")
 $(info )
 else
 $(info SONiC Build System for $(CONFIGURED_PLATFORM):$(CONFIGURED_ARCH))