diff --git a/openstack-compute/nodeimage.pkr.hcl b/openstack-compute/nodeimage.pkr.hcl
index 6874a5524ad86cf8713c3d7d2cbbf08f0bf83569..fd7ac1fffc07d4ff921a19642298c201518a64f0 100644
--- a/openstack-compute/nodeimage.pkr.hcl
+++ b/openstack-compute/nodeimage.pkr.hcl
@@ -1,44 +1,42 @@
 locals {
-    local_image_name = "${var.image_name}${var.image_date_suffix ? formatdate("YYYYMMDDHHmm", timestamp()): ""}"
+  local_image_name = "${var.image_name}${var.image_date_suffix ? formatdate("YYYYMMDDHHmm", timestamp()) : ""}"
 }
 
 source "openstack" "image" {
-  skip_create_image = var.skip_create_image
-  image_name        = local.local_image_name
-  source_image      = var.source_image
-  image_members     = var.image_membership
+  skip_create_image         = var.skip_create_image
+  image_name                = local.local_image_name
+  source_image              = var.source_image
+  image_members             = var.image_membership
   image_auto_accept_members = var.auto_accept_members
-  image_tags        = var.image_tags
-  image_disk_format = var.image_format
-  volume_size       = 10
-  flavor            = var.flavor
-  instance_name     = var.build_instance_name
-
-  use_blockstorage_volume = true
-  floating_ip_network = var.floating_ip_network
-  networks = var.networks
-  security_groups = var.security_groups
-
-  ssh_username = var.ssh_username
+  image_tags                = var.image_tags
+  image_disk_format         = var.image_format
+  volume_size               = 10
+  flavor                    = var.flavor
+  instance_name             = var.build_instance_name
+  use_blockstorage_volume   = true
+  floating_ip_network       = var.floating_ip_network
+  networks                  = var.networks
+  security_groups           = var.security_groups
+  ssh_username              = var.ssh_username
 }
 
 build {
   sources = ["source.openstack.image"]
 
   provisioner "ansible" {
-    user = var.ssh_username
-    groups = ["compute"]
+    user          = var.ssh_username
+    groups        = ["compute"]
     playbook_file = "./ansible/compute.yml"
-    roles_path = "./ansible/roles"
+    roles_path    = "./ansible/roles"
     extra_arguments = [
       "--extra-vars", "root_ssh_key='${var.root_ssh_key}'"
     ]
   }
 
   provisioner "ansible" {
-    user = var.ssh_username
-    groups = ["compute"]
+    user             = var.ssh_username
+    groups           = ["compute"]
     ansible_env_vars = ["ANSIBLE_HOST_KEY_CHECKING=False"]
-    playbook_file = "./CRI_XCBC/compute-packer.yaml"
+    playbook_file    = "./CRI_XCBC/compute-packer.yaml"
   }
 }
diff --git a/openstack-compute/variables.pkr.hcl b/openstack-compute/variables.pkr.hcl
index 3d2cb1052ac87cfcdf177b54dd583e62b442af4c..6fb12ce59cfddf186ac06bd336f964f4473f4de2 100644
--- a/openstack-compute/variables.pkr.hcl
+++ b/openstack-compute/variables.pkr.hcl
@@ -1,5 +1,5 @@
 variable "root_ssh_key" {
-  type = string
+  type        = string
   description = "The root key to use for ssh"
 }
 
@@ -40,8 +40,8 @@ variable "auto_accept_members" {
 }
 
 variable "skip_create_image" {
-  type = bool
-  default = false
+  type        = bool
+  default     = false
   description = "A boolean value for skipping image creation at the end of the build"
 }
 
@@ -56,29 +56,29 @@ variable "flavor" {
 }
 
 variable "floating_ip_network" {
-  type = string
+  type        = string
   description = "floating ip network to use with (temporary) ip assignmnet to a vm"
 }
 
 variable "networks" {
-  type = list(string)
+  type        = list(string)
   description = "List of network UUIDs to assign to the network"
 }
 
 variable "security_groups" {
-  type = list(string)
-  default = []
+  type        = list(string)
+  default     = []
   description = "A list of security groups to add - you should make sure ssh access is open to the machine"
 }
 
 variable "build_instance_name" {
-  type = string
-  default = "compute"
+  type        = string
+  default     = "compute"
   description = "A name of build instance used for image build"
 }
 
 variable "ssh_username" {
-  type = string
-  default = "centos"
+  type        = string
+  default     = "centos"
   description = "The default username to use for SSH"
 }
