diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..1135d58
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "kubespray"]
+	path = kubespray
+	url = ssh://git@gitlab.banditlair.com:2224/phfroidmont/kubespray.git
diff --git a/ansible.cfg b/ansible.cfg
index 043f1cf..7c3967a 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -6,8 +6,13 @@ host_key_checking = False
 nocows = 1
 remote_user = root
 retry_files_enabled = False
+library       = kubespray/library/
+roles_path    = kubespray/roles/
 
 [ssh_connection]
 control_path = /tmp/ansible-ssh-%%h-%%p-%%r
 pipelining = True
 ssh_args = -C -o ControlMaster=auto -o ControlPersist=5m -o ForwardAgent=yes -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null
+
+[inventory]
+enable_plugins = host_list, scaleway, ini, script, yaml
diff --git a/inventories/staging/group_vars/k8s-cluster.yml b/inventories/staging/group_vars/k8s-cluster.yml
new file mode 100644
index 0000000..e8b0de6
--- /dev/null
+++ b/inventories/staging/group_vars/k8s-cluster.yml
@@ -0,0 +1,2 @@
+kube_network_plugin: flannel
+bin_dir: /usr/local/bin
diff --git a/inventories/staging/groups b/inventories/staging/groups
new file mode 100644
index 0000000..12e7be1
--- /dev/null
+++ b/inventories/staging/groups
@@ -0,0 +1,10 @@
+[kube-master]
+
+[etcd]
+
+[kube-node]
+
+[k8s]
+
+[k8s-cluster:children]
+k8s
diff --git a/inventories/staging/scaleway_inventory.yml b/inventories/staging/scaleway_inventory.yml
new file mode 100644
index 0000000..c4acf41
--- /dev/null
+++ b/inventories/staging/scaleway_inventory.yml
@@ -0,0 +1,13 @@
+plugin: scaleway
+hostnames:
+  - hostname
+regions:
+  - par1
+  - ams1
+tags:
+  - k8s
+  - kube-master
+  - etcd
+  - kube-node
+variables:
+  ansible_host: public_ip.address
diff --git a/inventories/staging/scw.ini b/inventories/staging/scw.ini
deleted file mode 100644
index baa27a8..0000000
--- a/inventories/staging/scw.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[credentials]
-token_file = ~/.ssh/scw-token
-[config]
-environment = staging
diff --git a/inventories/staging/scw.sh b/inventories/staging/scw.sh
deleted file mode 100755
index ba32772..0000000
--- a/inventories/staging/scw.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-cd "$(dirname $0)"
-
-exec ../../scripts/scw_inventory.py
diff --git a/k8s.yml b/k8s.yml
index 52d1afc..a3c859a 100644
--- a/k8s.yml
+++ b/k8s.yml
@@ -1,24 +1,27 @@
 ---
