diff --git a/Dockerfile b/Dockerfile
index 18478cceea76173a43c45c1b88c27f5d8cea7ced..798d507fd50735dfb5c2c68fda899c08f0acab36 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,9 +34,10 @@ RUN apt-get update && apt-get install -y \
   && rm -rf /var/lib/apt/lists/*
 # Copy application code
 COPY . . 
-ARG PIP_INDEX_URL
-# Install Python dependencies
-RUN python -m pip install --no-cache-dir -r requirements.txt --trusted-host gitlab.i2cat.net --extra-index-url ${PIP_INDEX_URL}
+# Install Python dependencies (use ETSI GitLab registry for TF SDK)
+RUN python -m pip install --no-cache-dir -r requirements.txt \
+  --extra-index-url https://labs.etsi.org/rep/api/v4/projects/396/packages/pypi/simple \
+  --trusted-host labs.etsi.org
 WORKDIR /usr/app/src/
 EXPOSE 8989
 # Set Gunicorn as the entrypoint
diff --git a/Dockerfile.dev b/Dockerfile.dev
index 5defc51cbd16a44e0ba7e52f1a9da62da7005a2f..b750f20217e68887d4b8d83306ce45051bc5a8ee 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -39,14 +39,14 @@ COPY ../tf-sdk /tmp/tf-sdk
 # Copy application code
 COPY . . 
 
-ARG PIP_INDEX_URL
-ARG PIP_EXTRA_INDEX_URL
 
 # Install local TF-SDK instead of the published version
 RUN pip install --no-cache-dir /tmp/tf-sdk
 
 # Install remaining Python dependencies (TF-SDK will be skipped since already installed)
-RUN python -m pip install --no-cache-dir -r requirements.txt --trusted-host gitlab.i2cat.net --extra-index-url ${PIP_EXTRA_INDEX_URL}
+RUN python -m pip install --no-cache-dir -r requirements.txt \
+  --extra-index-url https://labs.etsi.org/rep/api/v4/projects/396/packages/pypi/simple \
+  --trusted-host labs.etsi.org
 
 # Clean up
 RUN rm -rf /tmp/tf-sdk
diff --git a/requirements.txt b/requirements.txt
index f6ac059f6399c5ef3a5e50781f05407f4b0a61f7..adb5b040ac65996bdf7ed41703a4910ca7a34f2a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -36,7 +36,8 @@ referencing==0.32.0
 requests==2.32.4
 rpds-py==0.13.2
 six==1.16.0
-sunrise6g-opensdk==1.0.29
+setuptools==80.9.0
+sunrise6g-opensdk==1.0.21
 swagger-ui-bundle==0.0.9
 urllib3==2.1.0
 Werkzeug==2.2.3
diff --git a/src/deploy/federation-manager.yaml b/src/deploy/federation-manager.yaml
index d37a9543db3a7ecddb111ea57626f553b5c5a882..39b59e3a768dd96147a391358965cec0a15ec361 100644
--- a/src/deploy/federation-manager.yaml
+++ b/src/deploy/federation-manager.yaml
@@ -13,7 +13,7 @@ metadata:
   namespace: federation-manager
 data:
   config.cfg: >-
-    W2tleWNsb2FrXQpjbGllbnQxX2lkID0gb3JpZ2luYXRpbmctb3AtMQpjbGllbnQxX3NlY3JldCA9IGRkN3ZOd0Zxak5wWXdhZ2hsRXdNYncxMGcwa2xXREhiCmNsaWVudDJfaWQgPSBvcmlnaW5hdGluZy1vcC0yCmNsaWVudDJfc2VjcmV0ID0gMm1oem5FUmZXY2xMRHVWb2pZNzdMcDRRZDJyNGU4TXMKc2NvcGUgPSBmZWQtbWdtdApob3N0ID0ga2V5Y2xvYWsKcG9ydCA9IDgwODAKCltzZXJ2ZXJdCmhvc3QgPSAxMjcuMC4wLjEKcG9ydCA9IDg5ODkKcHJlZml4ID0gYXBpCnZlcnNpb24gPSB2MS4wCnByb3RvY29sID0gaHR0cAoKW21vbmdvZGJdCmhvc3QgPSBtb25nb2RiCnBvcnQgPSAyNzAxNwoKW29wX2RhdGFdCnBhcnRuZXJPUEZlZGVyYXRpb25JZCA9IGkyY2F0CnBhcnRuZXJPUENvdW50cnlDb2RlID0gRVMKcGFydG5lck9QTW9iaWxlTmV0d29ya0NvZGVfTUNDID0gMDAxCnBhcnRuZXJPUE1vYmlsZU5ldHdvcmtDb2RlX01OQyA9IDAxCnBhcnRuZXJPUEZpeGVkTmV0d29ya0NvZGUgPSAzNApwbGF0Zm9ybUNhcHMgPSBob21lUm91dGluZwplZGdlRGlzY292ZXJ5U2VydmljZUVuZFBvaW50X3BvcnQgPQplZGdlRGlzY292ZXJ5U2VydmljZUVuZFBvaW50X2ZxZG4gPSBkaXNjb3Zlcnkub3BlcmF0b3IxLmNvbQplZGdlRGlzY292ZXJ5U2VydmljZUVuZFBvaW50X2lwdjRBZGRyZXNzZXMgPQplZGdlRGlzY292ZXJ5U2VydmljZUVuZFBvaW50X2lwdjZBZGRyZXNzZXMgPQpsY21TZXJ2aWNlRW5kUG9pbnRfcG9ydCA9IDg5ODkKbGNtU2VydmljZUVuZFBvaW50X2ZxZG4gPQpsY21TZXJ2aWNlRW5kUG9pbnRfaXB2NEFkZHJlc3NlcyA9IDEyNy4wLjAuMQpsY21TZXJ2aWNlRW5kUG9pbnRfaXB2NkFkZHJlc3NlcyA9CgpbZWRnZV9jbG91ZF9wbGF0Zm9ybV0KaG9zdCA9IDE5Mi4xNjguMTIzLjQ4CnBvcnQgPSAzMDc2OQpjbGllbnRfbmFtZSA9IGkyZWRnZQpmbGF2b3VyX2lkID0gNjdmM2EwYjBlMzE4NGE4NTk1MmUxNzRkCgpbYXJ0ZWZhY3RfbWFuYWdlcl0KaG9zdCA9IDE5Mi4xNjguMTIzLjIzNwpwb3J0ID0gMzA3NjkKZW5hYmxlZCA9IGZhbHNlCmRzdF9yZWdpc3RyeSA9CmRzdF91c2VybmFtZSA9CmRzdF9wYXNzd29yZCA9CmRzdF90b2tlbiA9
+    W2tleWNsb2FrXQpjbGllbnQxX2lkID0gb3JpZ2luYXRpbmctb3AtMQpjbGllbnQxX3NlY3JldCA9IGRkN3ZOd0Zxak5wWXdhZ2hsRXdNYncxMGcwa2xXREhiCmNsaWVudDJfaWQgPSBvcmlnaW5hdGluZy1vcC0yCmNsaWVudDJfc2VjcmV0ID0gMm1oem5FUmZXY2xMRHVWb2pZNzdMcDRRZDJyNGU4TXMKc2NvcGUgPSBmZWQtbWdtdApob3N0ID0ga2V5Y2xvYWsKcG9ydCA9IDgwODAKcmVhbG0gPSBmZWRlcmF0aW9uCgpbc2VydmVyXQpob3N0ID0gMTI3LjAuMC4xCnBvcnQgPSA4OTg5CnByZWZpeCA9IGFwaQp2ZXJzaW9uID0gdjEuMApwcm90b2NvbCA9IGh0dHAKClttb25nb2RiXQpob3N0ID0gbW9uZ29kYgpwb3J0ID0gMjcwMTcKCltvcF9kYXRhXQpwYXJ0bmVyT1BGZWRlcmF0aW9uSWQgPSBpMmNhdApwYXJ0bmVyT1BDb3VudHJ5Q29kZSA9IEVTCnBhcnRuZXJPUE1vYmlsZU5ldHdvcmtDb2RlX01DQyA9IDAwMQpwYXJ0bmVyT1BNb2JpbGVOZXR3b3JrQ29kZV9NTkMgPSAwMQpwYXJ0bmVyT1BGaXhlZE5ldHdvcmtDb2RlID0gMzQKcGxhdGZvcm1DYXBzID0gaG9tZVJvdXRpbmcKZWRnZURpc2NvdmVyeVNlcnZpY2VFbmRQb2ludF9wb3J0ID0KZWRnZURpc2NvdmVyeVNlcnZpY2VFbmRQb2ludF9mcWRuID0gZGlzY292ZXJ5Lm9wZXJhdG9yMS5jb20KZWRnZURpc2NvdmVyeVNlcnZpY2VFbmRQb2ludF9pcHY0QWRkcmVzc2VzID0KZWRnZURpc2NvdmVyeVNlcnZpY2VFbmRQb2ludF9pcHY2QWRkcmVzc2VzID0KbGNtU2VydmljZUVuZFBvaW50X3BvcnQgPSA4OTg5CmxjbVNlcnZpY2VFbmRQb2ludF9mcWRuID0KbGNtU2VydmljZUVuZFBvaW50X2lwdjRBZGRyZXNzZXMgPSAxMjcuMC4wLjEKbGNtU2VydmljZUVuZFBvaW50X2lwdjZBZGRyZXNzZXMgPQoKW2VkZ2VfY2xvdWRfcGxhdGZvcm1dCmhvc3QgPSAxOTIuMTY4LjEyMy40OApwb3J0ID0gMzA3NjkKY2xpZW50X25hbWUgPSBpMmVkZ2UKZmxhdm91cl9pZCA9IDY3ZjNhMGIwZTMxODRhODU5NTJlMTc0ZAoKW2FydGVmYWN0X21hbmFnZXJdCmhvc3QgPSAxOTIuMTY4LjEyMy4yMzcKcG9ydCA9IDMwNzY5CmVuYWJsZWQgPSBmYWxzZQpkc3RfcmVnaXN0cnkgPQpkc3RfdXNlcm5hbWUgPQpkc3RfcGFzc3dvcmQgPQpkc3RfdG9rZW4gPQo=
 type: Opaque
 ---
 kind: Deployment
@@ -34,23 +34,23 @@ spec:
         app: federation-manager
     spec:
       containers:
-      - name: federation-manager
-        image: labs.etsi.org:5050/oop/code/federation-manager/federation-manager:latest
-        imagePullPolicy: Always
-        volumeMounts:
-          - name: config
-            readOnly: false
-            mountPath: /usr/app/src/conf/
-        ports:
-        - containerPort: 8989
-          protocol: TCP
-        resources:
-          requests:
-            cpu: "2"
-            memory: "4Gi"
-          limits:
-            cpu: "4"
-            memory: "6Gi"
+        - name: federation-manager
+          image: labs.etsi.org:5050/oop/code/federation-manager/federation-manager:temp-1d05bd0
+          imagePullPolicy: Always
+          volumeMounts:
+            - name: config
+              readOnly: false
+              mountPath: /usr/app/src/conf/
+          ports:
+            - containerPort: 8989
+              protocol: TCP
+          resources:
+            requests:
+              cpu: "2"
+              memory: "4Gi"
+            limits:
+              cpu: "4"
+              memory: "6Gi"
       volumes:
         - name: config
           secret:
diff --git a/src/test/local-deployment/docker-compose.yml b/src/test/local-deployment/docker-compose.yml
index 74ef25bdb9cf5387edb55131b1743d42856eeb8a..1c9f9dec039ff24e5b63e64f266b4a7aa208f2a4 100644
--- a/src/test/local-deployment/docker-compose.yml
+++ b/src/test/local-deployment/docker-compose.yml
@@ -63,9 +63,6 @@ services:
     build:
       context: ../../../
       dockerfile: Dockerfile
-      args:
-        PIP_INDEX_URL: https://gitlab-ci-token:glpat-Gm4adH6E5xJGt51zZDEs@gitlab.i2cat.net/api/v4/projects/2512/packages/pypi/simple
-        PIP_EXTRA_INDEX_URL: https://gitlab-ci-token:glpat-Gm4adH6E5xJGt51zZDEs@gitlab.i2cat.net/api/v4/projects/2514/packages/pypi/simple
     container_name: federation-manager-remote
     restart: unless-stopped
     ports:
@@ -74,7 +71,6 @@ services:
       - ../../conf/config-fm-remote.cfg:/usr/app/src/conf/config.cfg
       - ../../clients/tf_sdk.py:/usr/app/src/clients/tf_sdk.py
       - /home/sergio/i2cat/OperatorPlatform/OP_Automation/automation/op1/op1-kubeconfig.yaml:/root/.kube/config
-      - ../../../../tf-sdk/src/sunrise6g_opensdk:/usr/local/lib/python3.12/site-packages/sunrise6g_opensdk
 
     depends_on:
       - mongodb-remote
@@ -86,9 +82,6 @@ services:
     build:
       context: ../../../
       dockerfile: Dockerfile
-      args:
-        PIP_INDEX_URL: https://gitlab-ci-token:glpat-Gm4adH6E5xJGt51zZDEs@gitlab.i2cat.net/api/v4/projects/2512/packages/pypi/simple
-        PIP_EXTRA_INDEX_URL: https://gitlab-ci-token:glpat-Gm4adH6E5xJGt51zZDEs@gitlab.i2cat.net/api/v4/projects/2514/packages/pypi/simple
     container_name: federation-manager-local
     restart: unless-stopped
     ports:
@@ -99,7 +92,6 @@ services:
       - ../../conf/config-fm-local.cfg:/usr/app/src/conf/config.cfg
       - ../../clients/tf_sdk.py:/usr/app/src/clients/tf_sdk.py
       - /home/sergio/i2cat/OperatorPlatform/OP_Automation/automation/op1/op1-kubeconfig.yaml:/root/.kube/config
-      - ../../../../tf-sdk/src/sunrise6g_opensdk:/usr/local/lib/python3.12/site-packages/sunrise6g_opensdk
     depends_on:
       - mongodb-local
       - keycloak-local