diff --git a/ansible/group_vars/all/venv b/ansible/group_vars/all/venv
index c729e5e..0cd02e6 100644
--- a/ansible/group_vars/all/venv
+++ b/ansible/group_vars/all/venv
@@ -1,3 +1,3 @@
 ---
 # Path to create virtualenv in which to install python dependencies.
-openstack_venv: "{{ ansible_env.PWD }}/openstack-config-venv"
+openstack_venv: "{{ ansible_facts['env'].PWD }}/openstack-config-venv"
diff --git a/ansible/openstack-images.yml b/ansible/openstack-images.yml
index 8fafc3c..07d2724 100644
--- a/ansible/openstack-images.yml
+++ b/ansible/openstack-images.yml
@@ -6,7 +6,7 @@
   roles:
     - role: stackhpc.openstack.os_images
       os_images_venv: "{{ openstack_venv }}"
-      os_images_cache: "{{ ansible_env.PWD }}/openstack-config-image-cache"
+      os_images_cache: "{{ ansible_facts['env'].PWD }}/openstack-config-image-cache"
       os_images_auth_type: "{{ openstack_auth_type }}"
       os_images_auth: "{{ openstack_auth }}"
       os_images_cacert: "{{ openstack_cacert }}"