diff --git a/create-image.sh b/create-image.sh
index abe0c23..d6e35da 100755
--- a/create-image.sh
+++ b/create-image.sh
@@ -74,6 +74,7 @@ if [ ! -d tripleo-image-elements ]; then
   sed -i 's/virtualenv --setuptools/python3 -m venv/' tripleo-image-elements/elements/os-apply-config/install.d/os-apply-config-source-install/10-os-apply-config
   sed -i 's/virtualenv --setuptools/python3 -m venv/' tripleo-image-elements/elements/os-collect-config/install.d/os-collect-config-source-install/10-os-collect-config
   sed -i 's/virtualenv --setuptools/python3 -m venv/' tripleo-image-elements/elements/os-refresh-config/install.d/os-refresh-config-source-install/10-os-refresh-config
+  sed -i '10i $OS_COLLECT_CONFIG_VENV_DIR/bin/pip install --upgrade pip' tripleo-image-elements/elements/os-collect-config/install.d/os-collect-config-source-install/10-os-collect-config
 fi
 if [ ! -d heat-agents ]; then
   git clone https://git.openstack.org/openstack/heat-agents.git
diff --git a/elements/chameleon-common/install.d/03-pip-installs b/elements/chameleon-common/install.d/03-pip-installs
index b345965..3755167 100755
--- a/elements/chameleon-common/install.d/03-pip-installs
+++ b/elements/chameleon-common/install.d/03-pip-installs
@@ -6,6 +6,8 @@ fi
 set -eu
 set -o pipefail
 
+pip3 install --upgrade pip
+
 pip3 install \
   python-cinderclient \
   python-glanceclient \
@@ -18,5 +20,5 @@ pip3 install \
   python-swiftclient \
   gnocchiclient \
   ansible \
-  libvirt-python
- 
+  libvirt-python \
+  --ignore-installed PyYAML