diff --git a/xos/openstack_observer/steps/sync_controller_images.py b/xos/openstack_observer/steps/sync_controller_images.py
index 843bfb6..551d9ac 100644
--- a/xos/openstack_observer/steps/sync_controller_images.py
+++ b/xos/openstack_observer/steps/sync_controller_images.py
@@ -38,7 +38,7 @@
 	return image_fields
 
     def map_sync_outputs(self, controller_image, res):
-        image_id = res[1]['id']
+        image_id = res[0]['id']
         controller_image.glance_image_id = image_id
 	controller_image.backend_status = '1 - OK'
         controller_image.save()
diff --git a/xos/openstack_observer/steps/sync_controller_images.yaml b/xos/openstack_observer/steps/sync_controller_images.yaml
index 195e5e7..96336d6 100644
--- a/xos/openstack_observer/steps/sync_controller_images.yaml
+++ b/xos/openstack_observer/steps/sync_controller_images.yaml
@@ -2,12 +2,11 @@
 - hosts: 127.0.0.1
   connection: local
   tasks:
-  - shell: ENDPOINT={{endpoint_v3}} USERNAME={{admin_user}} PASSWORD={{admin_password}} TENANT=admin DOMAIN={{domain}} /opt/xos/openstack/get_token.sh
-    register: token
-
   - glance_image:
         auth_url={{ endpoint }}
-        token={{ '{{' }} token.stdout {{ '}}' }}
+        login_username: {{ admin_user }}
+        login_tenant_name: 'admin'
+        login_password: {{ admin_password }}
         name="{{ name }}"
         file="{{ filepath }}"
         disk_format='raw'
diff --git a/xos/openstack_observer/steps/sync_controller_networks.py b/xos/openstack_observer/steps/sync_controller_networks.py
index 5b46bff..1e7805f 100644
--- a/xos/openstack_observer/steps/sync_controller_networks.py
+++ b/xos/openstack_observer/steps/sync_controller_networks.py
@@ -56,8 +56,8 @@
         return network_fields
 
     def map_sync_outputs(self, controller_network,res):
-        network_id = res[1]['id']
-        subnet_id = res[2]['id']
+        network_id = res[0]['id']
+        subnet_id = res[1]['id']
         controller_network.net_id = network_id
         controller_network.subnet = self.cidr
         controller_network.subnet_id = subnet_id
diff --git a/xos/openstack_observer/steps/sync_controller_networks.yaml b/xos/openstack_observer/steps/sync_controller_networks.yaml
index 5d2a6eb..bbf8ec2 100644
--- a/xos/openstack_observer/steps/sync_controller_networks.yaml
+++ b/xos/openstack_observer/steps/sync_controller_networks.yaml
@@ -2,12 +2,11 @@
 - hosts: 127.0.0.1
   connection: local
   tasks:
-  - shell: ENDPOINT={{endpoint_v3}} USERNAME={{admin_user}} PASSWORD={{admin_password}} TENANT={{tenant_name}} DOMAIN={{domain}} /opt/xos/openstack/get_token.sh
-    register: token
-
   - quantum_network:
         auth_url={{ endpoint }}
-        token={{ '{{' }} token.stdout {{ '}}' }}
+        login_username={{ admin_user }}
+        login_tenant_name={{ tenant_name }}
+        login_password={{ admin_password }}
         tenant_name={{ tenant_name }}
         name={{ name }}
         {% if delete %}
@@ -19,7 +18,9 @@
   {% if not delete %}
   - quantum_subnet:
         auth_url={{ endpoint }}
-        token={{ '{{' }} token.stdout {{ '}}' }}
+        login_username={{ admin_user }}
+        login_tenant_name={{ tenant_name }}
+        login_password={{ admin_password }}
         tenant_name={{ tenant_name }}
         name={{ subnet_name }}
         network_name={{ name }}
diff --git a/xos/openstack_observer/steps/sync_instances.yaml b/xos/openstack_observer/steps/sync_instances.yaml
index 4b20c9e..803a294 100644
--- a/xos/openstack_observer/steps/sync_instances.yaml
+++ b/xos/openstack_observer/steps/sync_instances.yaml
@@ -2,12 +2,11 @@
 - hosts: 127.0.0.1
   connection: local
   tasks:
-  - shell: ENDPOINT={{endpoint_v3}} USERNAME={{admin_user}} PASSWORD={{admin_password}} TENANT=admin DOMAIN={{domain}} /opt/xos/openstack/get_token.sh
-    register: token
-
   - nova_compute:
       auth_url: {{ endpoint }}
-      token: {{ '{{' }} token.stdout {{ '}}' }}
+      login_username: {{ admin_user }}
+      login_password: {{ admin_password }}
+      login_tenant_name: {{ admin_tenant }}
       name: {{ name }}
       {% if delete -%}
       state: absent