diff --git a/compiler.xml b/compiler.xml
index d45361d..e38cc9d 100644
--- a/compiler.xml
+++ b/compiler.xml
@@ -5,7 +5,7 @@
   <!-- note, you can also provide personal overrides for your own github -->
   <!-- for tests/experiments -->
 
-  <default revision="master" remote="starlingx"/>
+  <default revision="f/bookworm" remote="starlingx"/>
   <include name="common.xml" />
 
   <project remote="starlingx"  name="compile.git" path="cgcs-root/stx/compile" />
diff --git a/containers.xml b/containers.xml
index 56d2926..87147bd 100644
--- a/containers.xml
+++ b/containers.xml
@@ -9,9 +9,9 @@
   <!-- note, you can also provide personal overrides for your own github -->
   <!-- for tests/experiments -->
   
-  <default revision="master" remote="stx-staging"/>
+  <default revision="f/bookworm" remote="stx-staging"/>
   <include name="common.xml" />
-  
+
   <project remote="starlingx"  name="ansible-playbooks.git" path="cgcs-root/stx/ansible-playbooks"/>
   <project remote="starlingx"  name="app-harbor.git" path="cgcs-root/stx/app-harbor"/>
   <project remote="starlingx"  name="app-intel-ethernet-operator.git" path="cgcs-root/stx/app-intel-ethernet-operator"/>
@@ -20,20 +20,20 @@
   <project remote="starlingx"  name="app-kubevirt.git" path="cgcs-root/stx/app-kubevirt"/>
   <project remote="starlingx"  name="app-node-interface-metrics-exporter.git" path="cgcs-root/stx/app-node-interface-metrics-exporter"/>
   <project remote="starlingx"  name="app-power-metrics.git" path="cgcs-root/stx/app-power-metrics"/>
-  <project remote="starlingx"  name="app-sriov-fec-operator.git" path="cgcs-root/stx/app-sriov-fec-operator"/>
   <project remote="starlingx"  name="app-security-profiles-operator.git" path="cgcs-root/stx/app-security-profiles-operator"/>
+  <project remote="starlingx"  name="app-sriov-fec-operator.git" path="cgcs-root/stx/app-sriov-fec-operator"/>
   <project remote="starlingx"  name="audit-armada-app.git" path="cgcs-root/stx/audit-armada-app"/>
   <project remote="starlingx"  name="clients.git" path="cgcs-root/stx/clients"/>
   <project remote="starlingx"  name="config.git" path="cgcs-root/stx/config"/>
   <project remote="starlingx"  name="config-files.git" path="cgcs-root/stx/config-files"/>
   <project remote="starlingx"  name="containers.git" path="cgcs-root/stx/containers"/>
-  <project remote="starlingx"  name="distcloud.git" path="cgcs-root/stx/distributedcloud"/> 
+  <project remote="starlingx"  name="distcloud.git" path="cgcs-root/stx/distributedcloud"/>
   <project remote="starlingx"  name="distcloud-client.git" path="cgcs-root/stx/distributedcloud-client"/>
   <project remote="starlingx"  name="fault.git" path="cgcs-root/stx/fault"/>
   <project remote="starlingx"  name="gui.git" path="cgcs-root/stx/gui"/>
   <project remote="starlingx"  name="ha.git" path="cgcs-root/stx/ha"/>
   <project remote="starlingx"  name="helm-charts.git" path="cgcs-root/stx/helm-charts"/>
-  <project remote="starlingx"  name="integ.git" path="cgcs-root/stx/integ" />
+  <project remote="starlingx"  name="integ.git" path="cgcs-root/stx/integ"/>
   <project remote="starlingx"  name="metal.git" path="cgcs-root/stx/metal"/>
   <project remote="starlingx"  name="metrics-server-armada-app.git" path="cgcs-root/stx/metrics-server-armada-app"/>
   <project remote="starlingx"  name="monitor-armada-app.git" path="cgcs-root/stx/monitor-armada-app"/>
@@ -45,13 +45,12 @@
   <project remote="starlingx"  name="portieris-armada-app.git" path="cgcs-root/stx/portieris-armada-app"/>
   <project remote="starlingx"  name="ptp-notification-armada-app.git" path="cgcs-root/stx/ptp-notification-armada-app"/>
   <project remote="starlingx"  name="rook-ceph.git" path="cgcs-root/stx/rook-ceph"/>
+  <project remote="starlingx"  name="SDO-rv-service.git" path="cgcs-root/stx/SDO-rv-service"/>
   <project remote="starlingx"  name="snmp-armada-app.git" path="cgcs-root/stx/snmp-armada-app"/>
   <project remote="starlingx"  name="stx-puppet.git" path="cgcs-root/stx/stx-puppet"/>
   <project remote="starlingx"  name="update.git" path="cgcs-root/stx/update"/>
   <project remote="starlingx"  name="upstream.git" path="cgcs-root/stx/upstream"/>
   <project remote="starlingx"  name="utilities.git" path="cgcs-root/stx/utilities"/>
   <project remote="starlingx"  name="vault-armada-app.git" path="cgcs-root/stx/vault-armada-app"/>
