diff --git a/openstack-compute/variables.pkr.hcl b/openstack-compute/variables.pkr.hcl
index 09827195aba2322d506e5a2b57e1f16092e4738b..3d2cb1052ac87cfcdf177b54dd583e62b442af4c 100644
--- a/openstack-compute/variables.pkr.hcl
+++ b/openstack-compute/variables.pkr.hcl
@@ -9,6 +9,12 @@ variable "image_name" {
   description = "Name of the image in openstack"
 }
 
+variable "image_format" {
+  type        = string
+  default     = "qcow2"
+  description = "The format of the resulting image"
+}
+
 variable "image_date_suffix" {
   type        = bool
   default     = false
diff --git a/openstack-gpu/variables.pkr.hcl b/openstack-gpu/variables.pkr.hcl
index 322fb9d56469aee86ae656d3bd82b9b2a081be68..b74f79b047d40d5f98a555457acf1e0987c0cf49 100644
--- a/openstack-gpu/variables.pkr.hcl
+++ b/openstack-gpu/variables.pkr.hcl
@@ -5,16 +5,46 @@ variable "root_ssh_key" {
 
 variable "image_name" {
   type        = string
-  default     = "cluster-image-gpu"
+  default     = "cluster-image"
   description = "Name of the image in openstack"
 }
 
+variable "image_format" {
+  type        = string
+  default     = "qcow2"
+  description = "The format of the resulting image"
+}
+
 variable "image_date_suffix" {
   type        = bool
   default     = false
   description = "Append a date to the image name (in YYYYMMDDHHMMSS format)"
 }
 
+variable "image_tags" {
+  type        = list(string)
+  default     = []
+  description = "List of tags to be associated to the resulting image"
+}
+
+variable "image_membership" {
+  type        = list(string)
+  default     = []
+  description = "Projects/tenants to share the image in openstack with"
+}
+
+variable "auto_accept_members" {
+  type        = bool
+  default     = false
+  description = "A boolean value for auto accepting image in the projects/tenants defined in image_membership."
+}
+
+variable "skip_create_image" {
+  type = bool
+  default = false
+  description = "A boolean value for skipping image creation at the end of the build"
+}
+
 variable "source_image" {
   type        = string
   description = "The name of the source image to use"
@@ -25,12 +55,6 @@ variable "flavor" {
   description = "The name of the flavor to use"
 }
 
-variable "ssh_username" {
-  type = string
-  default = "centos"
-  description = "The default username to use for SSH"
-}
-
 variable "floating_ip_network" {
   type = string
   description = "floating ip network to use with (temporary) ip assignmnet to a vm"
@@ -46,3 +70,15 @@ variable "security_groups" {
   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"
+  description = "A name of build instance used for image build"
+}
+
+variable "ssh_username" {
+  type = string
+  default = "centos"
+  description = "The default username to use for SSH"
+}
diff --git a/openstack/variables.pkr.hcl b/openstack/variables.pkr.hcl
index aa810592db45127232fb61d07a9df8a63359658f..2c17acbe5865d5e01e560b1bfb02aee13d136df7 100644
--- a/openstack/variables.pkr.hcl
+++ b/openstack/variables.pkr.hcl
@@ -9,6 +9,12 @@ variable "image_name" {
   description = "Name of the image in openstack"
 }
 
+variable "image_format" {
+  type        = string
+  default     = "qcow2"
+  description = "The format of the resulting image"
+}
+
 variable "image_date_suffix" {
   type        = bool
   default     = false