diff --git a/plugins/module_utils/v2v_wrapper.py b/plugins/module_utils/v2v_wrapper.py
index 05b51d45..36cbc02a 100644
--- a/plugins/module_utils/v2v_wrapper.py
+++ b/plugins/module_utils/v2v_wrapper.py
@@ -17,8 +17,8 @@ def build_command(self):
             "-ip",
             "/tmp/passwd",
             "-ic",
-            "esx://{}@{}/Datacenter/{}?no_verify=1".format(
-                self.params["vcenter_username"],
+            "vpx://{}@{}/Datacenter/{}?no_verify=1".format(
+                self.params["vcenter_username"].replace("@", "%40"),
                 self.params["vcenter_hostname"],
                 self.params["esxi_hostname"],
             ),
diff --git a/roles/import_workloads/tasks/virt_v2v.yml b/roles/import_workloads/tasks/virt_v2v.yml
index 2092bd2a..579c3f7d 100644
--- a/roles/import_workloads/tasks/virt_v2v.yml
+++ b/roles/import_workloads/tasks/virt_v2v.yml
@@ -2,7 +2,7 @@
 - name: Find vddk-libdir
   ansible.builtin.shell: >
     set -o pipefail
-    find / -name vmware-vix-disklib 2>/dev/null | xargs dirname
+    find / -path /usr/share/doc -prune -o -name vmware-vix-disklib -print 2>/dev/null | xargs -r dirname | sort -u
   args:
     executable: /bin/bash
   changed_when: false
@@ -25,7 +25,7 @@
     vcenter_username: "{{ vcenter_username }}"
     vcenter_hostname: "{{ vcenter_hostname }}"
     esxi_hostname: "{{ esxi_hostname }}"
-    vddk_libdir: "{{ vddk_libdir }}"
+    vddk_libdir: "{{ vddk_libdir.stdout }}"
     vddk_thumbprint: "{{ vddk_thumbprint }}"
     conversion_host_id: "{{ conversion_host_id }}"
     vm_name: "{{ vm_name }}"
diff --git a/tests/conftest.py b/tests/conftest.py
index 158973c2..da7b45a2 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -12,7 +12,11 @@ def build_command(self):
             "-ip",
             "/tmp/passwd",
             "-ic",
-            f"esx://{self.params['vcenter_username']}@{self.params['vcenter_hostname']}/Datacenter/{self.params['esxi_hostname']}?no_verify=1",
+            (
+                f"vpx://{self.params['vcenter_username'].replace('@', '%40')}"
+                f"@{self.params['vcenter_hostname']}/Datacenter/"
+                f"{self.params['esxi_hostname']}?no_verify=1"
+            ),
             "-it",
             "vddk",
             "-io",
diff --git a/tests/test_v2v_wrapper.py b/tests/test_v2v_wrapper.py
index 47f6d24d..620e2e19 100644
--- a/tests/test_v2v_wrapper.py
+++ b/tests/test_v2v_wrapper.py
@@ -15,7 +15,7 @@ def test_build_command(self, virt_v2v_instance):
             "-ip",
             "/tmp/passwd",
             "-ic",
-            f"esx://{vcenter_username}@{vcenter_hostname}/Datacenter/{esxi_hostname}?no_verify=1",
+            f"vpx://{vcenter_username.replace('@', '%40')}@{vcenter_hostname}/Datacenter/{esxi_hostname}?no_verify=1",
             "-it",
             "vddk",
             "-io",