diff --git a/src/defines.mk b/src/defines.mk
index 36cc072..1be77ca 100644
--- a/src/defines.mk
+++ b/src/defines.mk
@@ -37,7 +37,7 @@ endef
 
 define OPACK_INSTALL_CLOUD_CONTENT =
 Choose your keyboard layout = fr
-System hostname = $(OPACK_SYS_HOSTNAME)-$(OPACK_TARGET)
+System hostname = $(OPACK_SYS_HOSTNAME)
 Which network interface = vio0
 IPv4 address for vio0 = dhcp
 IPv6 address for vio0 = none
@@ -91,10 +91,10 @@ endef
 
 define OPACK_TERRAFORM_CONTENT =
 
-variable "credentials"		{ default = "../$(OPACK_GCE_JSON_KEY)" } 
-variable "project"		{ default = "$(OPACK_GCE_PROJECT)" } 
-variable "region"		{ default = "europe-west4" }
-variable "zone"			{ default = "europe-west4-b" }
+variable "credentials"		{ default = "../$(OPACK_GCE_JSON_KEY)" }
+variable "project"		{ default = "$(OPACK_GCE_PROJECT)" }
+variable "region"		{ default = "$(OPACK_GCE_REGION)" }
+variable "zone"			{ default = "$(OPACK_GCE_ZONE)" }
 
 provider "google" {
   region      = "$${var.region}"
@@ -125,7 +125,7 @@ resource "google_compute_instance" "$(OPACK_TARGET)" {
     zone = "$${var.gce_zone}"
     boot_disk {
       initialize_params {
-        image = "openbsd" 
+        image = "openbsd"
       }
     }
     network_interface {
diff --git a/src/options.mk b/src/options.mk
index e3a3fa0..e64c327 100644
--- a/src/options.mk
+++ b/src/options.mk
@@ -129,7 +129,13 @@ OPACK_GCE_JSON_KEY?=
 # OPACK_GCE_BUCKET: The Google Cloud Storage bucket name, typically associated with the project, for the image import.
 OPACK_GCE_BUCKET?=$(OPACK_GCE_PROJECT)
 
-# Define the machine type for the VM 
+# OPACK_GCE_REGION: The Google Cloud Compute Engine region.
+OPACK_GCE_REGION?=europe-west4
+
+# OPACK_GCE_REGION: The Google Cloud Compute Engine zone.
+OPACK_GCE_REGION?=europe-west4-b
+
+# Define the machine type for the VM
 OPACK_GCE_MACHINE?=e2-micro
 
 # The SSH key to use to connect to the cloud VM
@@ -142,7 +148,7 @@ OPACK_TERRAFORM_DIR?=opack_deploy_$(OPACK_SHORT_REV)
 # Terraform module dir
 OPACK_TERRAFORM_MODULE_DIR?=$(OPACK_TERRAFORM_DIR)/opack-module
 
-ifdef OPACK_DEBUG
+ifndef OPACK_DEBUG
 $(info ░ BOX        $(OPACK_BOX_FILE))
 $(info ▒ HOSTNAME   $(OPACK_SYS_HOSTNAME)-$(OPACK_TARGET))
 $(info ░ USER       $(OPACK_SYS_USER))