diff --git a/README.md b/README.md
index fefb6317d7746587c84d476f376be65e05f63dab..ce40322d4ef8c169b6e1a41b0733a59629384cee 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/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/workspace`. 
+Clone the workspace repository into `$GOPATH/src/gitlab.eclipse.org/eclipse/xfsc/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/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/workspace
+mkdir -p $GOPATH/src/gitlab.eclipse.org/eclipse/xfsc/tsa/workspace
 
 # change to the created directory
-cd $GOPATH/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/workspace
+cd $GOPATH/src/gitlab.eclipse.org/eclipse/xfsc/tsa/workspace
 
 # clone the workspace repo
-git clone git@gitlab.com:gaia-x/data-infrastructure-federation-services/tsa/workspace.git .
+git clone git@gitlab.eclipse.org:eclipse/xfsc/tsa/workspace.git .
 ```
 
 ### Checkout services repos
@@ -157,7 +157,7 @@ mkcert -install
 ```
 3. Go to the "workspace" directory if not there already:  
 ```shell
-cd $GOPATH/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/workspace
+cd $GOPATH/src/git@gitlab.eclipse.org:eclipse/xfsc/tsa/workspace.git/workspace
 ```
 4. Create the certificate for the localhost:  
 ```shell
diff --git a/docker-compose.yml b/docker-compose.yml
index 98be4cc6a328f2ca4e0fb9f8209bdb2030a56aa4..13c548155242ce451ddf05230c82adcf33f36423 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,10 +19,10 @@ services:
   policy:
     container_name: policy
     build:
-      context: $GOPATH/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/policy
+      context: $GOPATH/src/gitlab.eclipse.org/eclipse/xfsc/tsa/policy
       dockerfile: deployment/compose/Dockerfile
     volumes:
-      - "$GOPATH/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/policy:/go/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/policy"
+      - "$GOPATH/src/gitlab.eclipse.org/eclipse/xfsc/tsa/policy:/go/src/gitlab.eclipse.org/eclipse/xfsc/tsa/policy"
     env_file:
       - ./env/policy.env
     ports:
@@ -42,10 +42,10 @@ services:
   task:
     container_name: task
     build:
-      context: $GOPATH/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/task
+      context: $GOPATH/src/gitlab.eclipse.org/eclipse/xfsc/tsa/task
       dockerfile: deployment/compose/Dockerfile
     volumes:
-      - "$GOPATH/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/task:/go/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/task"
+      - "$GOPATH/src/gitlab.eclipse.org/eclipse/xfsc/tsa/task:/go/src/gitlab.eclipse.org/eclipse/xfsc/tsa/task"
     env_file:
       - ./env/task.env
     ports:
@@ -61,10 +61,10 @@ services:
   cache:
     container_name: cache
     build:
-      context: $GOPATH/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/cache
+      context: $GOPATH/src/gitlab.eclipse.org/eclipse/xfsc/tsa/cache
       dockerfile: deployment/compose/Dockerfile
     volumes:
-      - "$GOPATH/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/cache:/go/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/cache"
+      - "$GOPATH/src/gitlab.eclipse.org/eclipse/xfsc/tsa/cache:/go/src/gitlab.eclipse.org/eclipse/xfsc/tsa/cache"
     env_file:
       - ./env/cache.env
     ports:
@@ -80,10 +80,10 @@ services:
   infohub:
     container_name: infohub
     build:
-      context: $GOPATH/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub
+      context: $GOPATH/src/gitlab.eclipse.org/eclipse/xfsc/tsa/infohub
       dockerfile: deployment/compose/Dockerfile
     volumes:
-      - "$GOPATH/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub:/go/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub"
+      - "$GOPATH/src/gitlab.eclipse.org/eclipse/xfsc/tsa/infohub:/go/src/gitlab.eclipse.org/eclipse/xfsc/tsa/infohub"
     env_file:
       - ./env/infohub.env
     ports:
@@ -101,10 +101,10 @@ services:
   signer:
     container_name: signer
     build:
-      context: $GOPATH/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/signer
+      context: $GOPATH/src/gitlab.eclipse.org/eclipse/xfsc/tsa/signer
       dockerfile: deployment/compose/Dockerfile
     volumes:
-      - "$GOPATH/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/signer:/go/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/signer"
+      - "$GOPATH/src/gitlab.eclipse.org/eclipse/xfsc/tsa/signer:/go/src/gitlab.eclipse.org/eclipse/xfsc/tsa/signer"
     env_file:
       - ./env/signer.env
     ports:
@@ -121,10 +121,10 @@ services:
   login:
     container_name: login
     build:
-      context: $GOPATH/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/login
+      context: $GOPATH/src/gitlab.eclipse.org/eclipse/xfsc/tsa/login
       dockerfile: deployment/compose/Dockerfile
     volumes:
-      - "$GOPATH/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/login:/go/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/login"
+      - "$GOPATH/src/gitlab.eclipse.org/eclipse/xfsc/tsa/login:/go/src/gitlab.eclipse.org/eclipse/xfsc/tsa/login"
     env_file:
       - ./env/login.env
     ports:
diff --git a/setup.sh b/setup.sh
index eab58a03def29357aa0332b4f116279c89f32a91..7cd225da7d3c1aceb1c7b52e917999037c356b34 100755
--- a/setup.sh
+++ b/setup.sh
@@ -32,10 +32,10 @@ function pull() {
 }
 
 # getServices clones or pulls the services with separate repos
-# in ${GOPATH}/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa
+# in ${GOPATH}/src/gitlab.eclipse.org/eclipse/xfsc/tsa
 function getServices() {
-  local GAIAX_TSA_DIR="${GOPATH}/src/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa"
-  mkdir -p "${GAIAX_TSA_DIR}" && cd "$_"
+  local XFSC_TSA_DIR="${GOPATH}/src/gitlab.eclipse.org/eclipse/xfsc/tsa"
+  mkdir -p "${XFSC_TSA_DIR}" && cd "$_"
 
   local services=(
     "cache"
@@ -54,10 +54,10 @@ function getServices() {
       continue
     fi
 
-    mkdir -p "$GAIAX_TSA_DIR/$repo" && pushd "$GAIAX_TSA_DIR/$repo"
+    mkdir -p "$XFSC_TSA_DIR/$repo" && pushd "$XFSC_TSA_DIR/$repo"
 
-    echo "Cloning $repo repository to $GAIAX_TSA_DIR/$repo"
-    git clone "ssh://git@gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/${repo}.git" .
+    echo "Cloning $repo repository to $XFSC_TSA_DIR/$repo"
+    git clone "ssh://git@gitlab.eclipse.org/eclipse/xfsc/tsa/${repo}.git" .
     if [ ! -d "./vendor" ]; then
       go mod tidy && go mod vendor # download dependencies to vendor
     fi