diff --git a/.gitignore b/.gitignore
index 77d4633420c799e189382bea1ab669c338865703..a5b1df279b518c8ffe4c5edf399f9f03cf2f10a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 .DS_Store
 .idea/
 volumes/
-vault/vault-cluster-vault+.json
\ No newline at end of file
+vault/vault-cluster-vault+.json
diff --git a/README.md b/README.md
index df90cf276e7edf482c30fa04c27617f02ffef322..2a28c24a02ecb6243635aeb130bd66cf51892318 100644
--- a/README.md
+++ b/README.md
@@ -14,18 +14,18 @@ with environment variables which will be injected in its container.
 
 ## Setup
 
-Clone the workspace repository into `$GOPATH/src/code.vereign.com/gaiax/tsa/workspace`. Using GOPATH is important
-because it's the way the workspace will know where to find you Go source code.
+Clone the workspace repository into `$GOPATH/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/workspace`. 
+Using GOPATH is important because it's the way the workspace will know where to find you Go source code.
 
 ```sh
 # create the backend directory where the workspace will be checked out
-mkdir -p $GOPATH/src/code.vereign.com/gaiax/tsa/workspace
+mkdir -p $GOPATH/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/workspace
 
 # change to the created directory
-cd $GOPATH/src/code.vereign.com/gaiax/tsa/workspace
+cd $GOPATH/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/workspace
 
 # clone the workspace repo
-git clone git@code.vereign.com:gaiax/tsa/workspace.git .
+git clone git@gitlab.com:gaia-x/data-infrastructure-federation-services/tsa/workspace.git .
 ```
 
 ### Checkout services repos
@@ -134,7 +134,6 @@ Setting Vault __(only for local env)__:
 1. For "Type" use one of the options in [signer.env](./env/signer.env) for VAULT_SUPPORTED_KEYS
 1. Click "Create encryption key"
 
-## License
-<hr/>
+### License
 
 [Apache 2.0 license](LICENSE)
diff --git a/docker-compose.yml b/docker-compose.yml
index b5fe260f4be2e45d20bc5d78edf7a973809bdde8..2b37c7aa43cc8a4e946f6219254568b22ac79c2d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,10 +19,10 @@ services:
   policy:
     container_name: policy
     build:
-      context: $GOPATH/src/code.vereign.com/gaiax/tsa/policy
+      context: $GOPATH/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/policy
       dockerfile: deployment/compose/Dockerfile
     volumes:
-      - "$GOPATH/src/code.vereign.com/gaiax/tsa/policy:/go/src/code.vereign.com/gaiax/tsa/policy"
+      - "$GOPATH/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/policy:/go/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/policy"
     env_file:
       - ./env/policy.env
     ports:
@@ -36,10 +36,10 @@ services:
   task:
     container_name: task
     build:
-      context: $GOPATH/src/code.vereign.com/gaiax/tsa/task
+      context: $GOPATH/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/task
       dockerfile: deployment/compose/Dockerfile
     volumes:
-      - "$GOPATH/src/code.vereign.com/gaiax/tsa/task:/go/src/code.vereign.com/gaiax/tsa/task"
+      - "$GOPATH/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/task:/go/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/task"
     env_file:
       - ./env/task.env
     ports:
@@ -51,10 +51,10 @@ services:
   cache:
     container_name: cache
     build:
-      context: $GOPATH/src/code.vereign.com/gaiax/tsa/cache
+      context: $GOPATH/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/cache
       dockerfile: deployment/compose/Dockerfile
     volumes:
-      - "$GOPATH/src/code.vereign.com/gaiax/tsa/cache:/go/src/code.vereign.com/gaiax/tsa/cache"
+      - "$GOPATH/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/cache:/go/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/cache"
     env_file:
       - ./env/cache.env
     ports:
@@ -66,10 +66,10 @@ services:
   infohub:
     container_name: infohub
     build:
-      context: $GOPATH/src/code.vereign.com/gaiax/tsa/infohub
+      context: $GOPATH/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub
       dockerfile: deployment/compose/Dockerfile
     volumes:
-      - "$GOPATH/src/code.vereign.com/gaiax/tsa/infohub:/go/src/code.vereign.com/gaiax/tsa/infohub"
+      - "$GOPATH/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub:/go/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub"
     env_file:
       - ./env/infohub.env
     ports:
@@ -82,10 +82,10 @@ services:
   signer:
     container_name: signer
     build:
-      context: $GOPATH/src/code.vereign.com/gaiax/tsa/signer
+      context: $GOPATH/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/signer
       dockerfile: deployment/compose/Dockerfile
     volumes:
-      - "$GOPATH/src/code.vereign.com/gaiax/tsa/signer:/go/src/code.vereign.com/gaiax/tsa/signer"
+      - "$GOPATH/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/signer:/go/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/signer"
     env_file:
       - ./env/signer.env
     ports:
diff --git a/setup.sh b/setup.sh
index 7863a1e581356e9a1ee8a19ab173bd51b52bdb99..d5c86ffa7cf040e8b8a21117481b80595b8ca49b 100755
--- a/setup.sh
+++ b/setup.sh
@@ -8,7 +8,7 @@
 # environment, the email of the git repos will be set to an empty value.
 # For best experience, set the variable in your .bashrc, .zshrc, etc.
 #
-# export email="lyuben.penkovski@vereign.com"
+# export email="myemail@company.com"
 # ------------
 
 # pull the main branch of a given git repository.
@@ -32,9 +32,9 @@ function pull() {
 }
 
 # getServices clones or pulls the services with separate repos
-# in ${GOPATH}/src/code.vereign.com/gaiax/tsa
+# in ${GOPATH}/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa
 function getServices() {
-  local GAIAX_TSA_DIR="${GOPATH}/src/code.vereign.com/gaiax/tsa"
+  local GAIAX_TSA_DIR="${GOPATH}/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa"
   mkdir -p "${GAIAX_TSA_DIR}" && cd "$_"
 
   local services=(
@@ -56,7 +56,7 @@ function getServices() {
     mkdir -p "$GAIAX_TSA_DIR/$repo" && pushd "$GAIAX_TSA_DIR/$repo"
 
     echo "Cloning $repo repository to $GAIAX_TSA_DIR/$repo"
-    git clone "ssh://git@code.vereign.com/gaiax/tsa/${repo}.git" .
+    git clone "ssh://git@gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/${repo}.git" .
     if [ ! -d "./vendor" ]; then
       go mod tidy && go mod vendor # download dependencies to vendor
     fi