diff --git a/.azure-pipelines/azure-pipelines-build-ubuntu-2004.yml b/.azure-pipelines/azure-pipelines-build-ubuntu-2004.yml
index e2aa480576..f3c966c86d 100644
--- a/.azure-pipelines/azure-pipelines-build-ubuntu-2004.yml
+++ b/.azure-pipelines/azure-pipelines-build-ubuntu-2004.yml
@@ -29,7 +29,8 @@ stages:
                          debhelper-compat dh-elpa dh-sequence-python3 python3-all \
                          libpython3-all-dev python3-six xmlto unzip rake-compiler gem2deb pkg-php-tools \
                          ant default-jdk maven-repo-helper libguava-java \
-                         libboost-all-dev libgtest-dev build-essential
+                         libboost-all-dev libgtest-dev build-essential swig4.0 swig
+        sudo pip3 install pytest click
         wget http://ftp.us.debian.org/debian/pool/main/libg/libgoogle-gson-java/libgoogle-gson-java_2.8.6-1+deb11u1_all.deb
         sudo dpkg -i libgoogle-gson-java_2.8.6-1+deb11u1_all.deb
         mkdir -p /tmp/artifacts
diff --git a/dockers/docker-database/Dockerfile.j2 b/dockers/docker-database/Dockerfile.j2
index 22e88275e2..3b0de019ef 100644
--- a/dockers/docker-database/Dockerfile.j2
+++ b/dockers/docker-database/Dockerfile.j2
@@ -12,6 +12,9 @@ RUN apt-get update
 # Install redis-server
 RUN apt-get install -y redis-tools redis-server
 
+# Install click for CLI
+RUN pip3 install click
+
 {% if docker_database_debs.strip() -%}
 # Copy locally-built Debian package dependencies
 {{ copy_files("debs/", docker_database_debs.split(' '), "/debs/") }}
diff --git a/rules/docker-database.mk b/rules/docker-database.mk
index 888031a7b7..5fb0908358 100644
--- a/rules/docker-database.mk
+++ b/rules/docker-database.mk
@@ -5,7 +5,8 @@ DOCKER_DATABASE = $(DOCKER_DATABASE_STEM).gz
 DOCKER_DATABASE_DBG = $(DOCKER_DATABASE_STEM)-$(DBG_IMAGE_MARK).gz
 
 $(DOCKER_DATABASE)_DEPENDS += $(LIBSWSSCOMMON) \
-                              $(SONIC_DB_CLI)
+                              $(SONIC_DB_CLI) \
+                              $(LIB_SONIC_DASH_API)
 
 $(DOCKER_DATABASE)_PATH = $(DOCKERS_PATH)/$(DOCKER_DATABASE_STEM)