diff --git a/apps/base/traefik-system/gatewayclass-external.yaml b/apps/base/traefik-system/gatewayclass-external.yaml
index e6693e4..db55798 100644
--- a/apps/base/traefik-system/gatewayclass-external.yaml
+++ b/apps/base/traefik-system/gatewayclass-external.yaml
@@ -4,4 +4,4 @@ kind: GatewayClass
 metadata:
   name: traefik-external
 spec:
-  controllerName: traefik.io/gateway-controller-external
+  controllerName: traefik.io/gateway-controller
diff --git a/apps/base/traefik-system/gatewayclass-internal.yaml b/apps/base/traefik-system/gatewayclass-internal.yaml
index 86de860..46039d0 100644
--- a/apps/base/traefik-system/gatewayclass-internal.yaml
+++ b/apps/base/traefik-system/gatewayclass-internal.yaml
@@ -4,4 +4,4 @@ kind: GatewayClass
 metadata:
   name: traefik-internal
 spec:
-  controllerName: traefik.io/gateway-controller-internal
+  controllerName: traefik.io/gateway-controller
diff --git a/apps/overlays/au-syd1/traefik-system/values-external.yaml b/apps/overlays/au-syd1/traefik-system/values-external.yaml
index e063b71..ea56707 100644
--- a/apps/overlays/au-syd1/traefik-system/values-external.yaml
+++ b/apps/overlays/au-syd1/traefik-system/values-external.yaml
@@ -1,8 +1,6 @@
 image:
   tag: v3.7.0
 
-additionalArguments:
-  - "--providers.kubernetesgateway.controllername=traefik.io/gateway-controller-external"
 
 podDisruptionBudget:
   enabled: true
@@ -29,6 +27,7 @@ providers:
     experimentalChannel: false
     namespaces: []
     nativeLBByDefault: false
+    labelSelector: "traefik.io/instance=external"
 
 logs:
   access:
diff --git a/apps/overlays/au-syd1/traefik-system/values-internal.yaml b/apps/overlays/au-syd1/traefik-system/values-internal.yaml
index bbfeace..172827e 100644
--- a/apps/overlays/au-syd1/traefik-system/values-internal.yaml
+++ b/apps/overlays/au-syd1/traefik-system/values-internal.yaml
@@ -1,8 +1,6 @@
 image:
   tag: v3.7.0
 
-additionalArguments:
-  - "--providers.kubernetesgateway.controllername=traefik.io/gateway-controller-internal"
 
 podDisruptionBudget:
   enabled: true
@@ -29,6 +27,7 @@ providers:
     experimentalChannel: false
     namespaces: []
     nativeLBByDefault: false
+    labelSelector: "traefik.io/instance=internal"
 
 logs:
   access: