diff --git a/services/terraform/remote/service_backup.tf b/services/terraform/remote/service_backup.tf
--- a/services/terraform/remote/service_backup.tf
+++ b/services/terraform/remote/service_backup.tf
@@ -187,27 +187,21 @@
   default_action {
     type = "forward"
 
-    # Production: Simple forwarding (unchanged)
-    target_group_arn = local.is_staging ? null : aws_lb_target_group.backup_service_http.arn
-
-    # Staging: Weighted forwarding  
-    dynamic "forward" {
-      for_each = local.is_staging ? [1] : []
-      content {
-        target_group {
-          arn    = aws_lb_target_group.backup_service_http.arn
-          weight = 0 # 0% EC2
-        }
+    # Weighted forwarding for both environments
+    forward {
+      target_group {
+        arn    = aws_lb_target_group.backup_service_http.arn
+        weight = 0 # 0% EC2
+      }
 
-        target_group {
-          arn    = aws_lb_target_group.backup_service_http_fargate.arn
-          weight = 100 # 100% Fargate
-        }
+      target_group {
+        arn    = aws_lb_target_group.backup_service_http_fargate.arn
+        weight = 100 # 100% Fargate
+      }
 
-        stickiness {
-          enabled  = false
-          duration = 10
-        }
+      stickiness {
+        enabled  = false
+        duration = 10
       }
     }
   }
diff --git a/services/terraform/remote/service_blob.tf b/services/terraform/remote/service_blob.tf
--- a/services/terraform/remote/service_blob.tf
+++ b/services/terraform/remote/service_blob.tf
@@ -190,27 +190,21 @@
   default_action {
     type = "forward"
 
-    # Production: Simple forwarding (unchanged)
-    target_group_arn = local.is_staging ? null : aws_lb_target_group.blob_service_http.arn
-
-    # Staging: Weighted forwarding  
-    dynamic "forward" {
-      for_each = local.is_staging ? [1] : []
-      content {
-        target_group {
-          arn    = aws_lb_target_group.blob_service_http.arn
-          weight = 0 # 0% EC2
-        }
+    # Weighted forwarding for both environments
+    forward {
+      target_group {
+        arn    = aws_lb_target_group.blob_service_http.arn
+        weight = 0 # 0% EC2
+      }
 
-        target_group {
-          arn    = aws_lb_target_group.blob_service_http_fargate.arn
-          weight = 100 # 100% Fargate
-        }
+      target_group {
+        arn    = aws_lb_target_group.blob_service_http_fargate.arn
+        weight = 100 # 100% Fargate
+      }
 
-        stickiness {
-          enabled  = false
-          duration = 10
-        }
+      stickiness {
+        enabled  = false
+        duration = 10
       }
     }
   }
diff --git a/services/terraform/remote/service_identity.tf b/services/terraform/remote/service_identity.tf
--- a/services/terraform/remote/service_identity.tf
+++ b/services/terraform/remote/service_identity.tf
@@ -282,27 +282,21 @@
   default_action {
     type = "forward"
 
-    # Production: Simple forwarding (unchanged)
-    target_group_arn = local.is_staging ? null : aws_lb_target_group.identity_service_ws.arn
-
-    # Staging: Weighted forwarding  
-    dynamic "forward" {
-      for_each = local.is_staging ? [1] : []
-      content {
-        target_group {
-          arn    = aws_lb_target_group.identity_service_ws.arn
-          weight = 0 # 0% EC2
-        }
+    # Weighted forwarding for both environments
+    forward {
+      target_group {
+        arn    = aws_lb_target_group.identity_service_ws.arn
+        weight = 0 # 0% EC2
+      }
 
-        target_group {
-          arn    = aws_lb_target_group.identity_service_ws_fargate.arn
-          weight = 100 # 100% Fargate
-        }
+      target_group {
+        arn    = aws_lb_target_group.identity_service_ws_fargate.arn
+        weight = 100 # 100% Fargate
+      }
 
-        stickiness {
-          enabled  = false
-          duration = 10
-        }
+      stickiness {
+        enabled  = false
+        duration = 10
       }
     }
   }
@@ -323,27 +317,21 @@
   default_action {
     type = "forward"
 
-    # Production: Simple forwarding (unchanged)
-    target_group_arn = local.is_staging ? null : aws_lb_target_group.identity_service_grpc.arn
-
-    # Staging: Weighted forwarding  
-    dynamic "forward" {
-      for_each = local.is_staging ? [1] : []
-      content {
-        target_group {
-          arn    = aws_lb_target_group.identity_service_grpc.arn
-          weight = 0 # 0% EC2
-        }
+    # Weighted forwarding for both environments
+    forward {
+      target_group {
+        arn    = aws_lb_target_group.identity_service_grpc.arn
+        weight = 0 # 0% EC2
+      }
 
-        target_group {
-          arn    = aws_lb_target_group.identity_service_grpc_fargate.arn
-          weight = 100 # 100% Fargate
-        }
+      target_group {
+        arn    = aws_lb_target_group.identity_service_grpc_fargate.arn
+        weight = 100 # 100% Fargate
+      }
 
-        stickiness {
-          enabled  = true
-          duration = 10
-        }
+      stickiness {
+        enabled  = true
+        duration = 10
       }
     }
   }
diff --git a/services/terraform/remote/service_tunnelbroker.tf b/services/terraform/remote/service_tunnelbroker.tf
--- a/services/terraform/remote/service_tunnelbroker.tf
+++ b/services/terraform/remote/service_tunnelbroker.tf
@@ -321,27 +321,21 @@
   default_action {
     type = "forward"
 
-    # Production: Simple forwarding (unchanged)
-    target_group_arn = local.is_staging ? null : aws_lb_target_group.tunnelbroker_ws.arn
-
-    # Staging: Weighted forwarding  
-    dynamic "forward" {
-      for_each = local.is_staging ? [1] : []
-      content {
-        target_group {
-          arn    = aws_lb_target_group.tunnelbroker_ws.arn
-          weight = 0 # 0% EC2
-        }
+    # Weighted forwarding for both environments
+    forward {
+      target_group {
+        arn    = aws_lb_target_group.tunnelbroker_ws.arn
+        weight = 0 # 0% EC2
+      }
 
-        target_group {
-          arn    = aws_lb_target_group.tunnelbroker_ws_fargate.arn
-          weight = 100 # 100% Fargate
-        }
+      target_group {
+        arn    = aws_lb_target_group.tunnelbroker_ws_fargate.arn
+        weight = 100 # 100% Fargate
+      }
 
-        stickiness {
-          enabled  = false
-          duration = 10
-        }
+      stickiness {
+        enabled  = false
+        duration = 10
       }
     }
   }