diff --git a/psa-sp-fvp.xml b/psa-sp-fvp.xml
index fed0db5..542b152 100644
--- a/psa-sp-fvp.xml
+++ b/psa-sp-fvp.xml
@@ -5,15 +5,14 @@
     <remote name="savannah"     fetch="https://git.savannah.gnu.org/git" />
     <remote name="arm-gitlab"   fetch="https://git.gitlab.arm.com" />
 
-    <default remote="github" revision="refs/tags/3.10.0" />
+    <default remote="github" revision="refs/tags/3.17.0" />
 
     <!-- Trusted Services -->
     <project path="trusted-services" name="TS/trusted-services.git"
-        revision="main" remote="tforg" />
+        revision="integration" remote="tforg" />
 
     <!-- OP-TEE gits -->
-    <project path="optee_os" name="OP-TEE/optee_os.git"
-        revision="psa-development" remote="tforg" />
+    <project path="optee_os" name="OP-TEE/optee_os.git" />
 
     <project path="build" name="OP-TEE/build.git"
         revision="psa-development" remote="tforg">