diff --git a/.github/workflows/as-e2e.yml b/.github/workflows/as-e2e.yml
index 1bfe39f27..535266555 100644
--- a/.github/workflows/as-e2e.yml
+++ b/.github/workflows/as-e2e.yml
@@ -16,7 +16,7 @@ jobs:
       matrix:
         include:
          # TODO: Add real HW-TEE test
-         # See https://github.com/confidential-containers/kbs/issues/223
+         # See https://github.com/confidential-containers/trustee/issues/223
           # - runner: self-hosted
           #   generate_evidence: true
           #   grpc_tee_enum: 3
diff --git a/attestation-service/README.md b/attestation-service/README.md
index cbb3ad2e6..54caab037 100644
--- a/attestation-service/README.md
+++ b/attestation-service/README.md
@@ -54,7 +54,7 @@ The AS can be built and imported as a Rust crate into any project providing atte
 As the AS API is not yet fully stable, the AS crate needs to be imported from GitHub directly:
 
 ```toml
-attestation-service = { git = "https://github.com/confidential-containers/kbs" }
+attestation-service = { git = "https://github.com/confidential-containers/trustee" }
 ```
 
 ## Server
@@ -67,8 +67,8 @@ This project provides the Attestation Service binary program that can be run as
 Build and install AS as a standalone server
 
 ```shell
-git clone https://github.com/confidential-containers/kbs
-cd kbs/attestation-service
+git clone https://github.com/confidential-containers/trustee
+cd trustee/attestation-service
 make && make install
 ```
 
@@ -86,7 +86,7 @@ The AS should be queried with a request containing
 - `init_data_hash_algorithm` - the hasing algorithm used with the other above field
 - `policy_ids` - a list of policies which the AS will use to evaluate the evidence claims
 
