diff --git a/terraform/webapp.tf b/terraform/webapp.tf
index d9ce768..fadf992 100644
--- a/terraform/webapp.tf
+++ b/terraform/webapp.tf
@@ -1,11 +1,3 @@
-resource "cloudflare_record" "web" {
-  zone_id = var.cloudflare_zone_id
-  name    = "web-${var.environment_tag}"
-  type    = "A"
-  value   = google_compute_address.web_lb.address
-  proxied = true
-}
-
 resource "google_cloud_run_service" "web" {
   for_each = toset(var.ui_regions)
 
@@ -36,8 +28,6 @@ resource "google_cloud_run_service" "web" {
     }
   }
 
-
-
   traffic {
     percent         = 100
     latest_revision = true
diff --git a/terraform/weblb.tf b/terraform/weblb.tf
index 86fc4e9..e56b8eb 100644
--- a/terraform/weblb.tf
+++ b/terraform/weblb.tf
@@ -1,7 +1,3 @@
-resource "google_compute_address" "web_lb" {
-  name = "lb-ip-web-${var.environment_tag}"
-}
-
 resource "google_compute_backend_service" "web_lb" {
   name = "lb-rbes-web-${var.environment_tag}"
 
@@ -24,12 +20,45 @@ resource "google_compute_target_http_proxy" "web_lb" {
   url_map = google_compute_url_map.web_lb.id
 }
 
-resource "google_compute_forwarding_rule" "web_lb" {
+resource "google_compute_global_address" "web_lb-ipv4" {
+  name       = "lb-ga-web-ipv4-${var.environment_tag}"
+  ip_version = "IPV4"
+}
+
+resource "google_compute_global_forwarding_rule" "web_lb-ipv4" {
   provider = google-beta
 
-  name   = "lb-fr-web-${var.environment_tag}"
-  target = google_compute_target_http_proxy.web_lb.id
-  ports  = ["80"]
+  name       = "lb-fr-web-ipv4-${var.environment_tag}"
+  target     = google_compute_target_http_proxy.web_lb.self_link
+  port_range = "80"
+  ip_version = "IPV4"
+}
+resource "cloudflare_record" "web-ipv4" {
+  zone_id = var.cloudflare_zone_id
+  name    = "web-${var.environment_tag}"
+  type    = "A"
+  value   = google_compute_global_forwarding_rule.web_lb-ipv4.ip_address
+  proxied = true
+}
+resource "google_compute_global_address" "web_lb-ipv6" {
+  name       = "lb-ga-web-ipv6-${var.environment_tag}"
+  ip_version = "IPV6"
+}
+resource "google_compute_global_forwarding_rule" "web_lb-ipv6" {
+  provider = google-beta
+
+  name       = "lb-fr-web-ipv6-${var.environment_tag}"
+  target     = google_compute_target_http_proxy.web_lb.self_link
+  port_range = "80"
+  ip_address = google_compute_global_address.web_lb-ipv6.address
+}
+
+resource "cloudflare_record" "web-ipv6" {
+  zone_id = var.cloudflare_zone_id
+  name    = "web-${var.environment_tag}"
+  type    = "AAAA"
+  value   = google_compute_global_forwarding_rule.web_lb-ipv6.ip_address
+  proxied = true
 }
 
 resource "google_compute_region_network_endpoint_group" "web_lb" {