diff --git a/fresh_install b/fresh_install
index 3db940f8450f0423881c7836b05ba6c35036cefc..cf4cf94ba9fc5d2cf09274dcea20e2c378b87803 100644
--- a/fresh_install
+++ b/fresh_install
@@ -1,14 +1,22 @@
-ssh root@machine
+IP=
+hostname=
+ssh -o "StrictHostKeyChecking no" root@$IP
 
+fdisk -l #find your ssd
+
+#Check the state of the drives
+smartctl -a /dev/sda
+smartctl -a /dev/sdb
+smartctl -a /dev/sdc
 
-fdisk -l (find your ssd)
 wget https://raw.github.com/coreos/init/master/bin/coreos-install
 cat > cloud-config << EOF
 #cloud-config
 
-hostname: k6
+hostname: $hostname
 ssh_authorized_keys:
   - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCTDu9fp/BkVv7afu4HWBf9Ou/Bu0A0wmT8ELx6w2LguywKVYytubS++j1cuZ90BmK7pso22gJL8JA+z3I4YSzzX07E+/Tauug/xqWY88nk2yykIbRdYwnBQ545yDoK9b2MG+3Ih9NFNo4CTe0hfm9OC8Ztd+6/tJI85JUNjISSEuGhwkfCHUKwu5kUQDLCJg5hzbq0mpE/CAnXiX6Vs2vJL2RHuvM37CzuqjFqJq+k7OYW1Dz32PrFxOefCHCHXI5Oq2a6lWcBLHmYPx8KDk5li7XSm3HirPoPOpSgfZmFtTM7bbJmOjlJgD27tDUgM94yZoRB9qFSM3103CX1qRfLfDd/e9BDI6jbG/Jdq4Zt1PdOb4V6ee86DzO+PIOqv0P9tImMAwZDve9EfcaNjqNhWeY4oUbEuvsZ5R5BrFGvg10D7WsVs1iIJ//XYaiC+D5PG6iDjXsvR7j+auLGGMOjZNEvIJcqDmtTi2mQsZ4n9Y9M0zAKCKIGkKS+JQqZZUToRA7YV+C7JniTlxg4UZxVQgpsGhwxnWuc8YeM99byB6lbWqGTewVbDy97zXcJwHfVgx0oUNwQl0qwZ+B1LX8Cw1eei2vBzHlsVpx0G/RKn4ai1puSyYeFyTOWIc38HZ8d4ZdL2LYx2PqCTYOfHYfLY4q3Mj2SDxr/fq++0F7jbQ== pierre@ozoux.net
+  - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDDoQ/sHcgXwcmTWDAd+8uc7dk7eIpLv0T1i8gkQOamBaCV+Y9SXDlUcveWHXa0JTZJTzXn/m/O1VE5AlqP3TEKSPBxnVBya6LWuLlNNGBKmponWXIb5aIcpKHicojEcrt1KjQyc3UAKRcLz7ajgsQ+kj2GXcbXlCGIsEUx08MIV1bowxmHIKNDe/SaBUAVsHZFuE7R4okQxPYJfU5SeHogUtwon99ND4PohEmR0IYtXGTNu4ky2j+qBAIZLbXa0AR20v4dvE5apZKwmD/Uyv7sTPApm0KfqRozgi/T5Ba0OcR79AAm1XaBzT78YTO+41eV3EHTiH1Y/XIQR75iMdfTPGWcaSlU6qMoLSJ8OsGX9qOJCoWNzJSl2j7OgHchhNmf6uuZkvBR2hOpTQgDsDHHk8LVFiQ3VlDdL6mWYoxRCmKil7lycAczx7MdjfEU6QGdEfRKWpwWKV8qJEIJqhVMVKgqJOk+fxyAmC+oije+7JUEa64r30A6rwsTUkO8cI5KxxksYDsQYmZPvAMM3pxi01WTxt01gG//vC+4Hxg1OZdPwUlJdYEGKhGVSa127eKobpb460avon24a1OW9qCpiv79/qOrKUEjQX8PpPlG6oFZlAzFkLkNDDMMqhePOXapgpyclbemFC+5Xj2w/8gVJJZotPr1OzTjzfqFAUOwqw== pboua@Peters-MacBook-Air.local
 write_files:
   - path: /etc/sysctl.d/aio-max.conf
     permissions: 0644
@@ -41,30 +49,27 @@ bash coreos-install -d /dev/sda -c cloud-config
 reboot
 
 
-ssh-keygen -f "/home/pierre/.ssh/known_hosts" -R k6
-ssh-keygen -f "/home/pierre/.ssh/known_hosts" -R 5.9.101.242
-
-ssh core@machine
-
-vi /etc/mdadm.conf
-MAILADDR my.email@gmail.com
-mdadm --create --verbose /dev/md0 --level=mirror --raid-devices=2 /dev/sdb /dev/sdc
+ssh core@$IP
 
 sudo su -
 
 # Create Directory structure
 mkdir -p /data/domains
-mkdir -p /data/runtime/haproxy/approved-certs
 git clone https://github.com/indiehosters/LibrePaaS.git /data/indiehosters
 
 # Install unit-files
 cp /data/indiehosters/unit-files/* /etc/systemd/system && systemctl daemon-reload
 
+# Setup raid
+cat > /etc/mdadm.conf << EOF
+MAILADDR support@indie.host
+mdadm --create --verbose /dev/md0 --level=mirror --raid-devices=2 /dev/sdb /dev/sdc
+EOF
+
 mkfs.ext4 /dev/md0
 coreos-cloudinit --from-file=/var/lib/coreos-install/user_data
 
-vi /etc/environment
-###
+cat > /etc/environment << EOF
 NAMECHEAP_URL="namecheap.com"
 NAMECHEAP_API_USER="pierreo"
 NAMECHEAP_API_KEY=
@@ -88,21 +93,27 @@ mail_hostname=mail.indie.host
 MAIL_HOST=mail.indie.host
 MAIL_PORT=587
 MAIL_DOMAIN=indie.host
-###
+EOF
 
 source /etc/environment
 
-ssh-keygen -t rsa -b 4096 -C "root@k6"
-# add the new public key to your backup server
+ssh-keygen -t rsa -b 4096 -C "root@$hostname"
 
+# add the new public key to your backup server
 ssh -o "StrictHostKeyChecking no" -o "BatchMode yes" -o "HostKeyAlgorithms=ssh-rsa" root@5.9.102.20 -p port exit
 
 gpg --gen-key
 
-
 mkdir -p /opt/bin
 DOCKER_COMPOSE_VERSION=1.4.2
 curl -L https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/docker-compose-`uname -s`-`uname -m` > /opt/bin/docker-compose
 chmod +x /opt/bin/docker-compose
 
-cp /root/indie.host.pem /data/runtime/haproxy/approved-certs/default.pem
+# add swap
+cd /data
+fallocate -l 8192m ./swap
+chmod 600 ./swap
+mkswap ./swap
+systemctl status swapon
+systemctl start swapon
+systemctl status swapon