-For more details see [gRPC proto](https://github.com/confidential-containers/kbs/blob/main/attestation-service/protos/attestation.proto)
+For more details see [gRPC proto](https://github.com/confidential-containers/trustee/blob/main/attestation-service/protos/attestation.proto)
 
 ### Evidence format:
 
diff --git a/attestation-service/docs/grpc-as.md b/attestation-service/docs/grpc-as.md
index 908ea5564..6eb0169e8 100644
--- a/attestation-service/docs/grpc-as.md
+++ b/attestation-service/docs/grpc-as.md
@@ -14,16 +14,16 @@ Here are the steps of building and running gRPC Attestation Service:
 
 Build and install binary
 ```shell
-git clone https://github.com/confidential-containers/kbs
-cd kbs/attestation-service
+git clone https://github.com/confidential-containers/trustee
+cd trustee/attestation-service
 WORKDIR=$(pwd)
 make && make install
 ```
 
 Build and run container image
 ```shell
-git clone https://github.com/confidential-containers/kbs
-cd kbs
+git clone https://github.com/confidential-containers/trustee
+cd trustee
 docker build -t coco-as:grpc -f attestation-service/Dockerfile.as-grpc .
 ```
 
diff --git a/attestation-service/docs/restful-as.md b/attestation-service/docs/restful-as.md
index c7704b6ba..1c498cd86 100644
--- a/attestation-service/docs/restful-as.md
+++ b/attestation-service/docs/restful-as.md
@@ -10,16 +10,16 @@ Here are the steps of building and running RESTful Attestation Service:
 
 Build and install binary
 ```shell
-git clone https://github.com/confidential-containers/kbs
-cd kbs/attestation-service
+git clone https://github.com/confidential-containers/trustee
+cd trustee/attestation-service
 WORKDIR=$(pwd)
 make && make install
 ```
 
 Build and run container image
 ```shell
-git clone https://github.com/confidential-containers/kbs
-cd kbs
+git clone https://github.com/confidential-containers/trustee
+cd trustee
 docker build -t coco-as:restful -f attestation-service/Dockerfile.as-restful .
 ```
 
diff --git a/attestation-service/rvps/Dockerfile b/attestation-service/rvps/Dockerfile
index 938ab1a7a..bb74e3fe0 100644
--- a/attestation-service/rvps/Dockerfile
+++ b/attestation-service/rvps/Dockerfile
@@ -14,7 +14,7 @@ RUN cargo install --bin rvps --path attestation-service/rvps
 
 FROM debian
 
-LABEL org.opencontainers.image.source="https://github.com/confidential-containers/kbs"
+LABEL org.opencontainers.image.source="https://github.com/confidential-containers/trustee/attestation-service"
 
 COPY --from=builder /usr/local/cargo/bin/rvps /usr/local/bin/rvps
 
diff --git a/attestation-service/rvps/README.md b/attestation-service/rvps/README.md
index ee271c601..2ef475805 100644
--- a/attestation-service/rvps/README.md
+++ b/attestation-service/rvps/README.md
@@ -55,8 +55,8 @@ In this way, the RVPS can run as a single service. The [gRPC protos](../protos/r
 We can run using the following command
 
 ```bash
-git clone https://github.com/confidential-containers/kbs
-cd kbs/attestation-service/rvps
+git clone https://github.com/confidential-containers/trustee
+cd trustee/attestation-service/rvps
 make build && sudo make install
 ```
 
diff --git a/attestation-service/verifier/src/lib.rs b/attestation-service/verifier/src/lib.rs
index 464aba8fb..20c7291a2 100644
--- a/attestation-service/verifier/src/lib.rs
+++ b/attestation-service/verifier/src/lib.rs
@@ -145,7 +145,7 @@ pub trait Verifier {
     /// There will be two claims by default regardless of architectures:
     /// - `init_data_hash`: init data hash of the evidence
     /// - `report_data`: report data of the evidence
-    /// TODO: See https://github.com/confidential-containers/kbs/issues/228
+    /// TODO: See https://github.com/confidential-containers/trustee/issues/228
     async fn evaluate(
         &self,
         evidence: &[u8],
diff --git a/kbs/docker/Dockerfile.coco-as-grpc b/kbs/docker/Dockerfile.coco-as-grpc
index e6ba02f04..befa6e907 100644
--- a/kbs/docker/Dockerfile.coco-as-grpc
+++ b/kbs/docker/Dockerfile.coco-as-grpc
@@ -15,6 +15,6 @@ RUN cargo install --path kbs/src/kbs --no-default-features --features coco-as-gr
 
 FROM ubuntu:22.04
 
-LABEL org.opencontainers.image.source="https://github.com/confidential-containers/kbs"
+LABEL org.opencontainers.image.source="https://github.com/confidential-containers/trustee/kbs"
 
 COPY --from=builder /usr/local/cargo/bin/kbs /usr/local/bin/kbs
diff --git a/kbs/docker/Dockerfile.intel-trust-authority b/kbs/docker/Dockerfile.intel-trust-authority
index 0412be028..fe113265e 100644
--- a/kbs/docker/Dockerfile.intel-trust-authority
+++ b/kbs/docker/Dockerfile.intel-trust-authority
@@ -14,7 +14,7 @@ RUN cargo install --path kbs/src/kbs --no-default-features --features intel-trus
 
 FROM ubuntu:22.04
 
-LABEL org.opencontainers.image.source="https://github.com/confidential-containers/kbs"
+LABEL org.opencontainers.image.source="https://github.com/confidential-containers/trustee/kbs"
 
 RUN apt update && apt install -y ca-certificates
 
diff --git a/kbs/docs/cluster.md b/kbs/docs/cluster.md
index d6c7d8f77..d358c71c6 100644
--- a/kbs/docs/cluster.md
+++ b/kbs/docs/cluster.md
@@ -1,6 +1,6 @@
 # KBS Cluster
 
-KBS provides a simple cluster defined by `docker-compose`, include itself, [Attestation Service](https://github.com/confidential-containers/kbs/tree/main/attestation-service), [Reference Value Provider Service](https://github.com/confidential-containers/kbs/tree/main/attestation-service/rvps) and [CoCo Keyprovider](https://github.com/confidential-containers/guest-components/tree/main/attestation-agent/coco_keyprovider)
+KBS provides a simple cluster defined by `docker-compose`, include itself, [Attestation Service](https://github.com/confidential-containers/trustee/tree/main/attestation-service), [Reference Value Provider Service](https://github.com/confidential-containers/trustee/tree/main/attestation-service/rvps) and [CoCo Keyprovider](https://github.com/confidential-containers/guest-components/tree/main/attestation-agent/coco_keyprovider)
 
 Users can use very simple command to:
 - launch KBS service.