diff --git a/roles/data/tasks/main.yml b/roles/data/tasks/main.yml
index c37c1ff..966f1f2 100644
--- a/roles/data/tasks/main.yml
+++ b/roles/data/tasks/main.yml
@@ -12,5 +12,8 @@
   set_fact:
     mdd_data: "{{ mdd_combine_output.mdd_data | default({}) }}"
 
-- include_tasks: netbox.yml 
+- block:
+  - include_role: 
+      name: ciscops.mdd.netbox
+  - include_tasks: netbox.yml
   when: netbox_api is defined or lookup('env', 'NETBOX_API', default=false)
diff --git a/roles/data/tasks/netbox.yml b/roles/data/tasks/netbox.yml
index 9f3ec35..22c31f5 100644
--- a/roles/data/tasks/netbox.yml
+++ b/roles/data/tasks/netbox.yml
@@ -2,4 +2,4 @@
   set_fact:
     mdd_data: "{{ mdd_data | default({}) | ciscops.mdd.mdd_combine(oc_data, recursive=True) }}"
   vars:
-    oc_data: "{{ query('ciscops.mdd.netbox_oc', inventory_hostname) }}"
\ No newline at end of file
+    oc_data: "{{ query('ciscops.mdd.netbox_oc', inventory_hostname, validate_certs=netbox_validate_certs) }}"