-- hosts: k8s_proxy:k8s_masters:k8s_workers
-  roles:
-    - role: proxy
-      tags: proxy
-    - role: docker
-      tags: docker
-- hosts: k8s_masters
-  gather_facts: false
-  roles:
-  - role: etcd
-    tags: etcd
-- hosts: k8s_proxy:k8s_masters:k8s_workers
-  gather_facts: false
-  roles:
-  - role: kubernetes
-    tags: kubernetes
-- hosts: k8s_masters:k8s_proxy
-  gather_facts: false
-  roles:
-  - role: ingress
-    tags: ingress
-  - role: kubernetes-dashboard
-    tags: dashboard
+- name: Include kubespray tasks
+  import_playbook: kubespray/cluster.yml
+
+# - hosts: k8s_proxy:k8s_masters:k8s_workers
+#   roles:
+#     - role: proxy
+#       tags: proxy
+#     - role: docker
+#       tags: docker
+# - hosts: k8s_masters
+#   gather_facts: false
+#   roles:
+#   - role: etcd
+#     tags: etcd
+# - hosts: k8s_proxy:k8s_masters:k8s_workers
+#   gather_facts: false
+#   roles:
+#   - role: kubernetes
+#     tags: kubernetes
+# - hosts: k8s_masters:k8s_proxy
+#   gather_facts: false
+#   roles:
+#   - role: ingress
+#     tags: ingress
+#   - role: kubernetes-dashboard
+#     tags: dashboard
diff --git a/kubespray b/kubespray
new file mode 160000
index 0000000..a8dd69c
--- /dev/null
+++ b/kubespray
@@ -0,0 +1 @@
+Subproject commit a8dd69cf1777996873570448110239adba605a05
diff --git a/scripts/scw_inventory.py b/scripts/scw_inventory.py
deleted file mode 100755
index ed81810..0000000
--- a/scripts/scw_inventory.py
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
-Generate an inventory of servers from scaleway which is
-suitable for use as an ansible dynamic inventory
-Right now, only the group 'cci-customer' is exported
-"""
-
-import configparser
-import json
-import os
-from typing import Dict, Any
-
-from scaleway.apis import ComputeAPI
-
-
-class SCWInventory(object):
-    """
-    The inventory class which calls out to scaleway and digests
-    The returned data, making it usable by ansible as an inventory
-    """
-
-    response: Dict[str, Any]
-
-    def __init__(self):
-        self.inventory = None
-        self.auth_token = None
-        self.environment = None
-        self.response = {
-            '_meta': {
-                'hostvars': {
-                }
-            }
-        }
-
-    def parse_config(self, creds_file='scw.ini'):
-        """
-        Parse the ini file to get the auth token
-        """
-        config = configparser.ConfigParser()
-        config.read(creds_file)
-        with open(os.path.expanduser(config['credentials']['token_file']), 'r') as content_file:
-            self.auth_token = content_file.read().replace('\n', '')
-        self.environment = config['config']['environment']
-
-    def get_servers(self):
-        """
-        Query scaleway api and pull down a list of servers
-        """
-        self.parse_config()
-        api_par1 = ComputeAPI(auth_token=self.auth_token, region='par1')
-        api_ams1 = ComputeAPI(auth_token=self.auth_token, region='ams1')
-        result_par1 = api_par1.query().servers.get()
-        result_ams1 = api_ams1.query().servers.get()
-        self.inventory = [
-            [i['name'], i['public_ip'], i['tags'], i['private_ip']] for i in
-            result_par1['servers'] + result_ams1['servers']
-        ]
-        for host, ip_info, tags, private_ip in self.inventory:
-            host_vars = {
-                'private_ip': private_ip,
-                'ansible_python_interpreter': '/usr/bin/python3'
-            }
-            if ip_info:
-                host_vars['ansible_host'] = ip_info['address']
-                host_vars['public_ip'] = ip_info['address']
-            else:
-                host_vars['ansible_host'] = private_ip
-
-            self.response['_meta']['hostvars'][host] = host_vars
-            if tags:
-                for tag in tags:
-                    self._add_to_response(
-                        tag,
-                        host
-                    )
-
-        for host, variables in self.response['_meta']['hostvars'].items():
-            if host != 'proxy1':
-                variables['ansible_ssh_common_args'] = '-o ProxyCommand="ssh -W %h:%p -q root@' + \
-                                                       self.response['_meta']['hostvars']['proxy1']['public_ip'] \
-                                                       + ' -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"'
-
-    def _add_to_response(self, group, hostname):
-        """
-        Add a host to a group within the response
-        """
-        if group not in self.response:
-            self.response[group] = list()
-        if group in self.response:
-            self.response[group].append(hostname)
-
-    def print_inventory(self):
-        """
-        Simply display the collected inventory
-        """
-        print(json.dumps(self.response))
-
-
-def main():
-    """
-    Run the program starting here
-    """
-    inventory = SCWInventory()
-    inventory.get_servers()
-    inventory.print_inventory()
-
-
-if __name__ == '__main__':
-    main()
diff --git a/terraform/main.tf b/terraform/main.tf
new file mode 100644
index 0000000..12f9548
--- /dev/null
+++ b/terraform/main.tf
@@ -0,0 +1,41 @@
+provider "scaleway" {
+  region = "${var.region}"
+}
+
+data "scaleway_image" "ubuntu" {
+  architecture = "${var.architecture}"
+  name         = "${var.image}"
+}
+
+//resource "scaleway_ip" "public_ip" {
+//  count = 1
+//}
+
+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   = ["k8s", "kube-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   = ["k8s", "kube-master","etcd"]
+}
+
+output "node_private_ips" {
+  value = ["${scaleway_server.node.*.private_ip}"]
+}
+
+output "master_private_ips" {
+  value = ["${scaleway_server.master.*.private_ip}"]
+}
+
diff --git a/terraform/sl.tf b/terraform/sl.tf
deleted file mode 100644
index 088cb13..0000000
--- a/terraform/sl.tf
+++ /dev/null
@@ -1,79 +0,0 @@
-provider "scaleway" {
-  region = "${var.region}"
-}
-
-data "scaleway_image" "ubuntu" {
-  architecture = "${var.architecture}"
-  name         = "${var.image}"
-}
-
-data "scaleway_image" "ubuntu_mini" {
-  architecture = "${var.architecture}"
-  name         = "${var.mini_image}"
-}
-
-//resource "scaleway_ip" "public_ip" {
-//  count = 1
-//}
-
-resource "scaleway_server" "worker" {
-  count  = "${var.worker_instance_count}"
-  name   = "worker${count.index+1}"
-  image  = "${data.scaleway_image.ubuntu.id}"
-  type   = "${var.worker_instance_type}"
-  state  = "running"
-  tags   = ["k8s","k8s_workers"]
-
-//  volume {
-//    size_in_gb = 50
-//    type       = "l_ssd"
-//  }
-}
-
-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"
-  tags   = ["k8s","k8s_masters"]
-}
-
-resource "scaleway_server" "proxy1" {
-  count = 1
-  name  = "proxy1"
-  image = "${data.scaleway_image.ubuntu.id}"
-  type  = "${var.proxy_instance_type}"
-  public_ip  = "51.158.77.6"
-  state  = "running"
-  tags  = ["k8s","k8s_proxy","primary"]
-}
-
-resource "scaleway_server" "proxy2" {
-  count = 1
-  name  = "proxy2"
-  image = "${data.scaleway_image.ubuntu.id}"
-  type  = "${var.proxy_instance_type}"
-  state  = "running"
-  tags  = ["k8s","k8s_proxy","secondary"]
-}
-
-output "worker_private_ips" {
-  value = ["${scaleway_server.worker.*.private_ip}"]
-}
-
-output "master_private_ips" {
-  value = ["${scaleway_server.master.*.private_ip}"]
-}
-
-output "proxy0_private_ips" {
-  value = ["${scaleway_server.proxy1.*.private_ip}"]
-}
-
-output "proxy1_private_ips" {
-  value = ["${scaleway_server.proxy2.*.private_ip}"]
-}
-
-output "public_ip" {
-  value = ["${scaleway_server.proxy1.*.public_ip}"]
-}
diff --git a/terraform/variables.tf b/terraform/variables.tf
index 6a77b85..102d8fb 100644
--- a/terraform/variables.tf
+++ b/terraform/variables.tf
@@ -7,33 +7,21 @@ variable "architecture" {
 }
 
 variable "image" {
-  default = "ubuntu-bionic-k8s"
-}
-
-variable "mini_image" {
-  default = "Ubuntu Mini Xenial 25G"
+  default = "Ubuntu Bionic"
 }
 
 variable "master_instance_type" {
-  default = "START1-S"
+  default = "DEV1-S"
 }
 
 variable "master_instance_count" {
-  default = 3
+  default = 1
 }
 
-variable "proxy_instance_type" {
-  default = "START1-S"
+variable "node_instance_type" {
+  default = "DEV1-S"
 }
 
-variable "worker_instance_type" {
-  default = "START1-S"
-}
-
-variable "worker_volume_size" {
-  default = 100
-}
-
-variable "worker_instance_count" {
-  default = 3
+variable "node_instance_count" {
+  default = 2
 }