-  <project remote="starlingx"  name="virt.git" path="cgcs-root/stx/virt" />
-  <project remote="starlingx"  name="SDO-rv-service.git" path="cgcs-root/stx/SDO-rv-service"/>
+  <project remote="starlingx"  name="virt.git" path="cgcs-root/stx/virt"/>
 </manifest>
-
diff --git a/default.xml b/default.xml
index be24032..4daf927 100644
--- a/default.xml
+++ b/default.xml
@@ -9,7 +9,7 @@
   <!-- for tests/experiments -->
 
   <remote name="stx-staging" fetch="https://github.com/starlingx-staging"/>
-  <default revision="master" remote="stx-staging"/>
+  <default revision="f/bookworm" remote="stx-staging"/>
 
   <project remote="starlingx"  name="jenkins-pipelines.git" path="stx-jenkins-pipelines"/>
   <project remote="starlingx"  name="virtual-deployment.git" path="stx-virtual-deployment"/>
@@ -77,7 +77,7 @@
   <project remote="stx-staging"  name="stx-ceph.git" revision="stx/v14.2.22"  path="cgcs-root/stx/git/ceph" />
   <project remote="stx-staging"  name="stx-libvirt.git" revision="stx/v4.7.0-1" path="cgcs-root/stx/git/libvirt"/>
   <project remote="stx-staging"  name="stx-qemu.git" revision="stx/v3.0.0-1" path="cgcs-root/stx/git/qemu"/>
-  <project remote="stx-staging"  name="stx-openstack-ras.git" path="cgcs-root/stx/git/openstack-ras"/>
+  <project remote="stx-staging"  revision="master" name="stx-openstack-ras.git" path="cgcs-root/stx/git/openstack-ras"/>
 
   <!-- Clients -->
   <!-- revisions point to branch stable/train as of 2023-05-04 -->
diff --git a/distro.xml b/distro.xml
index c1ced73..8430221 100644
--- a/distro.xml
+++ b/distro.xml
@@ -9,18 +9,18 @@
   <!-- note, you can also provide personal overrides for your own github -->
   <!-- for tests/experiments -->
 
-  <default revision="master" remote="stx-staging"/>
+  <default revision="f/bookworm" remote="stx-staging"/>
   <include name="common.xml" />
 
-  <project remote="starlingx"  name="integ.git" path="cgcs-root/stx/integ" />
-  <project remote="starlingx"  name="kernel.git" path="cgcs-root/stx/kernel" />
+  <project remote="starlingx"  name="integ.git" path="cgcs-root/stx/integ"/>
+  <project remote="starlingx"  name="kernel.git" path="cgcs-root/stx/kernel"/>
   <project remote="starlingx"  name="upstream.git" path="cgcs-root/stx/upstream"/>
-  <project remote="starlingx"  name="virt.git" path="cgcs-root/stx/virt" />
+  <project remote="starlingx"  name="virt.git" path="cgcs-root/stx/virt"/>
 
   <project remote="stx-staging"  name="stx-ceph.git" revision="stx/v14.2.22" path="cgcs-root/stx/git/ceph"/>
   <project remote="stx-staging"  name="stx-libvirt.git" revision="stx/v4.7.0-1" path="cgcs-root/stx/git/libvirt"/>
   <project remote="stx-staging"  name="stx-qemu.git" revision="stx/v3.0.0-1" path="cgcs-root/stx/git/qemu"/>
-  <project remote="stx-staging"  name="stx-openstack-ras.git" path="cgcs-root/stx/git/openstack-ras"/>
+  <project remote="stx-staging"  name="stx-openstack-ras.git" revision="master" path="cgcs-root/stx/git/openstack-ras"/>
 
   <!-- Clients -->
   <!-- revisions point to branch stable/train as of 2023-05-04 -->
diff --git a/flock.xml b/flock.xml
index 3dd6388..8966fea 100644
--- a/flock.xml
+++ b/flock.xml
@@ -5,7 +5,7 @@
   <!-- note, you can also provide personal overrides for your own github -->
   <!-- for tests/experiments -->
 
-  <default revision="master" remote="starlingx"/>
+  <default revision="f/bookworm" remote="starlingx"/>
   <include name="common.xml" />
 
   <project remote="starlingx"  name="ansible-playbooks.git" path="cgcs-root/stx/ansible-playbooks"/>
diff --git a/stx-openstack.xml b/stx-openstack.xml
index ea56f87..bc03730 100644
--- a/stx-openstack.xml
+++ b/stx-openstack.xml
@@ -9,7 +9,7 @@
   <!-- note, you can also provide personal overrides for your own github -->
   <!-- for tests/experiments -->
 
-  <default revision="master" remote="starlingx"/>
+  <default revision="f/bookworm" remote="starlingx"/>
 
   <project remote="starlingx"  name="root.git"                 path="cgcs-root"/>