diff --git a/external/backblaze.tf b/external/backblaze.tf
index e978a2d8..7aac60c4 100644
--- a/external/backblaze.tf
+++ b/external/backblaze.tf
@@ -5,6 +5,6 @@ provider "b2" {
 }
 
 resource "b2_bucket" "backup" {
-  bucket_name = "homelab-backup"
+  bucket_name = "khuedoan-homelab-backup"
   bucket_type = "allPrivate"
 }
diff --git a/external/cloudflare.tf b/external/cloudflare.tf
index e4226e30..7f4600c3 100644
--- a/external/cloudflare.tf
+++ b/external/cloudflare.tf
@@ -1,3 +1,7 @@
+variable "cloudflare_account_id" {
+  type = string
+}
+
 provider "cloudflare" {
   # Environment variables
   # CLOUDFLARE_API_TOKEN
@@ -14,7 +18,7 @@ resource "random_password" "tunnel_secret" {
 
 resource "cloudflare_argo_tunnel" "homelab" {
   # TODO (optimize) Use variable for account_id
-  account_id = "xxx"
+  account_id = var.cloudflare_account_id
   name       = "homelab"
   secret     = base64encode(random_password.tunnel_secret.result)
 }