diff --git a/rules/python-click.mk b/rules/python-click.mk
index 5d48dc30d6..59e22b3711 100644
--- a/rules/python-click.mk
+++ b/rules/python-click.mk
@@ -7,11 +7,10 @@
 # TODO: If we upgrade to a distro which provides a version >= 6.7 we will no
 # longer need to build this.
 
-PYTHON_CLICK_VERSION = 6.7-4
+PYTHON_CLICK_VERSION = 7.0-1
 
 export PYTHON_CLICK_VERSION
 
 PYTHON_CLICK = python-click_$(PYTHON_CLICK_VERSION)_all.deb
 $(PYTHON_CLICK)_SRC_PATH = $(SRC_PATH)/python-click
 SONIC_MAKE_DEBS += $(PYTHON_CLICK)
-SONIC_STRETCH_DEBS += $(PYTHON_CLICK)
diff --git a/sonic-slave-buster/Dockerfile.j2 b/sonic-slave-buster/Dockerfile.j2
index c010a49804..b2b574ec56 100644
--- a/sonic-slave-buster/Dockerfile.j2
+++ b/sonic-slave-buster/Dockerfile.j2
@@ -266,6 +266,7 @@ RUN apt-get update && apt-get install -y \
         iproute2 \
 # For python-click build
         python-sphinx \
+        python3-pallets-sphinx-themes \
         python-docutils \
         python3-all \
         python3-setuptools \