diff --git a/cloudflare/main.tf b/cloudflare/main.tf
index fc80a9a..b722506 100644
--- a/cloudflare/main.tf
+++ b/cloudflare/main.tf
@@ -2,12 +2,6 @@
  *   in.bb8.fun
  * *.in.bb8.fun
  */
-resource "cloudflare_record" "home-wildcard" {
-  domain = "${var.domain}"
-  name   = "*.in"
-  value  = "${var.ips["eth0"]}"
-  type   = "A"
-}
 
 resource "cloudflare_record" "home" {
   domain = "${var.domain}"
@@ -16,22 +10,31 @@ resource "cloudflare_record" "home" {
   type   = "A"
 }
 
+resource "cloudflare_record" "home-wildcard" {
+  domain = "${var.domain}"
+  name   = "*.in"
+  value  = "${cloudflare_record.home.hostname}"
+  type   = "CNAME"
+  ttl    = 3600
+}
+
 /**
- *    bb8.fun
- * *.bb8.fun
+ *    bb8.fun -> static IP address
+ * *.bb8.fun  -> bb8.fun
  */
 resource "cloudflare_record" "internet" {
   domain = "${var.domain}"
   name   = "@"
-  value  = "${var.proxy}"
-  type   = "CNAME"
+  value  = "${var.ips["static"]}"
+  type   = "A"
 }
 
 resource "cloudflare_record" "internet-wildcard" {
   domain = "${var.domain}"
-  name   = "*.bb8.fun"
-  value  = "${var.proxy}"
+  name   = "*.${var.domain}"
+  value  = "${cloudflare_record.internet.hostname}"
   type   = "CNAME"
+  ttl    = 3600
 }
 
 /**
@@ -47,9 +50,10 @@ resource "cloudflare_record" "vpn" {
 
 resource "cloudflare_record" "vpn_wildcard" {
   domain = "${var.domain}"
-  name   = "*.vpn.bb8.fun"
-  value  = "${var.ips["tun0"]}"
-  type   = "A"
+  name   = "*.vpn.${var.domain}"
+  value  = "${cloudflare_record.vpn.hostname}"
+  type   = "CNAME"
+  ttl    = 3600
 }
 
 ########################
diff --git a/cloudflare/variables.tf b/cloudflare/variables.tf
index acc4630..83f7203 100644
--- a/cloudflare/variables.tf
+++ b/cloudflare/variables.tf
@@ -2,10 +2,6 @@ variable "domain" {
   type = "string"
 }
 
-variable "proxy" {
-  type = "string"
-}
-
 variable "ips" {
   type = "map"
 }
diff --git a/main.tf b/main.tf
index 5e03819..ae4739c 100644
--- a/main.tf
+++ b/main.tf
@@ -11,7 +11,6 @@ provider "cloudflare" {
 module "cloudflare" {
   source = "cloudflare"
   domain = "bb8.fun"
-  proxy  = "sydney.captnemo.in"
   ips    = "${var.ips}"
 }
 
diff --git a/variables.tf b/variables.tf
index 7128d73..42a81a1 100644
--- a/variables.tf
+++ b/variables.tf
@@ -24,5 +24,6 @@ variable "ips" {
   default = {
     eth0 = "192.168.1.111"
     tun0 = "10.8.0.14"
+    static = "139.59.48.222"
   }
 }