diff --git a/openstack-gpu/nodeimage.pkr.hcl b/openstack-gpu/nodeimage.pkr.hcl
index 20531b285790fcd3ff34ec6008d5cb510e118499..01b9089d791fb386f288cbac33d7257473a4c544 100644
--- a/openstack-gpu/nodeimage.pkr.hcl
+++ b/openstack-gpu/nodeimage.pkr.hcl
@@ -1,45 +1,42 @@
 locals {
-    local_image_name = "${var.image_name}${var.image_date_suffix ? formatdate("YYYYMMDDHHmm", timestamp()): ""}"
+  local_image_name = "${var.image_name}${var.image_date_suffix ? formatdate("YYYYMMDDHHmm", timestamp()) : ""}"
 }
 
 source "openstack" "image" {
-  skip_create_image = var.skip_create_image
-  image_name        = local.local_image_name
-  source_image      = var.source_image
-  image_members     = var.image_membership
+  skip_create_image         = var.skip_create_image
+  image_name                = local.local_image_name
+  source_image              = var.source_image
+  image_members             = var.image_membership
   image_auto_accept_members = var.auto_accept_members
-  image_tags        = var.image_tags
-  image_disk_format = var.image_format
-  volume_size       = 10
-  flavor            = var.flavor
-  instance_name     = var.build_instance_name
-
-  use_blockstorage_volume = true
-  floating_ip_network = var.floating_ip_network
-  networks = var.networks
-  security_groups = var.security_groups
-
-  ssh_username = var.ssh_username
+  image_tags                = var.image_tags
+  image_disk_format         = var.image_format
+  volume_size               = 10
+  flavor                    = var.flavor
+  instance_name             = var.build_instance_name
+  use_blockstorage_volume   = true
+  floating_ip_network       = var.floating_ip_network
+  networks                  = var.networks
+  security_groups           = var.security_groups
+  ssh_username              = var.ssh_username
 }
 
-# regular instance
 build {
   sources = ["source.openstack.image"]
 
   provisioner "ansible" {
-    user = var.ssh_username
-    groups = ["gpu"]
+    user          = var.ssh_username
+    groups        = ["gpu"]
     playbook_file = "./ansible/gpu.yml"
-    roles_path = "./ansible/roles"
+    roles_path    = "./ansible/roles"
     extra_arguments = [
       "--extra-vars", "root_ssh_key='${var.root_ssh_key}'"
     ]
   }
 
   provisioner "ansible" {
-    user = var.ssh_username
-    groups = ["compute"]
+    user             = var.ssh_username
+    groups           = ["compute"]
     ansible_env_vars = ["ANSIBLE_HOST_KEY_CHECKING=False"]
-    playbook_file = "./CRI_XCBC/compute-packer.yaml"
+    playbook_file    = "./CRI_XCBC/compute-packer.yaml"
   }
 }
diff --git a/openstack-gpu/variables.pkr.hcl b/openstack-gpu/variables.pkr.hcl
index b74f79b047d40d5f98a555457acf1e0987c0cf49..4a0a6622390e598516829d5c36719d0e1cfe4739 100644
--- a/openstack-gpu/variables.pkr.hcl
+++ b/openstack-gpu/variables.pkr.hcl
@@ -1,5 +1,5 @@
 variable "root_ssh_key" {
-  type = string
+  type        = string
   description = "The root key to use for ssh"
 }
 
@@ -40,8 +40,8 @@ variable "auto_accept_members" {
 }
 
 variable "skip_create_image" {
-  type = bool
-  default = false
+  type        = bool
+  default     = false
   description = "A boolean value for skipping image creation at the end of the build"
 }
 
@@ -56,29 +56,29 @@ variable "flavor" {
 }
 
 variable "floating_ip_network" {
-  type = string
+  type        = string
   description = "floating ip network to use with (temporary) ip assignmnet to a vm"
 }
 
 variable "networks" {
-  type = list(string)
+  type        = list(string)
   description = "List of network UUIDs to assign to the network"
 }
 
 variable "security_groups" {
-  type = list(string)
-  default = []
+  type        = list(string)
+  default     = []
   description = "A list of security groups to add - you should make sure ssh access is open to the machine"
 }
 
 variable "build_instance_name" {
-  type = string
-  default = "gpu"
+  type        = string
+  default     = "gpu"
   description = "A name of build instance used for image build"
 }
 
 variable "ssh_username" {
-  type = string
-  default = "centos"
+  type        = string
+  default     = "centos"
   description = "The default username to use for SSH"
 }
