diff --git a/common.xml b/common.xml
new file mode 100644
index 0000000..30e39b6
--- /dev/null
+++ b/common.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+  <project remote="starlingx"  name="tools.git" path="stx-tools"/>
+
+  <project remote="starlingx"  name="root.git" path="cgcs-root"/>
+
+  <project remote="starlingx"  name="docs.git" path="cgcs-root/stx/docs"/>
+  <project remote="starlingx"  name="test.git" path="cgcs-root/stx/test"/>
+  <project remote="starlingx"  name="zuul-jobs.git" path="cgcs-root/stx/zuul-jobs"/>
+</manifest>
diff --git a/compiler.xml b/compiler.xml
new file mode 100644
index 0000000..d45361d
--- /dev/null
+++ b/compiler.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+
+  <remote name="starlingx" fetch="https://opendev.org/starlingx" />
+  <!-- note, you can also provide personal overrides for your own github -->
+  <!-- for tests/experiments -->
+
+  <default revision="master" remote="starlingx"/>
+  <include name="common.xml" />
+
+  <project remote="starlingx"  name="compile.git" path="cgcs-root/stx/compile" />
+
+</manifest>
diff --git a/default.xml b/default.xml
index 8e7d5e2..ec974e0 100644
--- a/default.xml
+++ b/default.xml
@@ -44,7 +44,7 @@
   <project remote="starlingx"  name="utilities.git" path="cgcs-root/stx/utilities"/>
   <project remote="starlingx"  name="zuul-jobs.git" path="cgcs-root/stx/zuul-jobs"/>
 
