diff --git a/plugins/modules/ndo_dhcp_option_policy.py b/plugins/modules/ndo_dhcp_option_policy.py
index ea9140b6..8f8a1a83 100644
--- a/plugins/modules/ndo_dhcp_option_policy.py
+++ b/plugins/modules/ndo_dhcp_option_policy.py
@@ -87,6 +87,7 @@
         id: 1
         data: data_1
     state: present
+  register: create
 
 - name: Query a dhcp option policy with name
   cisco.mso.ndo_dhcp_option_policy:
@@ -104,7 +105,7 @@
     username: admin
     password: SomeSecretPassword
     template: ansible_tenant_template
-    option_policy_uuid: '{{ query_one.current.uuid }}'
+    option_policy_uuid: '{{ create.current.uuid }}'
     state: query
   register: query_uuid
 
diff --git a/plugins/modules/ndo_dhcp_relay_policy.py b/plugins/modules/ndo_dhcp_relay_policy.py
index 5f027dff..919b8d10 100644
--- a/plugins/modules/ndo_dhcp_relay_policy.py
+++ b/plugins/modules/ndo_dhcp_relay_policy.py
@@ -113,6 +113,7 @@
         epg: ansible_test_epg_1
         ip: 1.1.1.1
     state: present
+  register: create
 
 - name: Query a dhcp relay policy with name
   cisco.mso.ndo_dhcp_relay_policy:
@@ -130,7 +131,7 @@
     username: admin
     password: SomeSecretPassword
     template: ansible_tenant_template
-    relay_policy_uuid: '{{ query_one.current.uuid }}'
+    relay_policy_uuid: '{{ create.current.uuid }}'
     state: query
   register: query_with_uuid
 
diff --git a/plugins/modules/ndo_l3_domain.py b/plugins/modules/ndo_l3_domain.py
index a274a426..3a6566c4 100644
--- a/plugins/modules/ndo_l3_domain.py
+++ b/plugins/modules/ndo_l3_domain.py
@@ -69,6 +69,7 @@
     l3_domain: ansible_test_l3_domain
     pool: ansible_test_vlan_pool
     state: present
+  register: create
 
 - name: Query a L3 domain with name
   cisco.mso.ndo_l3_domain:
@@ -86,7 +87,7 @@
     username: admin
     password: SomeSecretPassword
     template: ansible_tenant_template
-    l3_domain_uuid: '{{ query_one.current.uuid }}'
+    l3_domain_uuid: '{{ create.current.uuid }}'
     state: query
   register: query_with_uuid
 
diff --git a/plugins/modules/ndo_physical_domain.py b/plugins/modules/ndo_physical_domain.py
index 3863cea4..61ab3847 100644
--- a/plugins/modules/ndo_physical_domain.py
+++ b/plugins/modules/ndo_physical_domain.py
@@ -69,6 +69,7 @@
     physical_domain: ansible_test_physical_domain
     pool: ansible_test_vlan_pool
     state: present
+  register: create
 
 - name: Query a physical domain with name
   cisco.mso.ndo_physical_domain:
@@ -86,7 +87,7 @@
     username: admin
     password: SomeSecretPassword
     template: ansible_tenant_template
-    physical_domain_uuid: '{{ query_one.current.uuid }}'
+    physical_domain_uuid: '{{ create.current.uuid }}'
     state: query
   register: query_with_uuid
 
diff --git a/plugins/modules/ndo_route_map_policy_multicast.py b/plugins/modules/ndo_route_map_policy_multicast.py
index 1c7ec0c8..82dcae20 100644
--- a/plugins/modules/ndo_route_map_policy_multicast.py
+++ b/plugins/modules/ndo_route_map_policy_multicast.py
@@ -101,6 +101,7 @@
         rp: 1.1.1.2
         action: permit
     state: present
+  register: create
 
 - name: Query a multicast route map policy with name
   cisco.mso.ndo_route_map_policy_multicast:
@@ -118,7 +119,7 @@
     username: admin
     password: SomeSecretPassword
     template: ansible_tenant_template
-    route_map_policy_uuid: '{{ query_one.current.uuid }}'
+    route_map_policy_uuid: '{{ create.current.uuid }}'
     state: query
   register: query_with_uuid
 
diff --git a/plugins/modules/ndo_synce_interface_policy.py b/plugins/modules/ndo_synce_interface_policy.py
index 9ebaef0f..a91c3e10 100644
--- a/plugins/modules/ndo_synce_interface_policy.py
+++ b/plugins/modules/ndo_synce_interface_policy.py
@@ -97,6 +97,7 @@
     src_priority: 100
     wait_to_restore: 5
     state: present
+  register: create
 
 - name: Query a syncE interface policy with interface_policy name
   cisco.mso.ndo_synce_interface_policy:
@@ -123,7 +124,7 @@
     username: admin
     password: SomeSecretPassword
     template: ansible_fabric_policy_template
-    interface_policy_uuid: '{{ query_one.current.uuid }}'
+    interface_policy_uuid: '{{ create.current.uuid }}'
     state: query
   register: query_one_by_uuid
 
diff --git a/plugins/modules/ndo_vlan_pool.py b/plugins/modules/ndo_vlan_pool.py
index b59be1ae..324a8934 100644
--- a/plugins/modules/ndo_vlan_pool.py
+++ b/plugins/modules/ndo_vlan_pool.py
@@ -87,6 +87,7 @@
       - from_vlan: 300
         to_vlan: 400
     state: present
+  register: create
 
 - name: Query a vlan pool with name
   cisco.mso.ndo_vlan_pool:
@@ -104,7 +105,7 @@
     username: admin
     password: SomeSecretPassword
     template: ansible_tenant_template
-    vlan_pool_uuid: '{{ query_one.current.uuid }}'
+    vlan_pool_uuid: '{{ create.current.uuid }}'
     state: query
   register: query_with_uuid