diff --git a/docker/Dockerfile.demo_vitis_ai b/docker/Dockerfile.demo_vitis_ai
index c38ccaf0e591..41abddf52634 100644
--- a/docker/Dockerfile.demo_vitis_ai
+++ b/docker/Dockerfile.demo_vitis_ai
@@ -18,6 +18,8 @@
 # Main Vitis AI docker env
 FROM xilinx/vitis-ai:1.4.916
 
+RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6AF7F09730B3F0A4
+
 RUN apt-get update --fix-missing
 
 COPY install/ubuntu_install_core.sh /install/ubuntu_install_core.sh
diff --git a/docker/bash.sh b/docker/bash.sh
index 18c655d2ddc5..483adeb5d330 100755
--- a/docker/bash.sh
+++ b/docker/bash.sh
@@ -418,12 +418,12 @@ if [[ "${DOCKER_IMAGE_NAME}" == *"demo_vitis_ai"* && -d "/dev/shm" && -d "/opt/x
                   )
 
     XCLMGMT_DRIVER="$(find /dev -name xclmgmt\*)"
-    for DRIVER in "${XCLMGMT_DRIVER}"; do
+    for DRIVER in ${XCLMGMT_DRIVER}; do
        DOCKER_DEVICES+=( --device="${DRIVER}" )
     done
 
     RENDER_DRIVER="$(find /dev/dri -name renderD\*)"
-    for DRIVER in "${RENDER_DRIVER}"; do
+    for DRIVER in ${RENDER_DRIVER}; do
         DOCKER_DEVICES+=( --device="${DRIVER}" )
     done
 fi
diff --git a/docker/install/ubuntu_install_python.sh b/docker/install/ubuntu_install_python.sh
index b71398ad5fc8..411984cabd9a 100755
--- a/docker/install/ubuntu_install_python.sh
+++ b/docker/install/ubuntu_install_python.sh
@@ -34,7 +34,7 @@ apt-get install -y python-pip python-dev python3.6 python3.6-dev
 rm -f /usr/bin/python3 && ln -s /usr/bin/python3.6 /usr/bin/python3
 
 # Install pip
-cd /tmp && wget -q https://bootstrap.pypa.io/get-pip.py && python3.6 get-pip.py
+cd /tmp && wget -q https://bootstrap.pypa.io/pip/3.6/get-pip.py && python3.6 get-pip.py
 
 # Pin pip and setuptools versions
 pip3 install pip==19.3.1 setuptools==58.4.0