diff --git a/harnesses/composites/best-practices-opus-repo/v1/harness.yaml b/harnesses/composites/best-practices-opus-repo/v1/harness.yaml
index ab10975..b448ea5 100644
--- a/harnesses/composites/best-practices-opus-repo/v1/harness.yaml
+++ b/harnesses/composites/best-practices-opus-repo/v1/harness.yaml
@@ -5,6 +5,6 @@ description: "Best practices review agent with Opus + repo clone via SSH"
 
 layers:
   - context: best-practices/v1
-  - context: anthropic-cloud/v1
+  - context: anthropic-cloud-paul-oauth/v1
   - context: gitea-ssh/v1
   - context: agent-repo/v1
diff --git a/harnesses/composites/code-haiku-repo/v1/harness.yaml b/harnesses/composites/code-haiku-repo/v1/harness.yaml
index 9a5beed..41b3d87 100644
--- a/harnesses/composites/code-haiku-repo/v1/harness.yaml
+++ b/harnesses/composites/code-haiku-repo/v1/harness.yaml
@@ -5,6 +5,6 @@ description: "Code agent with Haiku (Anthropic cloud) + repo clone via SSH"
 
 layers:
   - context: code-methodology/v1
-  - context: anthropic-cloud/v1
+  - context: anthropic-cloud-paul-oauth/v1
   - context: gitea-ssh/v1
   - context: agent-repo/v1
diff --git a/harnesses/composites/code-haiku-tdd-repo/v1/harness.yaml b/harnesses/composites/code-haiku-tdd-repo/v1/harness.yaml
index 7349117..c56c388 100644
--- a/harnesses/composites/code-haiku-tdd-repo/v1/harness.yaml
+++ b/harnesses/composites/code-haiku-tdd-repo/v1/harness.yaml
@@ -5,7 +5,7 @@ description: "Haiku code agent with TDD enforcement — tests locked read-only,
 
 layers:
   - context: code-methodology/v1
-  - context: anthropic-cloud/v1
+  - context: anthropic-cloud-paul-oauth/v1
   - context: gitea-ssh/v1
   - context: agent-repo/v1
   - context: tdd-protect/v1
diff --git a/harnesses/composites/code-opus-repo/v1/harness.yaml b/harnesses/composites/code-opus-repo/v1/harness.yaml
index 3a6f717..532b739 100644
--- a/harnesses/composites/code-opus-repo/v1/harness.yaml
+++ b/harnesses/composites/code-opus-repo/v1/harness.yaml
@@ -5,6 +5,6 @@ description: "Code agent with Opus (Anthropic cloud) + repo clone via SSH"
 
 layers:
   - context: code-methodology/v1
-  - context: anthropic-cloud/v1
+  - context: anthropic-cloud-paul-oauth/v1
   - context: gitea-ssh/v1
   - context: agent-repo/v1
diff --git a/harnesses/composites/code-opus-tdd-repo/v1/harness.yaml b/harnesses/composites/code-opus-tdd-repo/v1/harness.yaml
index b10b27b..b5ed8d2 100644
--- a/harnesses/composites/code-opus-tdd-repo/v1/harness.yaml
+++ b/harnesses/composites/code-opus-tdd-repo/v1/harness.yaml
@@ -5,7 +5,7 @@ description: "Opus code agent with TDD enforcement — tests locked read-only, m
 
 layers:
   - context: code-methodology/v1
-  - context: anthropic-cloud/v1
+  - context: anthropic-cloud-paul-oauth/v1
   - context: gitea-ssh/v1
   - context: agent-repo/v1
   - context: tdd-protect/v1
diff --git a/harnesses/composites/code-sonnet-repo/v1/harness.yaml b/harnesses/composites/code-sonnet-repo/v1/harness.yaml
index b50204f..77f27fd 100644
--- a/harnesses/composites/code-sonnet-repo/v1/harness.yaml
+++ b/harnesses/composites/code-sonnet-repo/v1/harness.yaml
@@ -5,6 +5,6 @@ description: "Code agent with Sonnet (Anthropic cloud) + repo clone via SSH"
 
 layers:
   - context: code-methodology/v1
-  - context: anthropic-cloud/v1
+  - context: anthropic-cloud-paul-oauth/v1
   - context: gitea-ssh/v1
   - context: agent-repo/v1
diff --git a/harnesses/composites/code-sonnet-tdd-repo/v1/harness.yaml b/harnesses/composites/code-sonnet-tdd-repo/v1/harness.yaml
index 565d428..2ae479c 100644
--- a/harnesses/composites/code-sonnet-tdd-repo/v1/harness.yaml
+++ b/harnesses/composites/code-sonnet-tdd-repo/v1/harness.yaml
@@ -5,7 +5,7 @@ description: "Sonnet code agent with TDD enforcement — tests locked read-only,
 
 layers:
   - context: code-methodology/v1
-  - context: anthropic-cloud/v1
+  - context: anthropic-cloud-paul-oauth/v1
   - context: gitea-ssh/v1
   - context: agent-repo/v1
   - context: tdd-protect/v1
diff --git a/harnesses/composites/planning-opus-repo/v1/harness.yaml b/harnesses/composites/planning-opus-repo/v1/harness.yaml
index 7857676..beab8e7 100644
--- a/harnesses/composites/planning-opus-repo/v1/harness.yaml
+++ b/harnesses/composites/planning-opus-repo/v1/harness.yaml
@@ -5,6 +5,6 @@ description: "Planning agent with Opus (Anthropic cloud) + repo clone via SSH"
 
 layers:
   - context: planning/v1
-  - context: anthropic-cloud/v1
+  - context: anthropic-cloud-paul-oauth/v1
   - context: gitea-ssh/v1
   - context: agent-repo/v1
diff --git a/harnesses/composites/security-review-opus-repo/v1/harness.yaml b/harnesses/composites/security-review-opus-repo/v1/harness.yaml
index c3a5de9..59018e1 100644
--- a/harnesses/composites/security-review-opus-repo/v1/harness.yaml
+++ b/harnesses/composites/security-review-opus-repo/v1/harness.yaml
@@ -5,6 +5,6 @@ description: "Security review agent with Opus + repo clone via SSH"
 
 layers:
   - context: security-review/v1
-  - context: anthropic-cloud/v1
+  - context: anthropic-cloud-paul-oauth/v1
   - context: gitea-ssh/v1
   - context: agent-repo/v1
diff --git a/harnesses/composites/security-review-sonnet-repo/v1/harness.yaml b/harnesses/composites/security-review-sonnet-repo/v1/harness.yaml
index d156ec5..2f5a2df 100644
--- a/harnesses/composites/security-review-sonnet-repo/v1/harness.yaml
+++ b/harnesses/composites/security-review-sonnet-repo/v1/harness.yaml
@@ -5,6 +5,6 @@ description: "Security review agent with Sonnet + repo clone via SSH"
 
 layers:
   - context: security-review/v1
-  - context: anthropic-cloud/v1
+  - context: anthropic-cloud-paul-oauth/v1
   - context: gitea-ssh/v1
   - context: agent-repo/v1
diff --git a/harnesses/composites/spec-writing-opus-repo/v1/harness.yaml b/harnesses/composites/spec-writing-opus-repo/v1/harness.yaml
index 075ebf7..e48669d 100644
--- a/harnesses/composites/spec-writing-opus-repo/v1/harness.yaml
+++ b/harnesses/composites/spec-writing-opus-repo/v1/harness.yaml
@@ -5,6 +5,6 @@ description: "Spec writing agent with Opus + repo clone via SSH"
 
 layers:
   - context: spec-writing/v1
-  - context: anthropic-cloud/v1
+  - context: anthropic-cloud-paul-oauth/v1
   - context: gitea-ssh/v1
   - context: agent-repo/v1
diff --git a/harnesses/composites/spec-writing-sonnet-repo/v1/harness.yaml b/harnesses/composites/spec-writing-sonnet-repo/v1/harness.yaml
index fbc0d30..a3eae18 100644
--- a/harnesses/composites/spec-writing-sonnet-repo/v1/harness.yaml
+++ b/harnesses/composites/spec-writing-sonnet-repo/v1/harness.yaml
@@ -5,6 +5,6 @@ description: "Spec writing agent with Sonnet + repo clone via SSH"
 
 layers:
   - context: spec-writing/v1
-  - context: anthropic-cloud/v1
+  - context: anthropic-cloud-paul-oauth/v1
   - context: gitea-ssh/v1
   - context: agent-repo/v1
diff --git a/harnesses/composites/test-writing-opus-repo/v1/harness.yaml b/harnesses/composites/test-writing-opus-repo/v1/harness.yaml
index 07b7170..f2be9ec 100644
--- a/harnesses/composites/test-writing-opus-repo/v1/harness.yaml
+++ b/harnesses/composites/test-writing-opus-repo/v1/harness.yaml
@@ -5,6 +5,6 @@ description: "Test writing agent with Opus + repo clone via SSH"
 
 layers:
   - context: test-writing/v1
-  - context: anthropic-cloud/v1
+  - context: anthropic-cloud-paul-oauth/v1
   - context: gitea-ssh/v1
   - context: agent-repo/v1
diff --git a/harnesses/composites/test-writing-sonnet-repo/v1/harness.yaml b/harnesses/composites/test-writing-sonnet-repo/v1/harness.yaml
index f538132..2823eeb 100644
--- a/harnesses/composites/test-writing-sonnet-repo/v1/harness.yaml
+++ b/harnesses/composites/test-writing-sonnet-repo/v1/harness.yaml
@@ -5,6 +5,6 @@ description: "Test writing agent with Sonnet + repo clone via SSH"
 
 layers:
   - context: test-writing/v1
-  - context: anthropic-cloud/v1
+  - context: anthropic-cloud-paul-oauth/v1
   - context: gitea-ssh/v1
   - context: agent-repo/v1
diff --git a/harnesses/contexts/anthropic-cloud-paul-oauth/v1/harness.yaml b/harnesses/contexts/anthropic-cloud-paul-oauth/v1/harness.yaml
index b58f897..506edf8 100644
--- a/harnesses/contexts/anthropic-cloud-paul-oauth/v1/harness.yaml
+++ b/harnesses/contexts/anthropic-cloud-paul-oauth/v1/harness.yaml
@@ -13,6 +13,6 @@ scripts:
 
 secrets_required:
   - name: anthropic-cloud-paul-oauth
-    account_ref: "anthropic-cloud-paul-oauth.user:paul"
+    account_ref: "anthropic-cloud-paul-oauth"
     mount_path: /run/agent/secrets/anthropic-cloud-paul-oauth
     mode: "0400"
diff --git a/harnesses/contexts/anthropic-cloud/v1/harness.yaml b/harnesses/contexts/anthropic-cloud/v1/harness.yaml
deleted file mode 100644
index 4b34023..0000000
--- a/harnesses/contexts/anthropic-cloud/v1/harness.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-kind: context
-name: anthropic-cloud
-version: 1
-description: "Anthropic cloud — subscription OAuth token + pricing enforcement"
-requires: []
-provides: [claude-code]
-
-env:
-  ENFORCE_SUBSCRIPTION_PRICING: "true"
-
-secrets_files:
-  - source: ./provider.sops.env
-    target: /opt/harness/secrets/anthropic-cloud/provider.sops.env
-    encrypted: true