diff --git a/Access_Controls-Applications-Infrastructure.tf b/Access_Controls-Applications-Infrastructure.tf
index 9fc3527..c7fdc04 100644
--- a/Access_Controls-Applications-Infrastructure.tf
+++ b/Access_Controls-Applications-Infrastructure.tf
@@ -25,7 +25,7 @@ resource "cloudflare_zero_trust_access_application" "cloudflare_app_ssh_infra" {
   type                         = "infrastructure"
   name                         = var.cloudflare_infra_app_name
   logo_url                     = "https://upload.wikimedia.org/wikipedia/commons/0/01/Google-cloud-platform.svg"
-  tags                         = ["engineers"]
+  tags                         = [cloudflare_zero_trust_access_tag.tags["engineers"].name]
   custom_deny_url              = "https://denied.tips-of-mine.org/"
   custom_non_identity_deny_url = "https://denied.tips-of-mine.org/"
 
diff --git a/Access_Controls-Applications-rdp.tf b/Access_Controls-Applications-rdp.tf
index 57ad3c5..ee9f689 100644
--- a/Access_Controls-Applications-rdp.tf
+++ b/Access_Controls-Applications-rdp.tf
@@ -27,7 +27,7 @@ resource "cloudflare_zero_trust_access_application" "cloudflare_app_rdp_domain"
   app_launcher_visible         = true
   logo_url                     = "https://www.kevinsubileau.fr/wp-content/uploads/2016/05/RDP_icon.png"
   tags                         = [cloudflare_zero_trust_access_tag.tags["engineers"].name]
-   session_duration             = "0s"
+  session_duration             = "0s"
   custom_deny_url              = "https://denied.tips-of-mine.org/"
   custom_non_identity_deny_url = "https://denied.tips-of-mine.org/"
 
diff --git a/Access_Controls-Applications-self_hosted.tf b/Access_Controls-Applications-self_hosted.tf
index 5125f32..dd11558 100644
--- a/Access_Controls-Applications-self_hosted.tf
+++ b/Access_Controls-Applications-self_hosted.tf
@@ -14,8 +14,8 @@ resource "cloudflare_zero_trust_access_application" "zero_trust_access_applicati
   domain            = "home.tips-of-mine.org"
   session_duration  = "24h"
   skip_interstitial = true
-#  tags              = ["engineers"]
-  tags              = [for tag in cloudflare_zero_trust_access_tag.tags : tag.name]
+  tags              = [cloudflare_zero_trust_access_tag.tags["engineers"].name]
+#  tags              = [for tag in cloudflare_zero_trust_access_tag.tags : tag.name]
 
   depends_on = [
     cloudflare_zero_trust_access_tag.tags
@@ -40,7 +40,7 @@ resource "cloudflare_zero_trust_access_application" "cloudflare_app_web_competit
   name                         = var.cloudflare_sensitive_web_app_name
   app_launcher_visible         = true
   logo_url                     = "https://img.freepik.com/free-vector/trophy_78370-345.jpg"
-  tags                         = ["engineers"]
+  tags                         = [cloudflare_zero_trust_access_tag.tags["engineers"].name]
   session_duration             = "0s"
   custom_deny_url              = "https://denied.tips-of-mine.org/"
   custom_non_identity_deny_url = "https://denied.tips-of-mine.org/"
@@ -71,7 +71,7 @@ resource "cloudflare_zero_trust_access_application" "cloudflare_app_web_intranet
   name                         = var.cloudflare_intranet_web_app_name
   app_launcher_visible         = true
   logo_url                     = "https://raw.githubusercontent.com/uditkumar489/Icon-pack/master/Entrepreneur/digital-marketing/svg/computer-1.svg"
-  tags                         = ["engineers"]
+  tags                         = [cloudflare_zero_trust_access_tag.tags["engineers"].name]
   session_duration             = "0s"
   custom_deny_url              = "https://denied.tips-of-mine.org/"
   custom_non_identity_deny_url = "https://denied.tips-of-mine.org/"
diff --git a/Access_Controls-Applications-ssh.tf b/Access_Controls-Applications-ssh.tf
index 2f80890..cb4f330 100644
--- a/Access_Controls-Applications-ssh.tf
+++ b/Access_Controls-Applications-ssh.tf
@@ -14,7 +14,7 @@ resource "cloudflare_zero_trust_access_application" "cloudflare_app_ssh_browser"
   name                         = var.cloudflare_browser_ssh_app_name
   app_launcher_visible         = true
   logo_url                     = "https://cdn.iconscout.com/icon/free/png-256/free-database-icon-download-in-svg-png-gif-file-formats--ui-elements-pack-user-interface-icons-444649.png"
-  tags                         = ["engineers"]
+  tags                         = [cloudflare_zero_trust_access_tag.tags["engineers"].name]
   session_duration             = "0s"
   custom_deny_url              = "https://denied.tips-of-mine.org/"
   custom_non_identity_deny_url = "https://denied.tips-of-mine.org/"
diff --git a/Access_Controls-Applications-vnc.tf b/Access_Controls-Applications-vnc.tf
index 92ca3a0..1205298 100644
--- a/Access_Controls-Applications-vnc.tf
+++ b/Access_Controls-Applications-vnc.tf
@@ -14,7 +14,7 @@ resource "cloudflare_zero_trust_access_application" "cloudflare_app_vnc_browser"
   name                         = var.cloudflare_browser_vnc_app_name
   app_launcher_visible         = true
   logo_url                     = "https://blog.zwindler.fr/2015/07/vnc.png"
-  tags                         = ["engineers"]
+  tags                         = [cloudflare_zero_trust_access_tag.tags["engineers"].name]
   session_duration             = "0s"
   custom_deny_url              = "https://denied.tips-of-mine.org/"
   custom_non_identity_deny_url = "https://denied.tips-of-mine.org/"