diff --git a/gateway_setting.tf b/gateway_setting.tf
index 0aef928..f3637ef 100644
--- a/gateway_setting.tf
+++ b/gateway_setting.tf
@@ -5,70 +5,45 @@
 # 
 resource "cloudflare_zero_trust_gateway_settings" "example_zero_trust_gateway_settings" {
   account_id = local.cloudflare_account_id
-  settings = {
-    activity_log = {
-      enabled = true
-    }
-    antivirus = {
-      enabled_download_phase = false
-      enabled_upload_phase = false
-      fail_closed = false
-      notification_settings = {
-        enabled = true
-        include_context = true
-        msg = "msg"
-        support_url = "support_url"
+   block_page {
+    enabled          = true
+    name             = "Your Team Name"
+    header_text      = "This website is blocked"
+    footer_text      = "Some description"
+    logo_path        = "https://example.com/logo.png"
+    background_color = "#e8e8e8"
+  }
+
+  antivirus {
+    enabled_download_phase = true
+    enabled_upload_phase   = false
+    fail_closed            = false
+  }
+
+  proxy {
+    tcp = true
+    udp = true
+  }
+
+  logging {
+    redact_pii = true
+    settings_by_rule_type {
+      dns {
+        log_all    = true
+        log_blocks = false
+      }
+      http {
+        log_all    = true
+        log_blocks = false
+      }
+      l4 {
+        log_all    = true
+        log_blocks = false
       }
     }
-    block_page = {
-      background_color = "background_color"
-      enabled = true
-      footer_text = "--footer--"
-      header_text = "--header--"
-      include_context = true
-      logo_path = "https://logos.com/a.png"
-      mailto_address = "admin@tips-of-mine.org"
-      mailto_subject = "Blocked User Inquiry"
-      mode = ""
-      name = "Cloudflare"
-      suppress_footer = false
-      target_uri = "https://tips-of-mine.org"
-    }
-    body_scanning = {
-      inspection_mode = "deep"
-    }
-    browser_isolation = {
-      non_identity_enabled = true
-      url_browser_isolation_enabled = true
-    }
-    certificate = {
-      id = "d1b364c5-1311-466e-a194-f0e943e0799f"
-    }
-    custom_certificate = {
-      enabled = true
-      id = "d1b364c5-1311-466e-a194-f0e943e0799f"
-    }
-    extended_email_matching = {
-      enabled = true
-    }
-    fips = {
-      tls = true
-    }
-    host_selector = {
-      enabled = false
-    }
-    inspection = {
-      mode = "static"
-    }
-    protocol_detection = {
-      enabled = true
-    }
-    sandbox = {
-      enabled = true
-      fallback_action = "allow"
-    }
-    tls_decrypt = {
-      enabled = true
-    }
   }
+
+  activity_log_enabled = true
+  tls_decrypt_enabled  = false
+
 }
\ No newline at end of file