diff --git a/enos/enos-scenario-e2e-ui-aws.hcl b/enos/enos-scenario-e2e-ui-aws.hcl
index 7fc088e015..7817885b78 100644
--- a/enos/enos-scenario-e2e-ui-aws.hcl
+++ b/enos/enos-scenario-e2e-ui-aws.hcl
@@ -75,6 +75,10 @@ scenario "e2e_ui_aws" {
     }
   }
 
+  locals {
+    egress_tag = "egress"
+  }
+
   step "create_boundary_cluster" {
     module = module.aws_boundary
     depends_on = [
@@ -98,6 +102,7 @@ scenario "e2e_ui_aws" {
       vpc_tag_module           = step.create_base_infra.vpc_tag_module
       worker_count             = var.worker_count
       worker_instance_type     = var.worker_instance_type
+      worker_type_tags         = [local.egress_tag]
     }
   }
 
@@ -200,6 +205,7 @@ scenario "e2e_ui_aws" {
       aws_secret_access_key     = step.iam_setup.secret_access_key
       aws_host_set_filter       = step.create_tag_inputs.tag_string
       aws_host_set_ips          = step.create_targets_with_tag.target_ips
+      worker_tag_egress         = local.egress_tag
     }
   }
 
diff --git a/enos/enos-scenario-e2e-ui-docker.hcl b/enos/enos-scenario-e2e-ui-docker.hcl
index 8795810360..7e81af6b52 100644
--- a/enos/enos-scenario-e2e-ui-docker.hcl
+++ b/enos/enos-scenario-e2e-ui-docker.hcl
@@ -116,6 +116,25 @@ scenario "e2e_ui_docker" {
   }
 
   step "create_worker" {
+    module = module.docker_worker
+    depends_on = [
+      step.create_docker_network,
+      step.build_boundary_docker_image,
+      step.create_boundary
+    ]
+    variables {
+      image_name       = matrix.builder == "crt" ? var.boundary_docker_image_name : step.build_boundary_docker_image.image_name
+      boundary_license = var.boundary_edition != "oss" ? step.read_license.license : ""
+      config_file      = "worker-config.hcl"
+      container_name   = "worker"
+      initial_upstream = step.create_boundary.upstream_address
+      network_name     = [local.network_cluster]
+      tags             = [local.egress_tag]
+      port             = "9402"
+    }
+  }
+
+  step "create_worker_token" {
     module = module.docker_worker
     depends_on = [
       step.create_docker_network,
@@ -126,11 +145,11 @@ scenario "e2e_ui_docker" {
       image_name              = matrix.builder == "crt" ? var.boundary_docker_image_name : step.build_boundary_docker_image.image_name
       boundary_license        = var.boundary_edition != "oss" ? step.read_license.license : ""
       config_file             = "worker-config-worker-led.hcl"
-      container_name          = "worker"
+      container_name          = "worker_token"
       initial_upstream        = step.create_boundary.upstream_address
       network_name            = [local.network_cluster]
-      tags                    = [local.egress_tag]
-      port                    = "9402"
+      tags                    = ["token"]
+      port                    = "9502"
       worker_led_registration = true
     }
   }
@@ -179,7 +198,8 @@ scenario "e2e_ui_docker" {
       ldap_user_name            = step.create_ldap_server.user_name
       ldap_user_password        = step.create_ldap_server.user_password
       ldap_group_name           = step.create_ldap_server.group_name
-      worker_token              = step.create_worker.worker_led_token
+      worker_token              = step.create_worker_token.worker_led_token
+      worker_tag_egress         = local.egress_tag
     }
   }
 }