diff --git a/openstack-ood/nodeimage.pkr.hcl b/openstack-ood/nodeimage.pkr.hcl
index a4b88eb49295e1a82eb55f18b8f52556b3ebf91c..ff961c7d995667ca7ab98baf1a1ea35987e6298c 100644
--- a/openstack-ood/nodeimage.pkr.hcl
+++ b/openstack-ood/nodeimage.pkr.hcl
@@ -1,43 +1,42 @@
 locals {
-    local_image_name = "${var.image_name}${var.image_date_suffix ? formatdate("-YYYYMMDDHHmm", timestamp()): ""}"
+  local_image_name = "${var.image_name}${var.image_date_suffix ? formatdate("-YYYYMMDDHHmm", timestamp()) : ""}"
 }
 
 source "openstack" "image" {
-  skip_create_image = var.skip_create_image
-  image_name        = local.local_image_name
-  source_image      = var.source_image
-  image_members     = var.image_membership
+  skip_create_image         = var.skip_create_image
+  image_name                = local.local_image_name
+  source_image              = var.source_image
+  image_members             = var.image_membership
   image_auto_accept_members = var.auto_accept_members
-  image_tags        = var.image_tags
-  image_disk_format = var.image_format
-  volume_size       = 10
-  flavor            = var.flavor
-  instance_name     = var.build_instance_name
-
-  use_blockstorage_volume = true
-  floating_ip_network = var.floating_ip_network
-  networks = var.networks
-  security_groups = var.security_groups
-
-  ssh_username = var.ssh_username
+  image_tags                = var.image_tags
+  image_disk_format         = var.image_format
+  volume_size               = 10
+  flavor                    = var.flavor
+  instance_name             = var.build_instance_name
+  use_blockstorage_volume   = true
+  floating_ip_network       = var.floating_ip_network
+  networks                  = var.networks
+  security_groups           = var.security_groups
+  ssh_username              = var.ssh_username
 }
 
 build {
   sources = ["source.openstack.image"]
 
   provisioner "ansible" {
-    user = var.ssh_username
-    groups = ["ood"]
+    user          = var.ssh_username
+    groups        = ["ood"]
     playbook_file = "./ansible/ood.yml"
-    roles_path = "./ansible/roles"
+    roles_path    = "./ansible/roles"
     extra_arguments = [
       "--extra-vars", "root_ssh_key='${var.root_ssh_key}'"
     ]
   }
+
   provisioner "ansible" {
-    user = var.ssh_username
-    groups = ["ood", "knightly"]
+    user             = var.ssh_username
+    groups           = ["ood", "knightly"]
     ansible_env_vars = ["ANSIBLE_HOST_KEY_CHECKING=False"]
-    playbook_file = "./CRI_XCBC/ood-packer.yaml"
+    playbook_file    = "./CRI_XCBC/ood-packer.yaml"
   }
 }
diff --git a/openstack-ood/variables.pkr.hcl b/openstack-ood/variables.pkr.hcl
index ddd14de7e661cf1cff5732c62e4ffd4fbf23d4c8..488994d88ba89630fd58c413a3e90b0c4113e4c2 100644
--- a/openstack-ood/variables.pkr.hcl
+++ b/openstack-ood/variables.pkr.hcl
@@ -1,5 +1,5 @@
 variable "root_ssh_key" {
-  type = string
+  type        = string
   description = "The root key to use for ssh"
 }
 
@@ -40,8 +40,8 @@ variable "auto_accept_members" {
 }
 
 variable "skip_create_image" {
-  type = bool
-  default = false
+  type        = bool
+  default     = false
   description = "A boolean value for skipping image creation at the end of the build"
 }
 
@@ -56,29 +56,29 @@ variable "flavor" {
 }
 
 variable "floating_ip_network" {
-  type = string
+  type        = string
   description = "floating ip network to use with (temporary) ip assignmnet to a vm"
 }
 
 variable "networks" {
-  type = list(string)
+  type        = list(string)
   description = "List of network UUIDs to assign to the network"
 }
 
 variable "security_groups" {
-  type = list(string)
-  default = []
+  type        = list(string)
+  default     = []
   description = "A list of security groups to add - you should make sure ssh access is open to the machine"
 }
 
 variable "build_instance_name" {
-  type = string
-  default = "ood"
+  type        = string
+  default     = "ood"
   description = "A name of build instance used for image build"
 }
 
 variable "ssh_username" {
-  type = string
-  default = "centos"
+  type        = string
+  default     = "centos"
   description = "The default username to use for SSH"
 }
