diff --git a/playbooks/metal3-ci/run.yaml b/playbooks/metal3-ci/run.yaml
index 66886b26a9..d49ddc6de2 100644
--- a/playbooks/metal3-ci/run.yaml
+++ b/playbooks/metal3-ci/run.yaml
@@ -5,24 +5,22 @@
       set_fact:
         metal3_dev_env_src_dir: '{{ ansible_user_dir }}/metal3-dev-env'
         metal3_environment:
+          ANSIBLE_VERBOSITY: 2
           CONTROL_PLANE_MACHINE_COUNT: 1
           IMAGE_OS: ubuntu
           IMAGE_USERNAME: zuul
           # NOTE(dtantsur): we don't have enough resources to provision even
           # a 2-node cluster, so only provision a control plane node.
           NUM_NODES: 2
+          LIBVIRT_DOMAIN_TYPE: "qemu"
           WORKER_MACHINE_COUNT: 1
 
     # TODO(dtantsur): add metal3-io/metal3-dev-env as a recognized project to
     # https://opendev.org/openstack/project-config/src/commit/e15b9cae77bdc243322cee64b3688a2a43dd193c/zuul/main.yaml#L1416
-    # TODO(dtantsur): replace my fork with the upstream source once all fixes
-    # merge there.
-    # TODO(rpittau): move back to dtantsur or metal3-io after we merge the changes
     - name: Clone metal3-dev-env
       git:
         dest: "{{ metal3_dev_env_src_dir }}"
-        repo: "https://github.com/elfosardo/metal3-dev-env"
-        version: ironic-ci
+        repo: "https://github.com/metal3-io/metal3-dev-env"
 
     - name: Build a metal3 environment
       command: make