diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 795e105..cdbd2aa 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -85,7 +85,7 @@ jobs:
         uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
         with:
           images: |
-            ghcr.io/nginxinc/kic-test-${{ matrix.type }}-server
+            ghcr.io/nginx/kic-test-${{ matrix.type }}-server
           tags: |
             type=edge
             type=ref,event=pr
@@ -115,7 +115,7 @@ jobs:
         continue-on-error: true
         id: scan
         with:
-          image: ghcr.io/nginxinc/kic-test-${{ matrix.type }}-server:${{ steps.meta.outputs.version }}
+          image: ghcr.io/nginx/kic-test-${{ matrix.type }}-server:${{ steps.meta.outputs.version }}
           only-fixed: true
           add-cpes-if-none: true
 
@@ -153,7 +153,7 @@ jobs:
         uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
         with:
           images: |
-            ghcr.io/nginxinc/kic-test-grpc-server
+            ghcr.io/nginx/kic-test-grpc-server
           tags: |
             type=edge
             type=ref,event=pr
@@ -182,7 +182,7 @@ jobs:
         continue-on-error: true
         id: scan
         with:
-          image: ghcr.io/nginxinc/kic-test-grpc-server:${{ steps.meta.outputs.version }}
+          image: ghcr.io/nginx/kic-test-grpc-server:${{ steps.meta.outputs.version }}
           only-fixed: true
           add-cpes-if-none: true
 
@@ -220,7 +220,7 @@ jobs:
         uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
         with:
           images: |
-            ghcr.io/nginxinc/kic-test-dos-server
+            ghcr.io/nginx/kic-test-dos-server
           tags: |
             type=edge
             type=ref,event=pr
@@ -249,7 +249,7 @@ jobs:
         continue-on-error: true
         id: scan
         with:
-          image: ghcr.io/nginxinc/kic-test-dos-server:${{ steps.meta.outputs.version }}
+          image: ghcr.io/nginx/kic-test-dos-server:${{ steps.meta.outputs.version }}
           only-fixed: true
           add-cpes-if-none: true
 
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index 443756d..7d9e31d 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -17,7 +17,7 @@ jobs:
           sparse-checkout: |
             labeler.yml
           sparse-checkout-cone-mode: false
-          repository: nginxinc/k8s-common
+          repository: nginx/k8s-common
 
       - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
         with:
diff --git a/CODEOWNERS b/CODEOWNERS
index 9934150..e09494f 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1 +1 @@
-* @nginxinc/kic
+* @nginx/kic
diff --git a/README.md b/README.md
index 307f7dd..1828d93 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # KIC Test Containers
 
-This repository contains the Dockerfiles and code for the test containers used in the [Kubernetes Ingress Controller](https://github.com/nginxinc/kubernetes-ingress).
+This repository contains the Dockerfiles and code for the test containers used in the [Kubernetes Ingress Controller](https://github.com/nginx/kubernetes-ingress).
 
 ## Building the containers for local testing
 
@@ -19,5 +19,5 @@ make grpc-server
 
 ## Publishing the containers
 
-The containers are published to the [NGINX GitHub Container Registry](https://github.com/orgs/nginxinc/packages?repo_name=kic-test-containers)
+The containers are published to the [NGINX GitHub Container Registry](https://github.com/orgs/nginx/packages?repo_name=kic-test-containers)
 when a new tag is created in this repository. You can see the packages on the right side of this page.
diff --git a/go.mod b/go.mod
index f7c245f..77df78f 100644
--- a/go.mod
+++ b/go.mod
@@ -1,3 +1,3 @@
-module github.com/nginxinc/kic-test-containers
+module github.com/nginx/kic-test-containers
 
 go 1.23.0
diff --git a/renovate.json b/renovate.json
index 7b7bdff..cdc7186 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
-    "github>nginxinc/k8s-common",
+    "github>nginx/k8s-common",
     "schedule:monthly"
   ]
 }
diff --git a/tcp/Dockerfile b/tcp/Dockerfile
index f20aa15..b81a74b 100644
--- a/tcp/Dockerfile
+++ b/tcp/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1.12
 FROM golang:1.23-alpine AS builder
 
-WORKDIR /go/src/github.com/nginxinc/kic-test-containers/
+WORKDIR /go/src/github.com/nginx/kic-test-containers/
 COPY tcp/main.go ./tcp/
 COPY go.mod utils.go ./
 RUN CGO_ENABLED=0 GOOS=linux go build -o /main ./tcp/
diff --git a/tcp/README.md b/tcp/README.md
index ece5667..eb70cb6 100644
--- a/tcp/README.md
+++ b/tcp/README.md
@@ -18,7 +18,7 @@ overridden.
 - Test the change:
   - Use the minikube registry ```$ eval $(minikube docker-env)```
   - Build the docker image from the root of the project ```docker build -t tcp-server .```
-  - Update the [service yaml](https://github.com/nginxinc/kubernetes-ingress/blob/main/tests/data/transport-server-tcp-load-balance/standard/service_deployment.yaml)
+  - Update the [service yaml](https://github.com/nginx/kubernetes-ingress/blob/main/tests/data/transport-server-tcp-load-balance/standard/service_deployment.yaml)
   to use the local version ```-> imagePullPolicy: Never```
   - Test the changes
 - Publish the tcp-server change
diff --git a/tcp/main.go b/tcp/main.go
index 36a1ba0..8832ed0 100644
--- a/tcp/main.go
+++ b/tcp/main.go
@@ -6,7 +6,7 @@ import (
 	"log"
 	"net"
 
-	utils "github.com/nginxinc/kic-test-containers"
+	utils "github.com/nginx/kic-test-containers"
 )
 
 var version string
diff --git a/udp/Dockerfile b/udp/Dockerfile
index f3b31b9..d841644 100644
--- a/udp/Dockerfile
+++ b/udp/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1.12
 FROM golang:1.23-alpine AS builder
 
-WORKDIR /go/src/github.com/nginxinc/kic-test-containers/
+WORKDIR /go/src/github.com/nginx/kic-test-containers/
 COPY udp/main.go ./udp/
 COPY go.mod utils.go ./
 RUN CGO_ENABLED=0 GOOS=linux go build -o /main ./udp/
diff --git a/udp/README.md b/udp/README.md
index e543250..a8098ad 100644
--- a/udp/README.md
+++ b/udp/README.md
@@ -18,7 +18,7 @@ overridden.
 - Test the change:
   - Use the minikube registry ```$ eval $(minikube docker-env)```
   - Build the docker image from the root of the project ```docker build -t udp-server .```
-  - Update the [service yaml](https://github.com/nginxinc/kubernetes-ingress/blob/main/tests/data/transport-server-udp-load-balance/standard/service_deployment.yaml)
+  - Update the [service yaml](https://github.com/nginx/kubernetes-ingress/blob/main/tests/data/transport-server-udp-load-balance/standard/service_deployment.yaml)
   to use the local version ```-> imagePullPolicy: Never```
   - Test the changes
 - Publish the upd-server change
diff --git a/udp/main.go b/udp/main.go
index b400677..f32bb32 100644
--- a/udp/main.go
+++ b/udp/main.go
@@ -7,7 +7,7 @@ import (
 	"net"
 	"os"
 
-	utils "github.com/nginxinc/kic-test-containers"
+	utils "github.com/nginx/kic-test-containers"
 )
 
 var version string