diff --git a/codegen/codegen.toml b/codegen/codegen.toml
index e5c547a01..9f9088fb1 100644
--- a/codegen/codegen.toml
+++ b/codegen/codegen.toml
@@ -129,12 +129,10 @@ extra_codegen_args = [
 
 
 [csharp]
-extra_shell_commands = [
-    "perl -pi -e 's/namespace Svix/namespace Svix.ApiInternal/g' csharp/Svix/ApiInternal/*.cs",
-]
 [[csharp.task]]
 template = "templates/csharp/api_resource.cs.jinja"
 output_dir = "csharp/Svix"
+extra_codegen_args = ["--context={\"namespace\":\"Svix\"}"]
 [[csharp.task]]
 template = "templates/csharp/component_type.cs.jinja"
 output_dir = "csharp/Svix/Models"
@@ -143,18 +141,17 @@ extra_codegen_args = ["--include-op-id=v1.endpoint.auto-config.update"]
 template = "templates/csharp/api_resource.cs.jinja"
 output_dir = "csharp/Svix/ApiInternal"
 extra_codegen_args = [
+    "--context={\"namespace\":\"Svix.ApiInternal\"}",
     "--include-mode=only-specified",
     "--include-op-id=v1.endpoint.auto-config.update",
 ]
 
 
 [java]
-extra_shell_commands = [
-    "perl -pi -e 's/package com\\.svix\\.api/package com.svix.internalapi/g' java/lib/src/main/java/com/svix/internalapi/*.java",
-]
 [[java.task]]
 template = "templates/java/api_resource.java.jinja"
 output_dir = "java/lib/src/main/java/com/svix/api"
+extra_codegen_args = ["--context={\"package\":\"com.svix.api\"}"]
 [[java.task]]
 template = "templates/java/operation_options.java.jinja"
 output_dir = "java/lib/src/main/java/com/svix/api"
@@ -166,15 +163,12 @@ extra_codegen_args = ["--include-op-id=v1.endpoint.auto-config.update"]
 template = "templates/java/api_resource.java.jinja"
 output_dir = "java/lib/src/main/java/com/svix/internalapi"
 extra_codegen_args = [
+    "--context={\"package\":\"com.svix.internalapi\"}",
     "--include-mode=only-specified",
     "--include-op-id=v1.endpoint.auto-config.update",
 ]
 
 [go]
-extra_shell_commands = [
-    "perl -pi -e 's/package svix/package internalapi/g' go/internalapi/management*",
-    "perl -pi -e 's/package svix/package internalapi/g' go/internalapi/endpoint*",
-]
 extra_codegen_args = ["-e=v1.health.get"]
 
 [[go.task]]
@@ -183,6 +177,10 @@ output_dir = "go"
 [[go.task]]
 template = "templates/go/api_resource.go.jinja"
 output_dir = "go"
+extra_codegen_args = [
+    "--context={\"package\":\"svix\"}",
+    "-e=v1.health.get",
+]
 [[go.task]]
 template = "templates/go/component_type_summary.go.jinja"
 output_dir = "go"
@@ -209,6 +207,7 @@ template = "templates/go/api_resource.go.jinja"
 output_dir = "go/internalapi"
 input_files = ["lib-openapi.json"]
 extra_codegen_args = [
+    "--context={\"package\":\"internalapi\"}",
     # This is a limited list of operations required by terraform
     "--include-mode=only-specified",
     "--include-op-id=v1.management.environment.list",
@@ -237,9 +236,6 @@ output_dir = "kotlin/lib/src/main/kotlin"
 
 
 [php]
-extra_shell_commands = [
-    "perl -pi -e 's/^namespace Svix\\\\Api;/namespace Svix\\\\ApiInternal;/g' php/src/ApiInternal/*.php",
-]
 extra_codegen_args = [
     # ingest requires struct enums and is excluded from initial release
     "--exclude-op-id=v1.ingest.source.list",
@@ -262,10 +258,19 @@ extra_codegen_args = [
 [[php.task]]
 template = "templates/php/api_resource.php.jinja"
 output_dir = "php/src/Api"
+extra_codegen_args = [
+    "--context={\"namespace\":\"Svix\\\\Api\"}",
+    "--exclude-op-id=v1.ingest.source.list",
+    "--exclude-op-id=v1.ingest.source.create",
+    "--exclude-op-id=v1.ingest.source.get",
+    "--exclude-op-id=v1.ingest.source.update",
+    "--exclude-op-id=v1.ingest.source.delete",
+]
 [[php.task]]
 template = "templates/php/api_resource.php.jinja"
 output_dir = "php/src/ApiInternal"
 extra_codegen_args = [
+    "--context={\"namespace\":\"Svix\\\\ApiInternal\"}",
     "--include-mode=only-specified",
     "--include-op-id=v1.endpoint.auto-config.update",
 ]
diff --git a/codegen/templates/csharp/api_resource.cs.jinja b/codegen/templates/csharp/api_resource.cs.jinja
index ac524fb61..bc5814447 100644
--- a/codegen/templates/csharp/api_resource.cs.jinja
+++ b/codegen/templates/csharp/api_resource.cs.jinja
@@ -8,7 +8,7 @@ using Microsoft.Extensions.Logging;
 {%- set api_name %}{{ r_name_pascal_case }}Api{% endset %}
 
 
-namespace Svix
+namespace {{ context.namespace }}
 {
 {# <Resource><Operation>Options #}
 {%- for op in resource.operations -%}
diff --git a/codegen/templates/go/api_resource.go.jinja b/codegen/templates/go/api_resource.go.jinja
index 3e02e33a9..cd805531a 100644
--- a/codegen/templates/go/api_resource.go.jinja
+++ b/codegen/templates/go/api_resource.go.jinja
@@ -1,7 +1,7 @@
 {% set resource_type_name = resource.name | to_upper_camel_case -%}
 {% set resource_self_name = resource.name | to_lower_camel_case -%}
 // Package svix this file is @generated DO NOT EDIT
-package svix
+package {{ context.package }}
 
 import (
 	"fmt"
diff --git a/codegen/templates/java/api_resource.java.jinja b/codegen/templates/java/api_resource.java.jinja
index 12013d07a..2dc062ac5 100644
--- a/codegen/templates/java/api_resource.java.jinja
+++ b/codegen/templates/java/api_resource.java.jinja
@@ -1,6 +1,6 @@
 {% set resource_type_name = resource.name | to_upper_camel_case -%}
 // this file is @generated
-package com.svix.api;
+package {{ context.package }};
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/codegen/templates/php/api_resource.php.jinja b/codegen/templates/php/api_resource.php.jinja
index 25da15993..c99fb9e44 100644
--- a/codegen/templates/php/api_resource.php.jinja
+++ b/codegen/templates/php/api_resource.php.jinja
@@ -3,7 +3,7 @@
 // this file is @generated
 declare(strict_types=1);
 
-namespace Svix\Api;
+namespace {{ context.namespace }};
 
 use Svix\Exception\ApiException;
 use Svix\Request\SvixHttpClient;
diff --git a/regen_openapi.py b/regen_openapi.py
index 22ab109fc..f8161993b 100755
--- a/regen_openapi.py
+++ b/regen_openapi.py
@@ -18,7 +18,7 @@
     print("Python 3.11 or greater is required to run the codegen")
     exit(1)
 
-OPENAPI_CODEGEN_IMAGE = "ghcr.io/svix/openapi-codegen:20260505-364"
+OPENAPI_CODEGEN_IMAGE = "ghcr.io/svix/openapi-codegen:20260528-375"
 DEBUG = os.getenv("DEBUG") is not None
 GREEN = "\033[92m"
 BLUE = "\033[94m"