diff --git a/openstack-gpu/nodeimage.pkr.hcl b/openstack-gpu/nodeimage.pkr.hcl
index 79bc5cccc2056e16a5f5a2f9a04167d1829b4d56..02720c2d434a2c6a70a79deae9fb37716869c171 100644
--- a/openstack-gpu/nodeimage.pkr.hcl
+++ b/openstack-gpu/nodeimage.pkr.hcl
@@ -19,7 +19,8 @@ build {
   sources = ["source.openstack.image"]
 
   provisioner "ansible" {
-    playbook_file = "./ansible/node-gpu.yml"
+    groups = ["gpu"]
+    playbook_file = "./ansible/gpu.yml"
     roles_path = "./ansible/roles"
     extra_arguments = [
       "--extra-vars", "root_ssh_key='${var.root_ssh_key}'"
diff --git a/openstack-ood/nodeimage.pkr.hcl b/openstack-ood/nodeimage.pkr.hcl
index 2f3b2952d96da4b9275a1070f6ef94c1dc0dfa41..6f637593e1b66e948e92c10cc1e3bb6fbf92eabd 100644
--- a/openstack-ood/nodeimage.pkr.hcl
+++ b/openstack-ood/nodeimage.pkr.hcl
@@ -24,7 +24,8 @@ build {
 
   provisioner "ansible" {
     user = var.ssh_username
-    playbook_file = "./ansible/node.yml"
+    groups = ["ood"]
+    playbook_file = "./ansible/ood.yml"
     roles_path = "./ansible/roles"
     extra_arguments = [
       "--extra-vars", "root_ssh_key='${var.root_ssh_key}'"
diff --git a/openstack/nodeimage.pkr.hcl b/openstack/nodeimage.pkr.hcl
index 6e74b5c1bffa5603d7b4fcae50e7017e03dc033d..509ae3cde0684fd1a02a913ae760d8ae737c419e 100644
--- a/openstack/nodeimage.pkr.hcl
+++ b/openstack/nodeimage.pkr.hcl
@@ -24,7 +24,8 @@ build {
 
   provisioner "ansible" {
     user = var.ssh_username
-    playbook_file = "./ansible/node.yml"
+    groups = ["base"]
+    playbook_file = "./ansible/base.yml"
     roles_path = "./ansible/roles"
     extra_arguments = [
       "--extra-vars", "root_ssh_key='${var.root_ssh_key}'"