diff --git a/openstack/nodeimage.pkr.hcl b/openstack/nodeimage.pkr.hcl
index cd94849a74d9c0a127edb994c347e8154a665641..d8a0f1ee2c093af691a7790eed49c9662eeffe31 100644
--- a/openstack/nodeimage.pkr.hcl
+++ b/openstack/nodeimage.pkr.hcl
@@ -1,44 +1,42 @@
 locals {
-    local_image_name = "${var.image_name}${var.image_date_suffix ? formatdate("-YYYYMMDDHHmm", timestamp()): ""}"
+  local_image_name = "${var.image_name}${var.image_date_suffix ? formatdate("-YYYYMMDDHHmm", timestamp()) : ""}"
 }
 
 source "openstack" "image" {
-  skip_create_image = var.skip_create_image
-  image_name        = local.local_image_name
-  source_image      = var.source_image
-  image_members     = var.image_membership
+  skip_create_image         = var.skip_create_image
+  image_name                = local.local_image_name
+  source_image              = var.source_image
+  image_members             = var.image_membership
   image_auto_accept_members = var.auto_accept_members
-  image_tags        = var.image_tags
-  image_disk_format = var.image_format
-  volume_size       = 10
-  flavor            = var.flavor
-  instance_name     = var.build_instance_name
-
-  use_blockstorage_volume = true
-  floating_ip_network = var.floating_ip_network
-  networks = var.networks
-  security_groups = var.security_groups
-
-  ssh_username = var.ssh_username
+  image_tags                = var.image_tags
+  image_disk_format         = var.image_format
+  volume_size               = 10
+  flavor                    = var.flavor
+  instance_name             = var.build_instance_name
+  use_blockstorage_volume   = true
+  floating_ip_network       = var.floating_ip_network
+  networks                  = var.networks
+  security_groups           = var.security_groups
+  ssh_username              = var.ssh_username
 }
 
 build {
   sources = ["source.openstack.image"]
 
   provisioner "ansible" {
-    user = var.ssh_username
-    groups = ["base"]
+    user          = var.ssh_username
+    groups        = ["base"]
     playbook_file = "./ansible/base.yml"
-    roles_path = "./ansible/roles"
+    roles_path    = "./ansible/roles"
     extra_arguments = [
       "--extra-vars", "root_ssh_key='${var.root_ssh_key}'"
     ]
   }
 
   provisioner "ansible" {
-    user = var.ssh_username
-    groups = ["base"]
+    user             = var.ssh_username
+    groups           = ["base"]
     ansible_env_vars = ["ANSIBLE_HOST_KEY_CHECKING=False"]
-    playbook_file = "./CRI_XCBC/compute-packer.yaml"
+    playbook_file    = "./CRI_XCBC/compute-packer.yaml"
   }
 }
diff --git a/openstack/variables.pkr.hcl b/openstack/variables.pkr.hcl
index 2c17acbe5865d5e01e560b1bfb02aee13d136df7..674af41be0470a8173f34df5945286241635f8b3 100644
--- a/openstack/variables.pkr.hcl
+++ b/openstack/variables.pkr.hcl
@@ -1,5 +1,5 @@
 variable "root_ssh_key" {
-  type = string
+  type        = string
   description = "The root key to use for ssh"
 }
 
@@ -40,8 +40,8 @@ variable "auto_accept_members" {
 }
 
 variable "skip_create_image" {
-  type = bool
-  default = false
+  type        = bool
+  default     = false
   description = "A boolean value for skipping image creation at the end of the build"
 }
 
@@ -56,29 +56,29 @@ variable "flavor" {
 }
 
 variable "floating_ip_network" {
-  type = string
+  type        = string
   description = "floating ip network to use with (temporary) ip assignmnet to a vm"
 }
 
 variable "networks" {
-  type = list(string)
+  type        = list(string)
   description = "List of network UUIDs to assign to the network"
 }
 
 variable "security_groups" {
-  type = list(string)
-  default = []
+  type        = list(string)
+  default     = []
   description = "A list of security groups to add - you should make sure ssh access is open to the machine"
 }
 
 variable "build_instance_name" {
-  type = string
-  default = "base"
+  type        = string
+  default     = "base"
   description = "A name of build instance used for image build"
 }
 
 variable "ssh_username" {
-  type = string
-  default = "centos"
+  type        = string
+  default     = "centos"
   description = "The default username to use for SSH"
 }