diff --git a/AGENTS.md b/AGENTS.md
index 91e1e473..8771639a 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -87,7 +87,7 @@ make undeploy               # Remove from cluster
 ## Configuration
 
 - **Credentials**: `helm install` requires `credentials.apiKey` and `credentials.authtoken`
-- **Feature Flags**: `useExperimentalGatewayApi=true` enables Gateway API support
+- **Feature Flags**: `gateway.enabled=true` enables Gateway API support
 
 ## Rules
 
diff --git a/README.md b/README.md
index c6aed890..7a4293d3 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@
     <img src="https://img.shields.io/badge/Status-Beta-orange.svg" alt="Status"/>
   </a>
    <a href="#gateway-api-status">
-    <img src="https://img.shields.io/badge/Gateway_API-preview-rgba(159%2C122%2C234)" alt="Gateway API Preivew"/>
+    <img src="https://img.shields.io/badge/Gateway_API-supported-rgba(159%2C122%2C234)" alt="Gateway API Supported"/>
   </a>
   <a href="https://ngrok.com/slack">
     <img src="https://img.shields.io/badge/Join%20Our%20Community-Slack-blue" alt="Slack"/>
diff --git a/helm/ngrok-operator/README.md b/helm/ngrok-operator/README.md
index 611360d6..25f77ecd 100644
--- a/helm/ngrok-operator/README.md
+++ b/helm/ngrok-operator/README.md
@@ -178,7 +178,6 @@ To run multiple ngrok-operator instances in the same cluster (e.g., in different
 
 | Name                             | Description                                                                                                                    | Value   |
 | -------------------------------- | ------------------------------------------------------------------------------------------------------------------------------ | ------- |
-| `useExperimentalGatewayApi`      | DEPRECATED: Use gateway.enabled instead                                                                                        |         |
 | `gateway.enabled`                | When true, Gateway API support will be enabled if the CRDs are detected. When false, Gateway API support will never be enabled | `true`  |
 | `gateway.disableReferenceGrants` | When true, disables required ReferenceGrants for cross-namespace references. Does nothing when gateway.enabled is false        | `false` |
 
diff --git a/helm/ngrok-operator/templates/_helpers.tpl b/helm/ngrok-operator/templates/_helpers.tpl
index ae24ab2f..b082b870 100644
--- a/helm/ngrok-operator/templates/_helpers.tpl
+++ b/helm/ngrok-operator/templates/_helpers.tpl
@@ -72,7 +72,7 @@ Ngrok Operator manager cli feature flags
 {{- if .Values.ingress.enabled -}}
 - --enable-feature-ingress={{ .Values.ingress.enabled }}
 {{- end }}
-{{- if .Values.useExperimentalGatewayApi | default .Values.gateway.enabled }}
+{{- if .Values.gateway.enabled }}
 - --enable-feature-gateway=true
 {{- else }}
 - --enable-feature-gateway=false
diff --git a/helm/ngrok-operator/tests/controller-deployment_test.yaml b/helm/ngrok-operator/tests/controller-deployment_test.yaml
index 3ab54223..f0529520 100644
--- a/helm/ngrok-operator/tests/controller-deployment_test.yaml
+++ b/helm/ngrok-operator/tests/controller-deployment_test.yaml
@@ -51,19 +51,8 @@ tests:
   - contains:
       path: spec.template.spec.containers[0].args
       content: --disable-reference-grants=true
-- it: Uses the new gateway.enabled value when the old one is disabled
+- it: Disables the gateway feature when gateway.enabled is false
   set:
-    useExperimentalGatewayApi: false
-    gateway.enabled: true
-  template: controller-deployment.yaml
-  documentIndex: 0 # Document 0 is the deployment since its the first template
-  asserts:
-  - contains:
-      path: spec.template.spec.containers[0].args
-      content: --enable-feature-gateway=true
-- it: Disables the gateway feature when both are false
-  set:
-    useExperimentalGatewayApi: false
     gateway.enabled: false
   template: controller-deployment.yaml
   documentIndex: 0 # Document 0 is the deployment since its the first template
@@ -71,16 +60,6 @@ tests:
   - contains:
       path: spec.template.spec.containers[0].args
       content: --enable-feature-gateway=false
-- it: Enables the gateway feature when the old value is true (backwards compatibility)
-  set:
-    useExperimentalGatewayApi: true
-    gateway.enabled: false
-  template: controller-deployment.yaml
-  documentIndex: 0 # Document 0 is the deployment since its the first template
-  asserts:
-  - contains:
-      path: spec.template.spec.containers[0].args
-      content: --enable-feature-gateway=true
 - it: Should use the specified cluster domain name
   set:
     clusterDomain: svc.example.com
diff --git a/helm/ngrok-operator/values.yaml b/helm/ngrok-operator/values.yaml
index 5fa2d3ab..351b2067 100644
--- a/helm/ngrok-operator/values.yaml
+++ b/helm/ngrok-operator/values.yaml
@@ -335,7 +335,6 @@ agent:
 ##
 ## @section Kubernetes Gateway feature configuration
 ##
-## @extra useExperimentalGatewayApi DEPRECATED: Use gateway.enabled instead
 ## @param gateway.enabled When true, Gateway API support will be enabled if the CRDs are detected. When false, Gateway API support will never be enabled
 ## @param gateway.disableReferenceGrants When true, disables required ReferenceGrants for cross-namespace references. Does nothing when gateway.enabled is false
 ##
diff --git a/tools/make/deploy.mk b/tools/make/deploy.mk
index 55a5e132..01514a1e 100644
--- a/tools/make/deploy.mk
+++ b/tools/make/deploy.mk
@@ -42,7 +42,7 @@ deploy_gateway: _deploy-check-env-vars docker-build manifests _helm_setup kind-l
 		--set-string log.level="8" \
 		--set log.stacktraceLevel=panic \
 		--set metaData.env=local,metaData.from=makefile \
-		--set useExperimentalGatewayApi=true \
+		--set gateway.enabled=true \
 		--set drainPolicy="Delete" \
 		$(HELM_DESCRIPTION_FLAG)