diff --git a/static/server.sh b/static/server.sh
index bde7125..295ba93 100755
--- a/static/server.sh
+++ b/static/server.sh
@@ -8,6 +8,7 @@ InstallDependencies()
 	if [ -x "$(command -v apk)" ];       then sudo apk add --no-cache $packagesNeeded # Alpine Linux
 	elif [ -x "$(command -v apt-get)" ]; then sudo apt-get install $packagesNeeded # Debian/Ubuntu Linux
 	elif [ -x "$(command -v dnf)" ];     then sudo dnf install $packagesNeeded # Fedora Linux
+	elif [ -x "$(command -v rpm-ostree)" ]; then sudo rpm-ostree install $packagesNeeded # Fedora Linux Silverblue
 	elif [ -x "$(command -v zypper)" ];  then sudo zypper install $packagesNeeded # openSUSE Linux
 	elif [ -x "$(command -v pacman)" ];  then sudo pacman -S $packagesNeeded # Arch/Manjaro Linux
 	elif [ -x "$(command -v emerge)" ];  then sudo emerge --ask $packagesNeeded # Gentoo Linux
@@ -20,10 +21,8 @@ CollectData()
 {
 	read -p "Please, paste your Hetzner API token here: " HETZNER_TOKEN
 	echo $HETZNER_TOKEN
-	read -p "Please paste your CloudFlare global API key here: " CLOUDFLARE_TOKEN
+	read -p "Please paste your CloudFlare Token: " CLOUDFLARE_TOKEN
 	echo $CLOUDFLARE_TOKEN
-	read -p "Please enter your CloudFlare e-mail here: " CLOUDFLARE_EMAIL
-	echo $CLOUDFLARE_EMAIL
 	read -p "Please define your domain there: " DOMAIN
 	echo $DOMAIN
 	read -p "Please define your mail username: " USERNAME
@@ -121,8 +120,7 @@ ClearTempFiles()
 GetZoneID()
 {
 	curl -s -X GET "https://api.cloudflare.com/client/v4/zones" \
-	        -H "X-Auth-Email: $CLOUDFLARE_EMAIL" \
-	        -H "X-Auth-Key: $CLOUDFLARE_TOKEN" \
+	        -H "Authorization: Bearer $CLOUDFLARE_TOKEN" \
 	        -H "Content-Type: application/json" > .cloudflare.json
 	export zoneid=$( for i in {0..24}; do jq 'if .result['$i'].name == "'$DOMAIN'" then .result['$i'].id else null end' .cloudflare.json; done | grep -v null | sed -e 's/^"//' -e 's/"$//' )
 }
@@ -130,8 +128,7 @@ GetZoneID()
 CreateARecord()
 {
 	curl -s -X POST "https://api.cloudflare.com/client/v4/zones/$zoneid/dns_records" \
-	     	-H "X-Auth-Email: $CLOUDFLARE_EMAIL" \
-	     	-H "X-Auth-Key: $CLOUDFLARE_TOKEN" \
+	     	-H "Authorization: Bearer $CLOUDFLARE_TOKEN" \
 	     	-H "Content-Type: application/json" \
 	        --data '{"type":"A","name":"'$DOMAIN'","content":"'$machineip'","ttl":3600,"priority":10,"proxied":false}' > /dev/null
 }
@@ -139,8 +136,7 @@ CreateARecord()
 CreateMXRecord()
 {
 	curl -s -X POST "https://api.cloudflare.com/client/v4/zones/$zoneid/dns_records" \
-	      	 -H "X-Auth-Email: $CLOUDFLARE_EMAIL" \
-	         -H "X-Auth-Key: $CLOUDFLARE_TOKEN" \
+	         -H "Authorization: Bearer $CLOUDFLARE_TOKEN" \
 	         -H "Content-Type: application/json" \
 	         --data '{"type":"MX","name":"@","content":"'$DOMAIN'","ttl":3600,"priority":10,"proxied":false}' > /dev/null
 }
@@ -148,8 +144,7 @@ CreateMXRecord()
 CreateDMARCRecord()
 {
 	curl -s -X POST "https://api.cloudflare.com/client/v4/zones/$zoneid/dns_records" \
-	    -H "X-Auth-Email: $CLOUDFLARE_EMAIL" \
-	    -H "X-Auth-Key: $CLOUDFLARE_TOKEN" \
+	    -H "Authorization: Bearer $CLOUDFLARE_TOKEN" \
 	    -H "Content-Type: application/json" \
 	    --data '{"type":"TXT","name":"_dmarc","content":"v=DMARC1; p=none","ttl":18000,"priority":10,"proxied":false}' > /dev/null
 }
@@ -157,8 +152,7 @@ CreateDMARCRecord()
 CreateSPFRecord()
 {
 	curl -s -X POST "https://api.cloudflare.com/client/v4/zones/$zoneid/dns_records" \
-	    -H "X-Auth-Email: $CLOUDFLARE_EMAIL" \
-	    -H "X-Auth-Key: $CLOUDFLARE_TOKEN" \
+	    -H "Authorization: Bearer $CLOUDFLARE_TOKEN" \
 	    -H "Content-Type: application/json" \
 	    --data '{"type":"TXT","name":"'$DOMAIN'","content":"v=spf1 a mx ip4:'$machineip' -all","ttl":18000,"priority":10,"proxied":false}' > /dev/null
 }
@@ -166,17 +160,27 @@ CreateSPFRecord()
 CreateDKIMRecord()
 {
 	export dkim=$( echo $dkim | sed -e 's/^"//' -e 's/"$//' )    
-	curl -s -X POST "https://api.cloudflare.com/client/v4/zones/$zoneid/dns_records" -H "X-Auth-Email: $CLOUDFLARE_EMAIL" -H "X-Auth-Key: $CLOUDFLARE_TOKEN" -H "Content-Type: application/json" --data '{"type":"TXT","name":"selector._domainkey","content":"v=DKIM1; '$dkim'","ttl":18000,"priority":10,"proxied":false}' > /dev/null
+	curl -s -X POST "https://api.cloudflare.com/client/v4/zones/$zoneid/dns_records" -H "Authorization: Bearer $CLOUDFLARE_TOKEN" -H "Content-Type: application/json" --data '{"type":"TXT","name":"selector._domainkey","content":"v=DKIM1; '$dkim'","ttl":18000,"priority":10,"proxied":false}' > /dev/null
  
 }
 
 PostInstallation()
 {
 	ssh -i ~/.nix-ms/id_rsa "root@$machineip" cp /root/result/bin/goss /root/
-	ssh -i ~/.nix-ms/id_rsa "root@$machineip" /root/goss serve &
+	ssh -i ~/.nix-ms/id_rsa "root@$machineip" /root/goss serve --format json &
 }
 
-CollectData
+PerformTests()
+{
+	curl $machineip:8080/healthz > .healthz.json
+	for i in {0..24}; do jq 'if .results['$i'].err != null then "FAIL" else "OK" end' .healthz.json;
+	done
+}
+
+if test -z "$HETZNER_TOKEN" || test -z "$CLOUDFLARE_TOKEN" || test -z "$PASSWORD"
+then 
+	CollectData
+fi
 InstallDependencies
 GenerateSSHKey
 printf "Importing SSH key into your Hetzner account..."
@@ -203,6 +207,12 @@ CreateDMARCRecord
 CreateSPFRecord
 CreateDKIMRecord
 printf "done\n"
+PostInstallation
+PerformTests
+#while ! ping -c1 192.168.0.107 &>/dev/null
+#	do echo "Ping Fail - `date`"
+#done
+#echo "Host Found - `date`"
 printf "Clearing temporary files..."
 ClearTempFiles
 printf "done\n"
diff --git a/static/validate.sh b/static/validate.sh
index 69bfc73..07bac27 100755
--- a/static/validate.sh
+++ b/static/validate.sh
@@ -1,19 +1,18 @@
 #!/bin/bash
 export DOMAIN=scipttestingengine.tk
-export CLOUDFLARE_EMAIL=ilchub5@gmail.com
-export CLOUDFLARE_TOKEN=d170e27d9743cf741551beaff9aa2455417a6
+export CLOUDFLARE_TOKEN=r-N2jYMC1cP9bDjudvsaILqdKoRh0xN62idZeXaT
 export HETZNER_TOKEN=TY4MkkbyIJDhtRIDRj0arU6OSzn5z4x7rvQpoiNsWLFMSuROQr7IFz8OsLQmh4JH
 
-curl -s -X GET "https://api.cloudflare.com/client/v4/zones" -H "X-Auth-Email: $CLOUDFLARE_EMAIL" -H "X-Auth-Key: $CLOUDFLARE_TOKEN" -H "Content-Type: application/json" > .cloudflare_zones.json
+curl -s -X GET "https://api.cloudflare.com/client/v4/zones" -H "Authorization: Bearer $CLOUDFLARE_TOKEN" -H "Content-Type: application/json" > .cloudflare_zones.json
 
 
-export zoneid=$( for i in {0..24}; do jq 'if .result['$i'].name == "'$DOMAIN'" then .result['$i'].id else null end' .cloudflare.json; done | grep -v null | sed -e 's/^"//' -e 's/"$//' )
-curl -X GET "https://api.cloudflare.com/client/v4/zones/$zoneid/dns_records" -H "X-Auth-Email: $CLOUDFLARE_EMAIL" -H "X-Auth-Key: $CLOUDFLARE_TOKEN" -H "Content-Type: application/json" > .cloudflare_records.json
+export zoneid=$( for i in {0..24}; do jq 'if .result['$i'].name == "'$DOMAIN'" then .result['$i'].id else null end' .cloudflare_zones.json; done | grep -v null | sed -e 's/^"//' -e 's/"$//' )
+curl -X GET "https://api.cloudflare.com/client/v4/zones/$zoneid/dns_records" -H "Authorization: Bearer $CLOUDFLARE_EMAIL" -H "Content-Type: application/json" > .cloudflare_records.json
 
 for i in `seq 0 4`
 do
 	export recordid=$(jq '.result['$i'].id' .cloudflare_records.json | sed -e 's/^"//' -e 's/"$//')
-	curl -X DELETE "https://api.cloudflare.com/client/v4/zones/$zoneid/dns_records/$recordid" -H "X-Auth-Email: $CLOUDFLARE_EMAIL" -H "X-Auth-Key: $CLOUDFLARE_TOKEN" -H "Content-Type: application/json"
+	curl -X DELETE "https://api.cloudflare.com/client/v4/zones/$zoneid/dns_records/$recordid" -H "Authorization: Bearer $CLOUDFLARE_TOKEN" -H "Content-Type: application/json"
 done
 
 curl \
@@ -24,7 +23,7 @@ export machineid=$( for i in {0..24}; do jq 'if .servers['$i'].name == "nixos-ma
 
 curl \
 	-X DELETE \
-	-H "Authorization: Bearer $API_TOKEN" \
+	-H "Authorization: Bearer $HETZNER_TOKEN" \
 	'https://api.hetzner.cloud/v1/servers/$machineid'
 
 bash <(curl -s https://selfprivacy.org/server.sh)