diff --git a/role-rocky-netbox.yml b/role-rocky-netbox.yml
index 26ef241..ff3a8b4 100644
--- a/role-rocky-netbox.yml
+++ b/role-rocky-netbox.yml
@@ -10,7 +10,7 @@
     - vars/vaults/netbox.yml
     - vars/netbox.yml
 
-  # This is to try to avoid the handler issue in pre/post tasks                                                              
+  # This is to try to avoid the handler issue in pre/post tasks
   handlers:
     - import_tasks: handlers/main.yml
 
@@ -25,7 +25,7 @@
         that:
           - "not no_ansible.stat.exists"
         success_msg: "We are able to run on this node"
-        fail_msg: "/etc/no-ansible exists - skipping run on this node"                                                       
+        fail_msg: "/etc/no-ansible exists - skipping run on this node"
 
   #tasks:
     #- include_tasks: tasks/efs_mount.yml
diff --git a/role-rocky-rabbitmq.yml b/role-rocky-rabbitmq-mbs.yml
similarity index 94%
rename from role-rocky-rabbitmq.yml
rename to role-rocky-rabbitmq-mbs.yml
index 78320c9..0d0736d 100644
--- a/role-rocky-rabbitmq.yml
+++ b/role-rocky-rabbitmq-mbs.yml
@@ -1,14 +1,14 @@
 ---
 # Stands up a RabbitMQ Cluster
 - name: Configure RabbitMQ
-  hosts: rabbitmq
+  hosts: rabbitmq_mbs
   become: true
   vars_files:
     # vars/vaults/encpass.yml
     - vars/common.yml
-    - vars/rabbitmq.yml
-    - vars/rabbitmq_vhost.yml
-    - vars/rabbitmq_users.yml
+    - vars/rabbitmq/mbs/rabbitmq.yml
+    - vars/rabbitmq/mbs/rabbitmq_vhost.yml
+    - vars/rabbitmq/mbs/rabbitmq_users.yml
 
   # This is to try to avoid the handler issue in pre/post tasks
   handlers:
diff --git a/tasks/netbox/install.yml b/tasks/netbox/install.yml
index c8e6c8a..1517008 100644
--- a/tasks/netbox/install.yml
+++ b/tasks/netbox/install.yml
@@ -1,5 +1,7 @@
 ---
 - name: Download netbox
   ansible.builtin.get_url:
-    url:
+    url: "https://github.com/netbox-community/netbox/archive/refs/tags/v{{ netbox_version }}.tar.gz"
+    dest: "/tmp/netbox-{{ netbox_version }}"
+    checksum: "{{ netbox_checksum }}"
 ...
diff --git a/vars/netbox.yml b/vars/netbox.yml
index f43a70b..bff6350 100644
--- a/vars/netbox.yml
+++ b/vars/netbox.yml
@@ -1,6 +1,6 @@
 ---
 netbox_version: "3.7.4"
-netbox_checksum: ""
+netbox_checksum: "f0c2026b81ab9785f3530eb3c59a922517630976c2af1f95eea02f8bfb9613fd"
 netbox_server_name: "netbox.rockylinux.org"
 netbox_admin_name: "Infrastructure Team"
 netbox_admin_content: "infrastructure@rockylinux.org"
diff --git a/vars/rabbitmq.yml b/vars/rabbitmq/mbs/rabbitmq.yml
similarity index 100%
rename from vars/rabbitmq.yml
rename to vars/rabbitmq/mbs/rabbitmq.yml
diff --git a/vars/rabbitmq_topics.yml b/vars/rabbitmq/mbs/rabbitmq_topics.yml
similarity index 100%
rename from vars/rabbitmq_topics.yml
rename to vars/rabbitmq/mbs/rabbitmq_topics.yml
diff --git a/vars/rabbitmq_users.yml b/vars/rabbitmq/mbs/rabbitmq_users.yml
similarity index 100%
rename from vars/rabbitmq_users.yml
rename to vars/rabbitmq/mbs/rabbitmq_users.yml
diff --git a/vars/rabbitmq_vhost.yml b/vars/rabbitmq/mbs/rabbitmq_vhost.yml
similarity index 100%
rename from vars/rabbitmq_vhost.yml
rename to vars/rabbitmq/mbs/rabbitmq_vhost.yml