-  <project remote="stx-staging"  name="stx-ceph.git" path="cgcs-root/stx/git/ceph" revision="stx/v13.2.2"/>
+  <project remote="stx-staging"  name="stx-ceph.git" revision="stx/v13.2.2"  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-ryu.git" path="cgcs-root/stx/git/ryu"/>
diff --git a/distro.xml b/distro.xml
new file mode 100644
index 0000000..0306078
--- /dev/null
+++ b/distro.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+
+  <remote name="docker" fetch="https://github.com/docker" />
+  <remote name="gnocchi" fetch="https://github.com/gnocchixyz/" />
+  <remote name="hpe-storage" fetch="https://github.com/hpe-storage" />
+  <remote name="openstack" fetch="https://opendev.org/openstack" />
+  <remote name="starlingx" fetch="https://opendev.org/starlingx" />
+  <remote name="stx-staging" fetch="https://github.com/starlingx-staging"/>
+  <!-- note, you can also provide personal overrides for your own github -->
+  <!-- for tests/experiments -->
+
+  <default revision="master" remote="stx-staging"/>
+  <include name="common.xml" />
+
+  <project remote="starlingx"  name="integ.git" path="cgcs-root/stx/integ" />
+  <project remote="starlingx"  name="upstream.git" path="cgcs-root/stx/upstream"/>
+
+  <project remote="stx-staging"  name="stx-ceph.git" revision="stx/v13.2.2" 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-ryu.git" path="cgcs-root/stx/git/ryu"/>
+  <project remote="stx-staging"  name="stx-openstack-ras.git" path="cgcs-root/stx/git/openstack-ras"/>
+
+  <!-- Clients -->
+  <project remote="openstack"  revision="stable/stein" name="python-aodhclient.git" path="cgcs-root/stx/git/python-aodhclient"/>
+  <project remote="openstack"  revision="stable/stein" name="python-barbicanclient.git" path="cgcs-root/stx/git/python-barbicanclient"/>
+  <project remote="openstack"  revision="stable/stein" name="python-cinderclient.git" path="cgcs-root/stx/git/python-cinderclient"/>
+  <project remote="openstack"  revision="stable/stein" name="python-glanceclient.git" path="cgcs-root/stx/git/python-glanceclient"/>
+  <project remote="openstack"  revision="stable/stein" name="python-heatclient.git" path="cgcs-root/stx/git/python-heatclient"/>
+  <project remote="openstack"  revision="stable/stein" name="python-ironicclient.git" path="cgcs-root/stx/git/python-ironicclient"/>
+  <project remote="openstack"  revision="stable/stein" name="python-keystoneclient.git" path="cgcs-root/stx/git/python-keystoneclient"/>
+  <project remote="openstack"  revision="stable/stein" name="python-magnumclient.git" path="cgcs-root/stx/git/python-magnumclient"/>
+  <project remote="openstack"  revision="stable/stein" name="python-muranoclient.git" path="cgcs-root/stx/git/python-muranoclient"/>
+  <project remote="openstack"  revision="stable/stein" name="python-neutronclient.git" path="cgcs-root/stx/git/python-neutronclient"/>
+  <project remote="openstack"  revision="stable/stein" name="python-novaclient.git" path="cgcs-root/stx/git/python-novaclient"/>
+  <project remote="openstack"  revision="stable/stein" name="python-openstackclient.git" path="cgcs-root/stx/git/python-openstackclient"/>
+  <project remote="openstack"  revision="stable/stein" name="openstacksdk.git" path="cgcs-root/stx/git/python-openstacksdk"/>
+  <project remote="openstack"  revision="stable/stein" name="python-pankoclient.git" path="cgcs-root/stx/git/python-pankoclient"/>
+  <project remote="gnocchi"    revision="master" name="python-gnocchiclient.git" path="cgcs-root/stx/git/python-gnocchiclient"/>
+
+  <!-- Pure Upstream -->
+  <project remote="openstack" revision="stable/stein"  name="horizon.git" path="cgcs-root/stx/git/horizon"/>
+
+  <!-- HPE Storage -->
+  <project remote="hpe-storage" revision="refs/tags/4.2.3" name="python-3parclient.git" path="cgcs-root/stx/git/python-3parclient" />
+  <project remote="hpe-storage" revision="refs/tags/2.1.0" name="python-lefthandclient.git" path="cgcs-root/stx/git/python-lefthandclient" />
+
+  <!-- Docker -->
+  <project remote="docker" revision="refs/tags/v2.6.2" name="distribution.git" path="cgcs-root/stx/git/docker-distribution"/>
+
+  <!-- Keystoneauth  -->
+  <project remote="openstack" revision="refs/tags/3.13.1" name="keystoneauth.git" path="cgcs-root/stx/git/python-keystoneauth"/>
+</manifest>
diff --git a/flock.xml b/flock.xml
new file mode 100644
index 0000000..5b29347
--- /dev/null
+++ b/flock.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+
+  <remote name="starlingx" fetch="https://opendev.org/starlingx" />
+  <!-- note, you can also provide personal overrides for your own github -->
+  <!-- for tests/experiments -->
+
+  <default revision="master" remote="starlingx"/>
+  <include name="common.xml" />
+
+  <project remote="starlingx"  name="ansible-playbooks.git" path="cgcs-root/stx/ansible-playbooks"/>
+  <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-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="metal.git" path="cgcs-root/stx/metal"/>
+  <project remote="starlingx"  name="monitor-armada-app.git" path="cgcs-root/stx/monitor-armada-app"/>
+  <project remote="starlingx"  name="monitoring.git" path="cgcs-root/stx/monitoring"/>
+  <project remote="starlingx"  name="nfv.git" path="cgcs-root/stx/nfv"/>
+  <project remote="starlingx"  name="oidc-auth-armada-app.git" path="cgcs-root/stx/oidc-auth-armada-app"/>
+  <project remote="starlingx"  name="openstack-armada-app.git" path="cgcs-root/stx/openstack-armada-app"/>
+  <project remote="starlingx"  name="platform-armada-app.git" path="cgcs-root/stx/platform-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="utilities.git" path="cgcs-root/stx/utilities"/>
+</manifest>