diff --git a/sonic-slave/Dockerfile b/sonic-slave/Dockerfile
index a43bdd5c1550..5b3c7156f5b3 100644
--- a/sonic-slave/Dockerfile
+++ b/sonic-slave/Dockerfile
@@ -189,7 +189,6 @@ RUN apt-get update && apt-get install -y \
         libjs-sphinxdoc \
         libjs-underscore \
         python-docutils \
-        python-jinja2 \
         python-markupsafe \
         python-pygments \
         python-roman \
@@ -198,7 +197,6 @@ RUN apt-get update && apt-get install -y \
         python3-sphinx \
 # For sonic config engine testing
         python-lxml \
-        python-jinja2 \
         python-netaddr \
         python-ipaddr \
         python-yaml \
@@ -234,16 +232,22 @@ RUN export VERSION=1.8.3 \
  && echo 'export GOROOT=/usr/local/go' >> /etc/bash.bashrc \
  && echo 'export PATH=$PATH:$GOROOT/bin' >> /etc/bash.bashrc
 
+# Upgrade pip2
+# Note: use pip2 specific version so jinja2 2.10 will install
+RUN python2 -m pip install -U pip==9.0.3
+
 # For p4 build
 RUN pip install \
         ctypesgen \
         crc16
 
-# For templating
-RUN pip install j2cli
-
 # For sonic config engine testing
-RUN pip install pyangbind==0.5.10
+RUN pip install pyangbind==0.6.0
+# Note: force upgrade debian packaged jinja2, if installed
+RUN pip install --force-reinstall --upgrade jinja2>=2.10
+
+# For templating (requiring jinja2)
+RUN pip install j2cli
 
 # For sonic utilities testing
 RUN pip install click-default-group click natsort tabulate
diff --git a/src/sonic-config-engine/setup.py b/src/sonic-config-engine/setup.py
index 296b7a03a6b9..215e3163a29d 100755
--- a/src/sonic-config-engine/setup.py
+++ b/src/sonic-config-engine/setup.py
@@ -17,6 +17,6 @@ def get_test_suite():
       url='https://github.com/Azure/sonic-buildimage',
       py_modules=['portconfig', 'minigraph', 'openconfig_acl', 'sonic_platform'],
       scripts=['sonic-cfggen'],
-      install_requires=['lxml', 'jinja2', 'netaddr', 'ipaddr', 'pyyaml', 'pyangbind'],
+      install_requires=['lxml', 'jinja2>=2.10', 'netaddr', 'ipaddr', 'pyyaml', 'pyangbind==0.6.0'],
       test_suite='setup.get_test_suite',
      )