diff --git a/playbooks/device_details.yml b/playbooks/device_details.yml
index ae4d017ffd..4a26326e17 100644
--- a/playbooks/device_details.yml
+++ b/playbooks/device_details.yml
@@ -48,7 +48,7 @@ device_details:
     device_number: "AB2425L8M7"
     device_name: "Cat9k-1"
     device_state: "Unclaimed"
-    device_id: "C9300-25UX"
+    device_id: "C9300-48UXM"
   - site_name: "Global/Chennai/Trill"
     image_name: "cat9k_iosxe.17.04.01.SPA.bin"
     proj_name: "Onboarding Configuration"
@@ -57,7 +57,7 @@ device_details:
     device_number: "CD2425L8M7"
     device_name: "Cat9k-2"
     device_state: "Unclaimed"
-    device_id: "C9300-25UX"
+    device_id: "C9300-48UXM"
   - site_name: "Global/Chennai/Trill"
     image_name: "cat9k_iosxe.17.04.01.SPA.bin"
     proj_name: "Onboarding Configuration"
@@ -66,4 +66,4 @@ device_details:
     device_number: "EF2425L8M7"
     device_name: "Cat9k-3"
     device_state: "Unclaimed"
-    device_id: "C9300-25UX"
+    device_id: "C9300-48UXM"
diff --git a/playbooks/template_pnp_intent.yml b/playbooks/template_pnp_intent.yml
index fdeaf3356b..c559628276 100644
--- a/playbooks/template_pnp_intent.yml
+++ b/playbooks/template_pnp_intent.yml
@@ -1,6 +1,6 @@
-- hosts: dnac_servers
+- hosts: localhost
   vars_files:
-    - credentials_245.yml
+    - "{{ CLUSTERFILE }}"
     - device_details.yml
   gather_facts: false
   connection: local
@@ -8,7 +8,7 @@
 #
 # Project Info  Section
 #
-    - name: Test project template      
+    - name: Test project template
       cisco.dnac.template_intent:
         dnac_host: "{{ dnac_host }}"
         dnac_port: "{{ dnac_port }}"
@@ -22,14 +22,14 @@
         config:
         - configuration_templates:
             project_name: "{{ item.proj_name }}"
+            template_name: "{{ item.temp_name }}"
             template_content: "{{ item.device_config }}"
+            version_description: "{{ item.description }}"
             language: "{{ item.language }}"
-            device_types:
-            - product_family: "{{ item.family }}"
             software_type: "{{ item.type }}"
             software_variant: "{{ item.variant }}"
-            template_name: "{{ item.temp_name }}"
-            version_description: "{{ item.description }}"
+            device_types:
+            - product_family: "{{ item.family }}"
       register: template_result
       with_items: '{{ template_details }}'
       tags:
@@ -50,12 +50,11 @@
           project_name: "{{ item.proj_name }}"
           template_name: "{{ item.temp_name }}"
           image_name: "{{ item.image_name }}"
-          device_version: "{{ item.device_version }}"
-          deviceInfo:
-            serialNumber: "{{ item.device_number }}"
-            hostname: "{{ item.device_name}}"
-            state: "{{ item.device_state }}"
-            pid: "{{ item.device_id }}"
+          device_info:
+            - serial_number: "{{ item.device_number }}"
+              hostname: "{{ item.device_name}}"
+              state: "{{ item.device_state }}"
+              pid: "{{ item.device_id }}"
       register: pnp_result
       with_items: '{{ device_details }}'
       tags: