diff --git a/packages/access-client/test/agent-use-cases.test.js b/packages/access-client/test/agent-use-cases.test.js
index 94a585d1..3bd2389f 100644
--- a/packages/access-client/test/agent-use-cases.test.js
+++ b/packages/access-client/test/agent-use-cases.test.js
@@ -197,7 +197,7 @@ describe('authorizeWaitAndClaim', async function () {
 describe('getAccountPlan', async function () {
   const accountWithAPlan = 'did:mailto:example.com:i-have-a-plan'
   const accountWithoutAPlan = 'did:mailto:example.com:i-have-no-plan'
-  const product = 'did:web:test.upload.storacha.network'
+  const product = 'did:web:test.up.storacha.network'
   /** @type {Record<Ucanto.DID, {product: Ucanto.DID, updatedAt: string}>} */
   const plans = {
     [accountWithAPlan]: {
diff --git a/packages/capabilities/test/capabilities/provider.test.js b/packages/capabilities/test/capabilities/provider.test.js
index 2d566bf6..7b50fd8a 100644
--- a/packages/capabilities/test/capabilities/provider.test.js
+++ b/packages/capabilities/test/capabilities/provider.test.js
@@ -18,7 +18,7 @@ describe('provider/add', function () {
       audience: service,
       with: account,
       nb: {
-        provider: 'did:web:test.upload.storacha.network',
+        provider: 'did:web:test.up.storacha.network',
         consumer: space.did(),
       },
       proofs: await createAuthorization({ agent, service, account }),
@@ -36,7 +36,7 @@ describe('provider/add', function () {
       assert.deepEqual(result.ok.audience.did(), service.did())
       assert.equal(result.ok.capability.can, 'provider/add')
       assert.deepEqual(result.ok.capability.nb, {
-        provider: 'did:web:test.upload.storacha.network',
+        provider: 'did:web:test.up.storacha.network',
         consumer: space.did(),
       })
     }
@@ -51,7 +51,7 @@ describe('provider/add', function () {
       audience: service,
       with: account,
       nb: {
-        provider: 'did:web:test.upload.storacha.network',
+        provider: 'did:web:test.up.storacha.network',
         consumer: space.did(),
       },
     })
@@ -80,7 +80,7 @@ describe('provider/add', function () {
       audience: service,
       with: account,
       nb: {
-        provider: 'did:web:test.upload.storacha.network',
+        provider: 'did:web:test.up.storacha.network',
         consumer: space.did(),
       },
       proofs: [delegation],
@@ -110,7 +110,7 @@ describe('provider/add', function () {
       audience: service,
       with: account,
       nb: {
-        provider: 'did:web:test.upload.storacha.network',
+        provider: 'did:web:test.up.storacha.network',
         consumer: space.did(),
       },
       proofs: [attestation],
@@ -135,7 +135,7 @@ describe('provider/add', function () {
         with: bobAccount.did(),
         // @ts-ignore
         nb: {
-          provider: 'did:web:test.upload.storacha.network',
+          provider: 'did:web:test.up.storacha.network',
         },
       })
     }, /Error: Invalid 'nb' - Object contains invalid field "consumer"/)
@@ -149,7 +149,7 @@ describe('provider/add', function () {
         audience: service,
         with: bobAccount.did(),
         nb: {
-          provider: 'did:web:test.upload.storacha.network',
+          provider: 'did:web:test.up.storacha.network',
           // @ts-expect-error
           consumer: 'did:mailto:storacha.network:user',
         },
@@ -166,7 +166,7 @@ describe('provider/add', function () {
         with: bobAccount.did(),
         // @ts-expect-error - missing provider
         nb: {
-          // provider: 'did:web:test.upload.storacha.network',
+          // provider: 'did:web:test.up.storacha.network',
           consumer: bob.did(),
         },
       })
@@ -197,7 +197,7 @@ describe('provider/add', function () {
       audience: service,
       with: account,
       nb: {
-        provider: 'did:web:test.upload.storacha.network',
+        provider: 'did:web:test.up.storacha.network',
         consumer: space.did(),
       },
       proofs: [
@@ -206,7 +206,7 @@ describe('provider/add', function () {
           audience: bob,
           with: account,
           nb: {
-            provider: 'did:web:test.upload.storacha.network',
+            provider: 'did:web:test.up.storacha.network',
             consumer: space.did(),
           },
           proofs: await createAuthorization({ agent, service, account }),
@@ -233,7 +233,7 @@ describe('provider/add', function () {
       audience: service,
       with: account,
       nb: {
-        provider: 'did:web:test.upload.storacha.network',
+        provider: 'did:web:test.up.storacha.network',
         consumer: space.did(),
       },
       proofs: [
@@ -242,7 +242,7 @@ describe('provider/add', function () {
           audience: bob,
           with: account,
           nb: {
-            provider: 'did:web:test.upload.storacha.network',
+            provider: 'did:web:test.up.storacha.network',
           },
           proofs: await createAuthorization({ agent, service, account }),
         }),
@@ -268,7 +268,7 @@ describe('provider/add', function () {
       audience: service,
       with: account,
       nb: {
-        provider: 'did:web:test.upload.storacha.network',
+        provider: 'did:web:test.up.storacha.network',
         consumer: space.did(),
       },
       proofs: [
@@ -303,7 +303,7 @@ describe('provider/add', function () {
       audience: service,
       with: account,
       nb: {
-        provider: 'did:web:test.upload.storacha.network',
+        provider: 'did:web:test.up.storacha.network',
         consumer: bob.did(),
       },
       proofs: [
@@ -338,7 +338,7 @@ describe('provider/add', function () {
       audience: service,
       with: account,
       nb: {
-        provider: 'did:web:test.upload.storacha.network',
+        provider: 'did:web:test.up.storacha.network',
         consumer: bob.did(),
       },
       proofs: [
@@ -379,7 +379,7 @@ describe('provider/add', function () {
       audience: service,
       with: 'did:mailto:mallory.com:bob',
       nb: {
-        provider: 'did:web:test.upload.storacha.network',
+        provider: 'did:web:test.up.storacha.network',
         consumer: bob.did(),
       },
       proofs: [
@@ -428,7 +428,7 @@ describe('provider/add', function () {
           with: account.did(),
           nb: {
             consumer: space.did(),
-            provider: 'did:web:test.upload.storacha.network',
+            provider: 'did:web:test.up.storacha.network',
           },
           // NOTE: no proofs!
         })
diff --git a/packages/capabilities/test/helpers/fixtures.js b/packages/capabilities/test/helpers/fixtures.js
index 11bbd15b..29d4c249 100644
--- a/packages/capabilities/test/helpers/fixtures.js
+++ b/packages/capabilities/test/helpers/fixtures.js
@@ -31,7 +31,7 @@ export const malloryAccount = Absentee.from({
 
 export const service = Signer.parse(
   'MgCYKXoHVy7Vk4/QjcEGi+MCqjntUiasxXJ8uJKY0qh11e+0Bs8WsdqGK7xothgrDzzWD0ME7ynPjz2okXDh8537lId8='
-).withDID('did:web:test.upload.storacha.network')
+).withDID('did:web:test.up.storacha.network')
 
 export const readmeCID = parseLink(
   'bafybeihqfdg2ereoijjoyrqzr2x2wsasqm2udurforw7pa3tvbnxhojao4'
diff --git a/packages/cli/README.md b/packages/cli/README.md
index 22f4aa53..9071b7f4 100644
--- a/packages/cli/README.md
+++ b/packages/cli/README.md
@@ -271,23 +271,23 @@ Default `storacha-cli`
 
 ### `STORACHA_SERVICE_URL`
 
-`storacha` CLI will use the w3up service at https://upload.storacha.network. If you would like
+`storacha` CLI will use the w3up service at https://up.storacha.network. If you would like
 to use a different w3up-compatible service, set `STORACHA_SERVICE_DID` and `STORACHA_SERVICE_URL` environment variables to set the service DID and URL endpoint.
 
-Default `https://upload.storacha.network`
+Default `https://up.storacha.network`
 
 ### `STORACHA_SERVICE_DID`
 
-`storacha` CLI will use the w3up `did:web:upload.storacha.network` as the service DID. If you would like
+`storacha` CLI will use the w3up `did:web:up.storacha.network` as the service DID. If you would like
 to use a different w3up-compatible service, set `STORACHA_SERVICE_DID` and `STORACHA_SERVICE_URL` environment variables to set the service DID and URL endpoint.
 
-Default `did:web:upload.storacha.network`
+Default `did:web:up.storacha.network`
 
 ### `STORACHA_RECEIPTS_URL`
 
 The URL at which UCAN receipts issued by the service may be fetched.
 
-Default `https://upload.storacha.network/receipt/`
+Default `https://up.storacha.network/receipt/`
 
 ## FAQ
 
diff --git a/packages/cli/test/bin.spec.js b/packages/cli/test/bin.spec.js
index 471571c8..4c5e9eb4 100644
--- a/packages/cli/test/bin.spec.js
+++ b/packages/cli/test/bin.spec.js
@@ -607,7 +607,7 @@ export const testSpace = {
     })
 
     /** @type {import('@storacha/client/types').DID<'web'>} */
-    const providerDID = 'did:web:test.upload.storacha.network'
+    const providerDID = 'did:web:test.up.storacha.network'
 
     const infoWithoutProvider = await storacha
       .args(['space', 'info'])
diff --git a/packages/upload-api/test/handlers/plan.js b/packages/upload-api/test/handlers/plan.js
index a18c197e..d3d817d7 100644
--- a/packages/upload-api/test/handlers/plan.js
+++ b/packages/upload-api/test/handlers/plan.js
@@ -12,7 +12,7 @@ export const test = {
   'an account can get plan information': async (assert, context) => {
     const account = 'did:mailto:example.com:alice'
     const billingID = 'stripe:abc123'
-    const product = 'did:web:test.upload.storacha.network'
+    const product = 'did:web:test.up.storacha.network'
     await context.plansStorage.initialize(account, billingID, product)
     const connection = connect({
       id: context.id,
diff --git a/packages/upload-api/test/helpers/context.js b/packages/upload-api/test/helpers/context.js
index 16a090ef..60cd05d3 100644
--- a/packages/upload-api/test/helpers/context.js
+++ b/packages/upload-api/test/helpers/context.js
@@ -29,7 +29,7 @@ export const createContext = async (
   const signer = await Signer.generate()
   const aggregatorSigner = await Signer.generate()
   const dealTrackerSigner = await Signer.generate()
-  const id = signer.withDID('did:web:test.upload.storacha.network')
+  const id = signer.withDID('did:web:test.up.storacha.network')
 
   const service = getMockService()
   const dealTrackerConnection = getConnection(
diff --git a/packages/upload-api/test/storage/provisions-storage.js b/packages/upload-api/test/storage/provisions-storage.js
index 169513b1..9420548c 100644
--- a/packages/upload-api/test/storage/provisions-storage.js
+++ b/packages/upload-api/test/storage/provisions-storage.js
@@ -16,7 +16,7 @@ export class ProvisionsStorage {
    *
    * @param {Array<Types.ServiceDID | string>} providers
    */
-  constructor(providers = ['did:web:test.upload.storacha.network']) {
+  constructor(providers = ['did:web:test.up.storacha.network']) {
     /**
      * @type {Record<string, Types.Provision>}
      */
diff --git a/packages/upload-api/test/util.js b/packages/upload-api/test/util.js
index 9c887162..bc54031f 100644
--- a/packages/upload-api/test/util.js
+++ b/packages/upload-api/test/util.js
@@ -29,7 +29,7 @@ export const service = ed25519
   .parse(
     'MgCYKXoHVy7Vk4/QjcEGi+MCqjntUiasxXJ8uJKY0qh11e+0Bs8WsdqGK7xothgrDzzWD0ME7ynPjz2okXDh8537lId8='
   )
-  .withDID('did:web:test.upload.storacha.network')
+  .withDID('did:web:test.up.storacha.network')
 
 /**
  * @param {import('@ucanto/interface').Principal} audience
diff --git a/packages/upload-client/src/service.js b/packages/upload-client/src/service.js
index ca8f27b8..ce73a749 100644
--- a/packages/upload-client/src/service.js
+++ b/packages/upload-client/src/service.js
@@ -2,9 +2,9 @@ import { connect } from '@ucanto/client'
 import { CAR, HTTP } from '@ucanto/transport'
 import * as DID from '@ipld/dag-ucan/did'
 
-export const serviceURL = new URL('https://upload.storacha.network')
-export const servicePrincipal = DID.parse('did:web:upload.storacha.network')
-export const receiptsEndpoint = 'https://upload.storacha.network/receipt/'
+export const serviceURL = new URL('https://up.storacha.network')
+export const servicePrincipal = DID.parse('did:web:up.storacha.network')
+export const receiptsEndpoint = 'https://up.storacha.network/receipt/'
 
 /** @type {import('@ucanto/interface').ConnectionView<import('./types.js').Service>} */
 export const connection = connect({
diff --git a/packages/w3up-client/src/service.js b/packages/w3up-client/src/service.js
index 41bdec60..01b08318 100644
--- a/packages/w3up-client/src/service.js
+++ b/packages/w3up-client/src/service.js
@@ -3,9 +3,9 @@ import { CAR, HTTP } from '@ucanto/transport'
 import * as DID from '@ipld/dag-ucan/did'
 import { receiptsEndpoint } from '@storacha/upload-client'
 
-export const accessServiceURL = new URL('https://upload.storacha.network')
+export const accessServiceURL = new URL('https://up.storacha.network')
 export const accessServicePrincipal = DID.parse(
-  'did:web:upload.storacha.network'
+  'did:web:up.storacha.network'
 )
 
 export const accessServiceConnection = client.connect({
@@ -14,9 +14,9 @@ export const accessServiceConnection = client.connect({
   channel: HTTP.open({ url: accessServiceURL, method: 'POST' }),
 })
 
-export const uploadServiceURL = new URL('https://upload.storacha.network')
+export const uploadServiceURL = new URL('https://up.storacha.network')
 export const uploadServicePrincipal = DID.parse(
-  'did:web:upload.storacha.network'
+  'did:web:up.storacha.network'
 )
 
 export const uploadServiceConnection = client.connect({
@@ -25,9 +25,9 @@ export const uploadServiceConnection = client.connect({
   channel: HTTP.open({ url: accessServiceURL, method: 'POST' }),
 })
 
-export const filecoinServiceURL = new URL('https://upload.storacha.network')
+export const filecoinServiceURL = new URL('https://up.storacha.network')
 export const filecoinServicePrincipal = DID.parse(
-  'did:web:upload.storacha.network'
+  'did:web:up.storacha.network'
 )
 
 export const filecoinServiceConnection = client.connect({
diff --git a/packages/w3up-client/test/client.test.js b/packages/w3up-client/test/client.test.js
index 0b148763..ee8d8dd2 100644
--- a/packages/w3up-client/test/client.test.js
+++ b/packages/w3up-client/test/client.test.js
@@ -834,7 +834,7 @@ export const testClient = {
   defaultProvider: {
     'should return the connection ID': async (assert) => {
       const alice = new Client(await AgentData.create())
-      assert.equal(alice.defaultProvider(), 'did:web:upload.storacha.network')
+      assert.equal(alice.defaultProvider(), 'did:web:up.storacha.network')
     },
   },
 
diff --git a/packages/w3up-client/test/coupon.test.js b/packages/w3up-client/test/coupon.test.js
index c5cefb70..2b87c7d0 100644
--- a/packages/w3up-client/test/coupon.test.js
+++ b/packages/w3up-client/test/coupon.test.js
@@ -18,7 +18,7 @@ export const testCoupon = Test.withContext({
     // Then we setup a billing for this account
     await plansStorage.set(
       account.did(),
-      'did:web:test.upload.storacha.network'
+      'did:web:test.up.storacha.network'
     )
 
     // Then we use the account to issue a coupon for the workshop
@@ -50,7 +50,7 @@ export const testCoupon = Test.withContext({
 
     const info = await alice.capability.space.info(space.did())
     assert.deepEqual(info.did, space.did())
-    assert.deepEqual(info.providers, ['did:web:test.upload.storacha.network'])
+    assert.deepEqual(info.providers, ['did:web:test.up.storacha.network'])
   },
 
   'coupon with password': async (
diff --git a/scripts/mkdelegate.js b/scripts/mkdelegate.js
index fb1f2ba1..f5dc7563 100644
--- a/scripts/mkdelegate.js
+++ b/scripts/mkdelegate.js
@@ -12,7 +12,7 @@ import { base64 } from 'multiformats/bases/base64'
 import * as DID from '@ipld/dag-ucan/did'
 
 const indexingServiceDID = 'did:web:staging.indexer.storacha.network'
-const uploadServiceDID = 'did:web:staging.upload.storacha.network'
+const uploadServiceDID = 'did:web:staging.up.storacha.network'
 const storageProviderDID = 'did:key:...'
 
 if (!process.argv[2]) {