diff --git a/.github/workflows/claude-code-review.yml b/.github/workflows/claude-code-review.yml
index 754b9f572..19275609f 100644
--- a/.github/workflows/claude-code-review.yml
+++ b/.github/workflows/claude-code-review.yml
@@ -15,7 +15,7 @@ jobs:
       issues: read
       id-token: write
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - uses: anthropics/claude-code-action@v1
diff --git a/.github/workflows/claude.yml b/.github/workflows/claude.yml
index b00fc20b2..43ad96511 100644
--- a/.github/workflows/claude.yml
+++ b/.github/workflows/claude.yml
@@ -26,7 +26,7 @@ jobs:
       id-token: write
       actions: read
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - uses: anthropics/claude-code-action@v1
diff --git a/.github/workflows/gateway-discord.yml b/.github/workflows/gateway-discord.yml
index abcc4bb46..4801c564b 100644
--- a/.github/workflows/gateway-discord.yml
+++ b/.github/workflows/gateway-discord.yml
@@ -114,7 +114,7 @@ jobs:
       backend_config: ${{ steps.env.outputs.backend_config }}
       values_file: ${{ steps.env.outputs.values_file }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Detect changed paths
         uses: dorny/paths-filter@v3
@@ -200,7 +200,7 @@ jobs:
       cluster_endpoint: ${{ steps.outputs.outputs.cluster_endpoint }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Setup Terraform
         uses: hashicorp/setup-terraform@v3
@@ -234,7 +234,7 @@ jobs:
         continue-on-error: true
 
       - name: Configure AWS credentials via OIDC
-        uses: aws-actions/configure-aws-credentials@v4
+        uses: aws-actions/configure-aws-credentials@v6
         with:
           role-to-assume: ${{ vars.TERRAFORM_AWS_ROLE_ARN }}
           aws-region: ${{ vars.AWS_REGION || 'us-east-1' }}
@@ -397,7 +397,7 @@ jobs:
       (github.event_name == 'workflow_dispatch' && github.event.inputs.action == 'deploy')
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - uses: oven-sh/setup-bun@v2
         with:
@@ -443,7 +443,7 @@ jobs:
       image: ${{ steps.meta.outputs.tags }}
       digest: ${{ steps.build.outputs.digest }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -467,7 +467,7 @@ jobs:
 
       - name: Build and push
         id: build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: packages/services/gateway-discord
           push: true
@@ -503,7 +503,7 @@ jobs:
       contents: read
     timeout-minutes: 15
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Verify image digest (if build ran)
         if: needs.build.result == 'success'
@@ -520,7 +520,7 @@ jobs:
           echo "Image digest verified: $DIGEST"
 
       - name: Configure AWS credentials via OIDC
-        uses: aws-actions/configure-aws-credentials@v4
+        uses: aws-actions/configure-aws-credentials@v6
         with:
           role-to-assume: ${{ vars.GATEWAY_AWS_ROLE_ARN }}
           aws-region: ${{ vars.AWS_REGION }}
diff --git a/.github/workflows/gateway-webhook.yml b/.github/workflows/gateway-webhook.yml
index c8c91e15f..7f5a4fb3e 100644
--- a/.github/workflows/gateway-webhook.yml
+++ b/.github/workflows/gateway-webhook.yml
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - uses: oven-sh/setup-bun@v2
         with:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 3ff27222f..c4b59fa29 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 25
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ./.github/actions/setup-test-env
       - name: Run lint
         run: bun run lint
@@ -35,7 +35,7 @@ jobs:
     env:
       NODE_ENV: test
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ./.github/actions/setup-test-env
       - name: Run unit tests
         run: bun run test
@@ -46,7 +46,7 @@ jobs:
     env:
       NODE_ENV: test
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ./.github/actions/setup-test-env
         with:
           setup-db: "true"
@@ -59,7 +59,7 @@ jobs:
     env:
       NODE_ENV: test
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ./.github/actions/setup-test-env
         with:
           setup-db: "true"
@@ -72,7 +72,7 @@ jobs:
     env:
       NODE_ENV: test
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ./.github/actions/setup-test-env
         with:
           setup-db: "true"
@@ -85,7 +85,7 @@ jobs:
     env:
       NODE_ENV: production
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ./.github/actions/setup-test-env
       - name: Run build
         run: bun run build
@@ -97,7 +97,7 @@ jobs:
     env:
       NODE_ENV: test
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ./.github/actions/setup-test-env
         with:
           setup-db: "true"
diff --git a/docs/ONBOARDING_INTEGRATION_PLAN.md b/docs/ONBOARDING_INTEGRATION_PLAN.md
index 3648f9391..1c529a081 100644
--- a/docs/ONBOARDING_INTEGRATION_PLAN.md
+++ b/docs/ONBOARDING_INTEGRATION_PLAN.md
@@ -3,7 +3,7 @@
 > **Status**: Planning — ready for implementation  
 > **Date**: 2026-03-16  
 > **Author**: Sol (automated analysis)  
-> **Repos**: `milady-ai/milady` (develop), `elizaOS/cloud` (eliza-cloud-v2)
+> **Repos**: `milady-ai/milady` (develop), `elizaOS/cloud` (cloud)
 
 ---
 
@@ -946,7 +946,7 @@ User              milady CLI          Eliza Cloud
 | `src/config/types.milady.ts` | `CloudConfig` type |
 | `src/config/config.ts` | `loadMiladyConfig()`, `saveMiladyConfig()` |
 
-### Eliza Cloud (`elizaOS/cloud` / eliza-cloud-v2)
+### Eliza Cloud (`elizaOS/cloud` / cloud)
 
 | Path | Purpose |
 |------|---------|
diff --git a/infra/charts/gateway-discord/README.md b/infra/charts/gateway-discord/README.md
index 2db5c86cd..6b9976c91 100644
--- a/infra/charts/gateway-discord/README.md
+++ b/infra/charts/gateway-discord/README.md
@@ -125,7 +125,7 @@ helm status gateway-discord -n gateway-discord
 ```yaml
 # Image configuration
 image:
-  repository: ghcr.io/elizaos/eliza-cloud-v2/gateway-discord
+  repository: ghcr.io/elizaos/cloud/gateway-discord
   tag: latest
 
 # Resource limits
@@ -258,7 +258,7 @@ Create `github-actions-role-trust-policy.json`:
           "token.actions.githubusercontent.com:aud": "sts.amazonaws.com"
         },
         "StringLike": {
-          "token.actions.githubusercontent.com:sub": "repo:elizaOS/eliza-cloud-v2:*"
+          "token.actions.githubusercontent.com:sub": "repo:elizaOS/cloud:*"
         }
       }
     }
diff --git a/infra/charts/gateway-discord/values.yaml b/infra/charts/gateway-discord/values.yaml
index 81c31d782..f2c954b08 100644
--- a/infra/charts/gateway-discord/values.yaml
+++ b/infra/charts/gateway-discord/values.yaml
@@ -10,7 +10,7 @@ namespace: "gateway-discord"
 
 # Image configuration
 image:
-  repository: ghcr.io/elizaos/eliza-cloud-v2/gateway-discord
+  repository: ghcr.io/elizaos/cloud/gateway-discord
   tag: latest
   # Digest takes precedence over tag when set (e.g., sha256:abc123...)
   digest: ""
diff --git a/infra/local/setup.sh b/infra/local/setup.sh
index 20fbc4b05..ddf546baa 100755
--- a/infra/local/setup.sh
+++ b/infra/local/setup.sh
@@ -328,7 +328,7 @@ echo "Gateway img:  localhost:${REGISTRY_PORT}/gateway-discord:dev"
 echo "Webhook img:  localhost:${REGISTRY_PORT}/gateway-webhook:dev"
 echo ""
 echo "Next steps:"
-echo "  1. Start Eliza Cloud locally:  cd eliza-cloud-v2 && bun dev"
+echo "  1. Start Eliza Cloud locally:  cd cloud && bun dev"
 echo "  2. Check gateway logs:         kubectl logs -f -n eliza-infra -l app=gateway-discord"
 echo "  3. Check webhook gateway logs: kubectl logs -f -n eliza-infra -l app=gateway-webhook"
 echo "  4. Send a DM to the Eliza App bot on Discord"
diff --git a/infra/local/smoke-test.sh b/infra/local/smoke-test.sh
index f289e906f..c086a3e76 100755
--- a/infra/local/smoke-test.sh
+++ b/infra/local/smoke-test.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-# Smoke tests for eliza-cloud-v2 local environment.
+# Smoke tests for cloud local environment.
 # Prereq: ./setup.sh must have been run successfully.
 
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
diff --git a/infra/terraform/README.md b/infra/terraform/README.md
index 2442dd44b..204f81b2e 100644
--- a/infra/terraform/README.md
+++ b/infra/terraform/README.md
@@ -166,12 +166,12 @@ Create a file `terraform-role-trust-policy.json`:
         },
         "StringLike": {
           "token.actions.githubusercontent.com:sub": [
-            "repo:elizaOS/eliza-cloud-v2:ref:refs/heads/main",
-            "repo:elizaOS/eliza-cloud-v2:ref:refs/heads/dev",
-            "repo:elizaOS/eliza-cloud-v2:ref:refs/heads/feat/*",
-            "repo:elizaOS/eliza-cloud-v2:pull_request",
-            "repo:elizaOS/eliza-cloud-v2:environment:gateway-dev",
-            "repo:elizaOS/eliza-cloud-v2:environment:gateway-prd"
+            "repo:elizaOS/cloud:ref:refs/heads/main",
+            "repo:elizaOS/cloud:ref:refs/heads/dev",
+            "repo:elizaOS/cloud:ref:refs/heads/feat/*",
+            "repo:elizaOS/cloud:pull_request",
+            "repo:elizaOS/cloud:environment:gateway-dev",
+            "repo:elizaOS/cloud:environment:gateway-prd"
           ]
         }
       }
diff --git a/infra/terraform/tfvars/development.tfvars b/infra/terraform/tfvars/development.tfvars
index 29af0e7f7..5ea9cae90 100644
--- a/infra/terraform/tfvars/development.tfvars
+++ b/infra/terraform/tfvars/development.tfvars
@@ -44,7 +44,7 @@ node_group_capacity_type  = "ON_DEMAND"
 
 # GitHub Configuration
 github_org                 = "elizaOS"
-github_repo                = "eliza-cloud-v2"
+github_repo                = "cloud"
 create_oidc_provider       = false # GitHub OIDC provider already exists in AWS account
 create_github_actions_role = true  # Create role with EKS/ECR policies for deploy job
 
diff --git a/infra/terraform/tfvars/production.tfvars b/infra/terraform/tfvars/production.tfvars
index 429aafadd..4115ff90e 100644
--- a/infra/terraform/tfvars/production.tfvars
+++ b/infra/terraform/tfvars/production.tfvars
@@ -58,7 +58,7 @@ node_group_capacity_type  = "ON_DEMAND"
 
 # GitHub Configuration
 github_org           = "elizaOS"
-github_repo          = "eliza-cloud-v2"
+github_repo          = "cloud"
 create_oidc_provider = false # GitHub OIDC provider already exists in AWS account
 
 # Monitoring
diff --git a/infra/terraform/variables.tf b/infra/terraform/variables.tf
index f7d2f352a..6c2b26fc5 100644
--- a/infra/terraform/variables.tf
+++ b/infra/terraform/variables.tf
@@ -161,7 +161,7 @@ variable "github_org" {
 variable "github_repo" {
   description = "GitHub repository name"
   type        = string
-  default     = "eliza-cloud-v2"
+  default     = "cloud"
 }
 
 variable "create_oidc_provider" {