diff --git a/playbooks/containers-lxc-create.yml b/playbooks/containers-lxc-create.yml
index ab04220334..8b73adaa0a 100644
--- a/playbooks/containers-lxc-create.yml
+++ b/playbooks/containers-lxc-create.yml
@@ -53,16 +53,17 @@
   tags:
     - lxc-containers-create
 
-# TODO(evrardjp): Remove host_need_pip in the future
-# when the process building the repo is done before this step.
-- name: Configure containers default software, but don't run pip yet
+- name: Configure containers default software
   hosts: all_lxc_containers
   gather_facts: true
   user: root
+  pre_tasks:
+    - include: common-tasks/set-upper-constraints.yml
+    - include: common-tasks/set-pip-upstream-url.yml
   roles:
     - role: "openstack_hosts"
-  vars:
-    host_need_pip: False
+  vars_files:
+    - defaults/repo_packages/openstack_services.yml
   environment: "{{ deployment_environment_variables | default({}) }}"
   tags:
     - lxc-containers-create
diff --git a/playbooks/containers-nspawn-create.yml b/playbooks/containers-nspawn-create.yml
index 99b452d0c2..5eff4e59ca 100644
--- a/playbooks/containers-nspawn-create.yml
+++ b/playbooks/containers-nspawn-create.yml
@@ -41,17 +41,18 @@
   tags:
     - nspawn-containers-create
 
-# TODO(evrardjp): Remove host_need_pip in the future
-# when the process building the repo is done before this step.
-- name: Configure containers default software, but don't run pip yet
+- name: Configure containers default software
   hosts: all_nspawn_containers
   gather_facts: true
   user: root
+  pre_tasks:
+    - include: common-tasks/set-upper-constraints.yml
+    - include: common-tasks/set-pip-upstream-url.yml
   roles:
     - role: "openstack_hosts"
       is_container: true
-  vars:
-    host_need_pip: False
+  vars_files:
+    - defaults/repo_packages/openstack_services.yml
   environment: "{{ deployment_environment_variables | default({}) }}"
   tags:
     - nspawn-containers-create