diff --git a/proxmox/terraform/modules/node/main.tf b/proxmox/terraform/modules/node/main.tf
index 05b2e4d..f6f8170 100644
--- a/proxmox/terraform/modules/node/main.tf
+++ b/proxmox/terraform/modules/node/main.tf
@@ -1,98 +1,101 @@
 resource "proxmox_vm_qemu" "node" {
   name = var.hostname
   desc = var.description
   vmid = var.vmid
 
   balloon = var.balloon
   full_clone = false
   # hypervisor onto which make the vm
   target_node = var.hypervisor
 
   # See init-template.md to see the template vm bootstrap
   clone = var.template
 
   boot = "c"
 
   # linux kernel 2.6
   qemu_os = "l26"
 
   # generic setup
   sockets = var.sockets
   cores   = var.cores
   numa    = var.numa
   memory  = var.memory
 
   # boot machine when hypervirsor starts
   onboot = true
 
   #### cloud-init setup
   os_type = "cloud-init"
 
   # ciuser - User name to change to use when connecting
   ciuser   = var.config["user_admin"]
   ssh_user = var.config["user_admin"]
 
   # sshkeys - public ssh key to use when connecting
   sshkeys = var.config["user_admin_ssh_public_key"]
 
   # searchdomain - Sets DNS search domains for a container.
   searchdomain = var.config["domain"]
 
   # nameserver - Sets DNS server IP address for a container.
   nameserver = var.config["dns"]
 
   # ipconfig0 - [gw =] [,ip=<IPv4Format/CIDR>]
   ipconfig0 = "ip=${var.networks[0]["ip"]}/24,gw=${var.networks[0]["gateway"]}"
 
   # Mostly, var.networks holds only one network declaration except for gateways
   # Try to lookup such value, if it fails (or is undefined), then ipconfig1
   # will be empty, thus no secondary ip config
   ipconfig1 = try(lookup(var.networks[1], "ip"), "") != "" ? "ip=${var.networks[1]["ip"]}/24" : ""
 
   ####
   dynamic disk {
     for_each = var.storages
 
     content {
       id           = disk.value["id"]
       storage      = disk.value["storage"]
       size         = disk.value["size"]
       type         = "virtio"
       # storage_type: https://pve.proxmox.com/wiki/Storage
       storage_type = lookup(disk.value, "storage_type", "cephfs")
     }
   }
 
   dynamic network {
     for_each = var.networks
 
     content {
       id      = lookup(network.value, "id", 0)
       macaddr = lookup(network.value, "macaddr", "")
       bridge  = lookup(network.value, "bridge", "vmbr443")
       model   = "virtio"
     }
   }
 
   #### provisioning: (creation time only) connect through ssh
   # Let puppet do its install
   provisioner "remote-exec" {
-    inline = [
-      "sed -i 's/127.0.1.1/${lookup(var.networks[0], "ip")}/g' /etc/hosts",
-      "puppet agent --server ${var.config["puppet_master"]} --environment=${var.config["puppet_environment"]} --waitforcert 60 --test || echo 'Node provisionned!'",
-    ]
+    inline = concat(
+      var.pre_provision_steps,
+      [
+        "sed -i 's/127.0.1.1/${lookup(var.networks[0], "ip")}/g' /etc/hosts",
+        "puppet agent --server ${var.config["puppet_master"]} --environment=${var.config["puppet_environment"]} --waitforcert 60 --test || echo 'Node provisionned!'",
+      ]
+    )
     connection {
       type = "ssh"
       user = "root"
       host = lookup(var.networks[0], "ip")
     }
   }
 
   lifecycle {
     ignore_changes = [
       bootdisk,
         scsihw,
         target_node
     ]
   }
 }
diff --git a/proxmox/terraform/modules/node/variables.tf b/proxmox/terraform/modules/node/variables.tf
index 3a2f926..d741aed 100644
--- a/proxmox/terraform/modules/node/variables.tf
+++ b/proxmox/terraform/modules/node/variables.tf
@@ -1,89 +1,96 @@
 variable "hostname" {
   description = "Node's hostname"
   type        = string
 }
 
 variable "description" {
   description = "Node's description"
   type        = string
 }
 
 variable "hypervisor" {
   description = "Hypervisor to install the vm to (choice: orsay, hypervisor3, beaubourg, branly)"
   type        = string
 }
 
 variable "template" {
   description = "Template to use (template-debian-9, template-debian-10)"
   type        = string
   default     = "template-debian-10"
 }
 
 variable "sockets" {
   description = "Number of sockets"
   type        = string
   default     = "1"
 }
 
 variable "cores" {
   description = "Number of cores"
   type        = string
   default     = "1"
 }
 
 variable "memory" {
   description = "Memory in Mb"
   type        = string
   default     = "1024"
 }
 
 variable "networks" {
   description = "Default networks configuration (id, ip, gateway, macaddr, bridge)"
   type = list(object({
     id      = number
     ip      = string
     gateway = string
     macaddr = string
     bridge  = string
   }))
   default = []
 }
 
 
 variable "vmid" {
   description = "virtual machine id"
   type        = number
   default     = 0
 }
 
 variable "balloon" {
   description = "ballooning option"
   type        = number
   default     = 0
 }
 
 variable "numa" {
   type = bool
   default = false
 }
 
 variable "storages" {
   description = "Default disks configuration (id, storage, size, storage_type)"
   type = list(object({
     id           = number
     storage      = string
     size         = string
     storage_type = string
   }))
   default = [{
     id           = 0
     storage      = "proxmox"
     size         = "32G"
     storage_type = "cephfs"
   }]
 }
 
 variable "config" {
   description = "Local config to avoid duplication from the main module"
   type        = map(string)
 }
