diff --git a/terraform/main.tf b/terraform/main.tf
index 7bc7e05..fb0ba83 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -1,55 +1,56 @@
 locals {
-  environment = "${terraform.workspace != "" ? terraform.workspace : "test"}"
+  environment = terraform.workspace != "" ? terraform.workspace : "test"
 }
 
 terraform {
   backend "s3" {
-    bucket     = "banditlair-k8s-tfstate"
-    key        = "k8s.tfstate"
-    region     = "nl-ams"
-    endpoint   = "https://s3.nl-ams.scw.cloud"
+    bucket                      = "banditlair-k8s-tfstate"
+    key                         = "banditlair.tfstate"
+    region                      = "nl-ams"
+    endpoint                    = "https://s3.nl-ams.scw.cloud"
+    profile                     = "default"
     skip_credentials_validation = true
-    skip_region_validation = true
+    skip_region_validation      = true
   }
 }
 
 provider "scaleway" {
-  region = "${var.region}"
+  region = var.region
 }
 
 data "scaleway_image" "ubuntu" {
-  architecture = "${var.architecture}"
-  name         = "${var.image}"
+  architecture = var.architecture
+  name         = var.image
 }
 
 resource "scaleway_server" "node" {
-  count  = "${var.node_instance_count}"
-  name   = "node${count.index+1}"
-  image  = "${data.scaleway_image.ubuntu.id}"
-  type   = "${var.node_instance_type}"
-  state  = "running"
-  dynamic_ip_required = true,
-  tags   = ["${local.environment}-node"]
+  count               = var.node_instance_count
+  name                = "node${count.index + 1}"
+  image               = data.scaleway_image.ubuntu.id
+  type                = var.node_instance_type
+  state               = "running"
+  dynamic_ip_required = true
+  tags                = ["${local.environment}-node"]
 }
 
 resource "scaleway_server" "master" {
-  count  = "${var.master_instance_count}"
-  name   = "master${count.index+1}"
-  image  = "${data.scaleway_image.ubuntu.id}"
-  type   = "${var.master_instance_type}"
-  state  = "running"
-  dynamic_ip_required = true,
-  tags   = [
+  count               = var.master_instance_count
+  name                = "master${count.index + 1}"
+  image               = data.scaleway_image.ubuntu.id
+  type                = var.master_instance_type
+  state               = "running"
+  dynamic_ip_required = true
+  tags = [
     "${local.environment}-master",
-    "${local.environment}-etcd"
-    ]
+    "${local.environment}-etcd",
+  ]
 }
 
 output "node_private_ips" {
-  value = ["${scaleway_server.node.*.private_ip}"]
+  value = [scaleway_server.node.*.private_ip]
 }
 
 output "master_private_ips" {
-  value = ["${scaleway_server.master.*.private_ip}"]
+  value = [scaleway_server.master.*.private_ip]
 }
 
diff --git a/terraform/variables.tf b/terraform/variables.tf
index 102d8fb..56fbd3a 100644
--- a/terraform/variables.tf
+++ b/terraform/variables.tf
@@ -25,3 +25,4 @@ variable "node_instance_type" {
 variable "node_instance_count" {
   default = 2
 }
+
diff --git a/terraform/versions.tf b/terraform/versions.tf
new file mode 100644
index 0000000..ac97c6a
--- /dev/null
+++ b/terraform/versions.tf
@@ -0,0 +1,4 @@
+
+terraform {
+  required_version = ">= 0.12"
+}