diff --git a/ansible/test/play-infrastructure/molecule/default/vars.yml b/ansible/test/play-infrastructure/molecule/default/vars.yml
index e91eadb..6ca5a1a 100644
--- a/ansible/test/play-infrastructure/molecule/default/vars.yml
+++ b/ansible/test/play-infrastructure/molecule/default/vars.yml
@@ -16,9 +16,9 @@
 runtime_images:
   busybox:
     registry: "{{ molecule_test_registry }}"
-    path: "/onap/components/busybox"
+    path: "/busybox"
     tag: "latest"
   aaionap-haproxy:
     registry: "{{ molecule_test_registry }}"
-    path: "/onap/components/aaionap/haproxy"
+    path: "/aaionap/haproxy"
     tag: "1.2.4"
diff --git a/ansible/test/roles/prepare-nexus/tasks/main.yml b/ansible/test/roles/prepare-nexus/tasks/main.yml
index 4ef40f5..5eb1b7d 100644
--- a/ansible/test/roles/prepare-nexus/tasks/main.yml
+++ b/ansible/test/roles/prepare-nexus/tasks/main.yml
@@ -29,12 +29,12 @@
   docker_image:
     name: busybox
     tag: latest
-    repository: nexus3.onap.org:10001/onap/components/busybox
+    repository: nexus3.onap.org:10001/busybox
 
 - name: Save busybox image
   delegate_to: localhost
   docker_image:
-    name: nexus3.onap.org:10001/onap/components/busybox
+    name: nexus3.onap.org:10001/busybox
     tag: latest
     pull: false
     archive_path: /tmp/busybox.tar
@@ -44,12 +44,12 @@
   docker_image:
     name: aaionap/haproxy
     tag: 1.2.4
-    repository: nexus3.onap.org:10001/onap/components/aaionap/haproxy
+    repository: nexus3.onap.org:10001/aaionap/haproxy
 
 - name: Save haproxy image
   delegate_to: localhost
   docker_image:
-    name: nexus3.onap.org:10001/onap/components/aaionap/haproxy
+    name: nexus3.onap.org:10001/aaionap/haproxy
     tag: 1.2.4
     pull: false
     archive_path: /tmp/haproxy.tar