+
+
+variable "pre_provision_steps" {
+    description = "List of sequential provisioning steps to apply"
+    type        = list(string)
+    default     = []
+}
diff --git a/proxmox/terraform/staging/staging.tf b/proxmox/terraform/staging/staging.tf
index 532674d..ddf7784 100644
--- a/proxmox/terraform/staging/staging.tf
+++ b/proxmox/terraform/staging/staging.tf
@@ -1,315 +1,313 @@
 # Keyword use:
 # - provider: Define the provider(s)
 # - data: Retrieve data information to be used within the file
 # - resource: Define resource and create/update
 
 # Default configuration passed along module calls
 # (There is no other way to avoid duplication)
 locals {
   config = {
     dns                       = var.dns
     domain                    = var.domain
     puppet_environment        = var.puppet_environment
     puppet_master             = var.puppet_master
     gateway_ip                = var.gateway_ip
     user_admin                = var.user_admin
     user_admin_ssh_public_key = var.user_admin_ssh_public_key
   }
 }
 
 module "gateway" {
   source = "../modules/node"
   config = local.config
   hypervisor = "beaubourg"
 
   vmid        = 109
   hostname    = "gateway"
   description = "staging gateway node"
   cores       = "1"
   memory      = "1024"
   networks = [
     {
       id      = 0
       ip      = "192.168.100.125"
       gateway = "192.168.100.1"
       bridge  = "vmbr0"
       macaddr = "6E:ED:EF:EB:3C:AA"
     },
     {
       id      = 1
       ip      = local.config["gateway_ip"]
       gateway = ""
       bridge  = "vmbr443"
       macaddr = "FE:95:CC:A5:EB:43"
     }
   ]
   storages = [
     {
       id           = 0
       storage      = "proxmox"
       storage_type = "cephfs"
       size         = "20G"
     }
   ]
-    # inline = [
-    #   "sysctl -w net.ipv4.ip_forward=1",
-    #   "sed -i 's/#net.ipv4.ip_forward=1/net.ipv4.ip_forward=1/g' /etc/sysctl.conf",
-    #   "iptables -t nat -A POSTROUTING -s 192.168.128.0/24 -o eth0 -j MASQUERADE",
-    #   "sed -i 's/127.0.1.1/${var.gateway_ip}/g' /etc/hosts",
-    #   "puppet agent --server ${var.puppet_master} --environment=${var.puppet_environment} --waitforcert 60 --test || echo 'Node provisionned!'",
-    # ]
+  pre_provision_steps = [
+    "sysctl -w net.ipv4.ip_forward=1",
+    "sed -i 's/#net.ipv4.ip_forward=1/net.ipv4.ip_forward=1/g' /etc/sysctl.conf",
+    "iptables -t nat -A POSTROUTING -s 192.168.128.0/24 -o eth0 -j MASQUERADE",
+  ]
 }
 
 module "storage0" {
   source = "../modules/node"
   config = local.config
   hypervisor = "orsay"
 
   vmid        = 114
   hostname    = "storage0"
   description = "swh storage services"
   cores       = "4"
   memory      = "8192"
   balloon     = 1024
   networks = [{
     id      = 0
     ip      = "192.168.128.2"
     gateway = local.config["gateway_ip"]
     macaddr = "CA:73:7F:ED:F9:01"
     bridge  = "vmbr443"
   }]
   storages = [{
     id           = 0
     storage      = "orsay-ssd-2018"
     size         = "32G"
     storage_type = "ssd"
   }, {
     id           = 1
     storage      = "orsay-ssd-2018"
     size         = "512G"
     storage_type = "ssd"
   }]
 }
 
 module "db0" {
   source = "../modules/node"
   config = local.config
   hypervisor = "orsay"
 
   vmid        = 115
   hostname    = "db0"
   description = "Node to host storage/indexer/scheduler dbs"
   cores       = "4"
   memory      = "16384"
   balloon     = 1024
   networks = [{
     id      = 0
     ip      = "192.168.128.3"
     gateway = local.config["gateway_ip"]
     macaddr = "3A:65:31:7C:24:17"
     bridge  = "vmbr443"
   }]
   storages = [{
     id           = 0
     storage      = "orsay-ssd-2018"
     size         = "400G"
     storage_type = "ssd"
   }]
 
 }
 
 output "db0_summary" {
   value = module.db0.summary
 }
 
 module "scheduler0" {
   source = "../modules/node"
   config = local.config
 
   vmid        = 116
   hostname    = "scheduler0"
   description = "Scheduler api services"
   hypervisor  = "beaubourg"
   cores       = "4"
   memory      = "8192"
   balloon     = 1024
   networks = [{
     id      = 0
     ip      = "192.168.128.4"
     gateway = local.config["gateway_ip"]
     macaddr = "92:02:7E:D0:B9:36"
     bridge  = "vmbr443"
   }]
 }
 
 output "scheduler0_summary" {
   value = module.scheduler0.summary
 }
 
 module "worker0" {
   source = "../modules/node"
   config = local.config
 
   vmid        = 117
   hostname    = "worker0"
   description = "Loader/lister service node"
   hypervisor  = "beaubourg"
   cores       = "4"
   memory      = "12288"
   balloon     = 1024
   networks = [{
     id      = 0
     ip      = "192.168.128.5"
     gateway = local.config["gateway_ip"]
     macaddr = "72:D9:03:46:B1:47"
     bridge  = "vmbr443"
   }]
 }
 
 output "worker0_summary" {
   value = module.worker0.summary
 }
 
 module "worker1" {
   source = "../modules/node"
   config = local.config
 
   vmid        = 118
   hostname    = "worker1"
   description = "Loader/lister service node"
   hypervisor  = "beaubourg"
   cores       = "4"
   memory      = "12288"
   balloon     = 1024
   networks = [{
     id      = 0
     ip      = "192.168.128.6"
     gateway = local.config["gateway_ip"]
     macaddr = "D6:A9:6F:02:E3:66"
     bridge  = "vmbr443"
   }]
 }
 
 output "worker1_summary" {
   value = module.worker1.summary
 }
 
 module "webapp" {
   source = "../modules/node"
   config = local.config
 
   vmid        = 119
   hostname    = "webapp"
   description = "Archive/Webapp service node"
   hypervisor  = "branly"
   cores       = "4"
   memory      = "16384"
   balloon     = 1024
   networks = [{
     id      = 0
     ip      = "192.168.128.8"
     gateway = local.config["gateway_ip"]
     macaddr = "1A:00:39:95:D4:5F"
     bridge  = "vmbr443"
   }]
 }
 
 output "webapp_summary" {
   value = module.webapp.summary
 }
 
 module "deposit" {
   source = "../modules/node"
   config = local.config
 
   vmid        = 120
   hostname    = "deposit"
   description = "Deposit service node"
   hypervisor  = "beaubourg"
   cores       = "4"
   memory      = "8192"
   balloon     = 1024
   networks = [{
     id      = 0
     ip      = "192.168.128.7"
     gateway = local.config["gateway_ip"]
     macaddr = "9E:81:DD:58:15:3B"
     bridge  = "vmbr443"
   }]
 }
 
 output "deposit_summary" {
   value = module.deposit.summary
 }
 
 module "vault" {
   source = "../modules/node"
   config = local.config
 
   vmid        = 121
   hostname    = "vault"
   description = "Vault services node"
   hypervisor  = "beaubourg"
   cores       = "4"
   memory      = "8192"
   balloon     = 1024
   networks = [{
     id      = 0
     ip      = "192.168.128.9"
     gateway = local.config["gateway_ip"]
     macaddr = "16:15:1C:79:CB:DB"
     bridge  = "vmbr443"
   }]
 }
 
 output "vault_summary" {
   value = module.vault.summary
 }
 
 module "journal0" {
   source = "../modules/node"
   config = local.config
 
   vmid        = 122
   hostname    = "journal0"
   description = "Journal services node"
   hypervisor  = "beaubourg"
   cores       = "4"
   memory      = "12288"
   balloon     = 1024
   networks = [{
     id      = 0
     ip      = "192.168.128.10"
     gateway = local.config["gateway_ip"]
     macaddr = "1E:98:C2:66:BF:33"
     bridge  = "vmbr443"
   }]
 }
 
 output "journal0_summary" {
   value = module.journal0.summary
 }
 
 module "worker2" {
   source = "../modules/node"
   config = local.config
 
   vmid        = 112
   hostname    = "worker2"
   description = "Loader/lister service node"
   hypervisor = "branly"
   cores       = "4"
   memory      = "12288"
   balloon     = 1024
   networks = [{
     id      = 0
     ip      = "192.168.128.11"
     gateway = local.config["gateway_ip"]
     macaddr = "AA:57:27:51:75:18"
     bridge  = "vmbr443"
   }]
 }
 
 output "worker2_summary" {
   value = module.worker2.summary
 }