diff --git a/proxmox/terraform/modules/node/outputs.tf b/proxmox/terraform/modules/node/outputs.tf
index c4804d7..1a83803 100644
--- a/proxmox/terraform/modules/node/outputs.tf
+++ b/proxmox/terraform/modules/node/outputs.tf
@@ -1,11 +1,8 @@
-output name {
-    value = "${proxmox_vm_qemu.node.name}"
-}
-
-output ip {
-    value = "${proxmox_vm_qemu.node.network.*.ip}"
-}
+output summary {
+    value = <<EOF
 
-output macaddr {
-    value = "${proxmox_vm_qemu.node.network.*.macaddr}"
+hostname: ${proxmox_vm_qemu.node.name}
+fqdn: ${proxmox_vm_qemu.node.name}.${var.domain}
+network: ${proxmox_vm_qemu.node.ipconfig0} macaddr=${lookup(proxmox_vm_qemu.node.network[0], "macaddr")}
+EOF
 }
diff --git a/proxmox/terraform/staging.tf b/proxmox/terraform/staging.tf
index f94293c..26d9ab5 100644
--- a/proxmox/terraform/staging.tf
+++ b/proxmox/terraform/staging.tf
@@ -1,113 +1,113 @@
 # Keyword use:
 # - provider: Define the provider(s)
 # - data: Retrieve data information to be used within the file
 # - resource: Define resource and create/update
 
 provider "proxmox" {
     pm_tls_insecure = true
     pm_api_url      = "https://orsay.internal.softwareheritage.org:8006/api2/json"
     # in a shell (see README): source ./setup.sh
 }
 
 # define the staging network gateway
 resource "proxmox_vm_qemu" "gateway" {
     name              = "gateway"
     desc              = "staging gateway node"
     # hypervisor onto which make the vm
     target_node       = "orsay"
     # See init-template.md to see the template vm bootstrap
     clone             = "template-debian-9"
     # linux kernel 2.6
     qemu_os           = "l26"
     # generic setup
     sockets           = 1
     cores             = 1
     memory            = 1024
     # boot machine when hypervirsor starts
     onboot            = true
     #### cloud-init setup
     # to actually set some information per os_type (values: ubuntu, centos,
     # cloud-init). Keep this as cloud-init
     os_type           = "cloud-init"
     # ciuser - User name to change ssh keys and password for instead of the
     # image’s configured default user.
     ciuser            = "${var.user_admin}"
     ssh_user          = "${var.user_admin}"
     # searchdomain - Sets DNS search domains for a container.
     searchdomain      = "${var.domain}"
     # nameserver - Sets DNS server IP address for a container.
     nameserver        = "${var.dns}"
     # sshkeys - public ssh keys, one per line
     sshkeys           = "${var.user_admin_ssh_public_key}"
     # FIXME: When T1872 lands, this will need to be updated
     # ipconfig0 - [gw =] [,ip=<IPv4Format/CIDR>]
     # ip to communicate for now with the prod network through louvre
     ipconfig0         = "ip=192.168.100.125/24,gw=192.168.100.1"
     # vms from the staging network will use this vm as gateway
     ipconfig1         = "ip=${var.gateway_ip}/24"
     disk {
         id           = 0
         type         = "virtio"
         storage      = "orsay-ssd-2018"
         storage_type = "ssd"
         size         = "20G"
     }
     network {
         id      = 0
         model   = "virtio"
         bridge  = "vmbr0"
         macaddr = "6E:ED:EF:EB:3C:AA"
     }
     network {
         id      = 1
         model   = "virtio"
         bridge  = "vmbr0"
         macaddr = "FE:95:CC:A5:EB:43"
     }
     # Delegate to puppet at the end of the provisioning the software setup
     provisioner "remote-exec" {
         inline = [
             "sysctl -w net.ipv4.ip_forward=1",
             # make it persistent
             "sed -i 's/#net.ipv4.ip_forward=1/net.ipv4.ip_forward=1/g' /etc/sysctl.conf",
             # add route to louvre (the persistence part is done through puppet)
             "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!'",
         ]
     }
 }
 
 module "storage0" {
     source      = "./modules/node"
 
     hostname    = "storage0"
     description = "swh storage services"
     cores       = "4"
     memory      = "8192"
     network = {
         ip      = "192.168.128.2"
         macaddr = "CA:73:7F:ED:F9:01"
     }
 }
 
-output storage0_out {
-    value = "${module.storage0.name} ${module.storage0.ip} ${module.storage0.macaddr}"
+output storage0_summary {
+    value = "${module.storage0.summary}"
 }
 
 module "db0" {
     source      = "./modules/node"
 
     hostname    = "db0"
     description = "swh db"
     cores       = "4"
     memory      = "16384"
     network = {
         ip      = "192.168.128.3"
+        macaddr = "3A:65:31:7C:24:17"
     }
 }
 
-
-output db0_out {
-    value = "${module.db0.name} ${module.db0.ip} ${module.db0.macaddr}"
+output db0_summary {
+    value = "${module.db0.summary}"
 }