diff --git a/.github/workflows/cli-release.yml b/.github/workflows/cli-release.yml
index 972183cac9..91c417127c 100644
--- a/.github/workflows/cli-release.yml
+++ b/.github/workflows/cli-release.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.25.7'
+          go-version: '1.26.1'
 
       - name: Cache Go modules
         uses: actions/cache@v4
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
index ffde825f41..e073868f03 100644
--- a/.github/workflows/codecov.yml
+++ b/.github/workflows/codecov.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.25.7'
+          go-version: '1.26.1'
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
diff --git a/.github/workflows/copilot-setup-steps.yml b/.github/workflows/copilot-setup-steps.yml
index 07bb0d6818..75ce4fe608 100644
--- a/.github/workflows/copilot-setup-steps.yml
+++ b/.github/workflows/copilot-setup-steps.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.25.7'
+          go-version: '1.26.1'
           cache: true
           cache-dependency-path: |
             gateway/**/go.sum
diff --git a/.github/workflows/platform-api-pr-check.yml b/.github/workflows/platform-api-pr-check.yml
index 4b12f602dc..14bbe69127 100644
--- a/.github/workflows/platform-api-pr-check.yml
+++ b/.github/workflows/platform-api-pr-check.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.25.7'
+          go-version: '1.26.1'
 
       - name: Go build
         run: go build ./cmd/main.go
diff --git a/.github/workflows/platform-api-release.yml b/.github/workflows/platform-api-release.yml
index 128ccffea3..bd9af7d66e 100644
--- a/.github/workflows/platform-api-release.yml
+++ b/.github/workflows/platform-api-release.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.25.7'
+          go-version: '1.26.1'
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
diff --git a/.github/workflows/sample-service-pr-check.yml b/.github/workflows/sample-service-pr-check.yml
index 9a37fb618a..73aec64a17 100644
--- a/.github/workflows/sample-service-pr-check.yml
+++ b/.github/workflows/sample-service-pr-check.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.25.7'
+          go-version: '1.26.1'
 
       - name: Go build
         run: go build ./cmd/server/
diff --git a/.github/workflows/sample-service-release.yml b/.github/workflows/sample-service-release.yml
index 3f0651bf69..5889e4a78e 100644
--- a/.github/workflows/sample-service-release.yml
+++ b/.github/workflows/sample-service-release.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.25.7'
+          go-version: '1.26.1'
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
diff --git a/cli/it/INTEGRATION-TESTS.md b/cli/it/INTEGRATION-TESTS.md
index 5e4cff6db4..96fac56282 100644
--- a/cli/it/INTEGRATION-TESTS.md
+++ b/cli/it/INTEGRATION-TESTS.md
@@ -620,7 +620,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.25.7'
+          go-version: '1.26.1'
       
       - name: Run CLI Integration Tests
         run: |
diff --git a/gateway/docker-compose.yaml b/gateway/docker-compose.yaml
index fbf007b1ad..4e014ade3f 100644
--- a/gateway/docker-compose.yaml
+++ b/gateway/docker-compose.yaml
@@ -29,7 +29,7 @@ services:
       - "9090:9090"   # REST API
       - "9094:9092"   # Admin API
       - "18000:18000" # xDS gRPC
-      - "18001:18001"
+      - "18001:18001" # xDS gRPC
       - "9011:9091"   # Metrics
     environment:
       - APIP_GW_CONTROLLER_STORAGE_TYPE=sqlite