diff --git a/doc/source/conf.py b/doc/source/conf.py
index be419f3f8c..4135867207 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -59,7 +59,7 @@ else:
     upgrade_warning = "The upgrade is always under active development."
 
 CONF_PATH = os.path.dirname(os.path.realpath(__file__))
-GNOCCHI_DETAILS = '../../playbooks/defaults/repo_packages/gnocchi.yml'
+GNOCCHI_DETAILS = '../../inventory/group_vars/gnocchi_all/source_git.yml'
 with open(os.path.join(CONF_PATH, GNOCCHI_DETAILS), 'r') as fdesc:
     gnocchi_file_content = yaml.safe_load(fdesc)
     gnocchi_branch = gnocchi_file_content['gnocchi_git_track_branch']
diff --git a/doc/source/contributor/periodic-work.rst b/doc/source/contributor/periodic-work.rst
index 5fa6cef17a..cfe6e785df 100644
--- a/doc/source/contributor/periodic-work.rst
+++ b/doc/source/contributor/periodic-work.rst
@@ -43,9 +43,9 @@ Updating upstream SHAs
 The dependencies for OpenStack-Ansible are updated
 through the use of ``osa releases bump_upstream_shas``. This script
 updates the project's pinned SHAs, located in the
-`repo_packages folder`, based on their ``_git_track_branch`` value.
+``inventory/group_vars/<service_group>/source_git.yml`` file,
+based on their ``_git_track_branch`` value.
 
-.. _repo_packages folder: https://github.com/openstack/openstack-ansible/tree/master/playbooks/defaults/repo_packages
 
 Updating OpenStack-Ansible roles
 --------------------------------
diff --git a/doc/source/contributor/testing.rst b/doc/source/contributor/testing.rst
index 8d9df7ceaa..31e1ef0378 100644
--- a/doc/source/contributor/testing.rst
+++ b/doc/source/contributor/testing.rst
@@ -211,11 +211,10 @@ Testing a new role with an AIO
 #. If your service is installed from source or relies on python packages which
    need to be installed from source, specify a repository for the source
    code of each requirement by adding a file to your deploy host under
-   ``playbooks/defaults/repo_packages`` in the OpenStack-Ansible source
-   repository and following the pattern of files currently in that directory.
-   You could also simply add an entry to an existing file there. Be sure to
-   run the ``repo-build.yml`` play later so that wheels for your packages will
-   be included in the repository infrastructure.
+   ``inventory/group_vars/<service_group>/source_git.yml`` in the
+   OpenStack-Ansible source repository and following the pattern of files
+   currently in that directory. You could also simply add an entry to an
+   existing file there.
 
 #. Make any required adjustments to the load balancer configuration
    (e.g. modify ``inventory/group_vars/all/haproxy.yml`` in the
diff --git a/doc/source/user/source-overrides/index.rst b/doc/source/user/source-overrides/index.rst
index b8cf1de7bc..cb47d48cde 100644
--- a/doc/source/user/source-overrides/index.rst
+++ b/doc/source/user/source-overrides/index.rst
@@ -47,7 +47,7 @@ Overriding other upstream projects source code
 
 All the upstream repositories used are defined in the
 ``openstack-ansible`` integrated repository, in the
-``playbooks/defaults/repo_packages`` folder.
+``inventory/group_vars/<service_group>/source_git.yml`` file.
 
 For example, if you want to override ``glance`` repository with your
 own, you need to define the following:
@@ -59,7 +59,7 @@ own, you need to define the following:
     glance_git_project_group: glance_all
 
 Please note, for this glance example, that you do not need to edit the
-``playbooks/defaults/repo_packages/openstack_services.yml`` file.
+``inventory/group_vars/glance_all/source_git.yml`` file.
 
 Instead, the usual overrides mechanism can take place, and you
 can define these 3 variables in a ``user_*.yml`` file.
diff --git a/inventory/group_vars/adjutant_all.yml b/inventory/group_vars/adjutant_all/haproxy_service.yml
similarity index 100%
rename from inventory/group_vars/adjutant_all.yml
rename to inventory/group_vars/adjutant_all/haproxy_service.yml
diff --git a/inventory/group_vars/adjutant_all/source_git.yml b/inventory/group_vars/adjutant_all/source_git.yml
new file mode 100644
index 0000000000..06332601db
--- /dev/null
+++ b/inventory/group_vars/adjutant_all/source_git.yml
@@ -0,0 +1,21 @@
+---
+# Copyright 2023, Cleura AB
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+### HEAD as of 22.03.2023 ###
+
+## Adjutant service
+adjutant_git_repo: "{{ openstack_opendev_base_url }}/openstack/adjutant"
+adjutant_git_install_branch: df8c3e4a8b70be8697ac46f0acec9169752b4698
+adjutant_git_track_branch: stable/2023.1
diff --git a/inventory/group_vars/all/source_git.yml b/inventory/group_vars/all/source_git.yml
new file mode 100644
index 0000000000..dbb3b9706d
--- /dev/null
+++ b/inventory/group_vars/all/source_git.yml
@@ -0,0 +1,21 @@
+---
+# Copyright 2023, Cleura AB
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+### HEAD as of 22.03.2023 ###
+
+## Global Requirements
+requirements_git_repo: "{{ openstack_opendev_base_url }}/openstack/requirements"
+requirements_git_install_branch: 65245016de7cf2d1e585eeb1378aac6aa6d75de0
+requirements_git_track_branch: stable/2023.1
diff --git a/inventory/group_vars/aodh_all.yml b/inventory/group_vars/aodh_all/haproxy_service.yml
similarity index 100%
rename from inventory/group_vars/aodh_all.yml
rename to inventory/group_vars/aodh_all/haproxy_service.yml
diff --git a/inventory/group_vars/aodh_all/source_git.yml b/inventory/group_vars/aodh_all/source_git.yml
new file mode 100644
index 0000000000..a69a8a94dd
--- /dev/null
+++ b/inventory/group_vars/aodh_all/source_git.yml
@@ -0,0 +1,21 @@
+---
+# Copyright 2023, Cleura AB
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+### HEAD as of 22.03.2023 ###
+
+## Aodh service
+aodh_git_repo: "{{ openstack_opendev_base_url }}/openstack/aodh"
+aodh_git_install_branch: ecbbd3078e2ee17f01eb4048770c851b864d9122
+aodh_git_track_branch: stable/2023.1
diff --git a/inventory/group_vars/barbican_all.yml b/inventory/group_vars/barbican_all/haproxy_service.yml
similarity index 100%
rename from inventory/group_vars/barbican_all.yml
rename to inventory/group_vars/barbican_all/haproxy_service.yml
diff --git a/inventory/group_vars/barbican_all/source_git.yml b/inventory/group_vars/barbican_all/source_git.yml
new file mode 100644
index 0000000000..a04d5cd00f
--- /dev/null
+++ b/inventory/group_vars/barbican_all/source_git.yml
@@ -0,0 +1,21 @@
+---
+# Copyright 2023, Cleura AB
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+### HEAD as of 22.03.2023 ###
+
+## Barbican service
+barbican_git_repo: "{{ openstack_opendev_base_url }}/openstack/barbican"
+barbican_git_install_branch: b5c2f8385c17ac9e02cfb12bcff606788043961d
+barbican_git_track_branch: stable/2023.1
diff --git a/inventory/group_vars/blazar_all.yml b/inventory/group_vars/blazar_all/haproxy_service.yml
similarity index 100%
rename from inventory/group_vars/blazar_all.yml
rename to inventory/group_vars/blazar_all/haproxy_service.yml
diff --git a/inventory/group_vars/blazar_all/source_git.yml b/inventory/group_vars/blazar_all/source_git.yml
new file mode 100644
index 0000000000..9e165a13e4
--- /dev/null
+++ b/inventory/group_vars/blazar_all/source_git.yml
@@ -0,0 +1,26 @@
+---
+# Copyright 2023, Cleura AB
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+### HEAD as of 22.03.2023 ###
+
+## Blazar service
+blazar_git_repo: "{{ openstack_opendev_base_url }}/openstack/blazar"
+blazar_git_install_branch: 24ca97091bcb0d231af98276a6e80013a170d438
+blazar_git_track_branch: stable/2023.1
+
+## Blazar Nova Service
+blazar_nova_git_repo: "{{ openstack_opendev_base_url }}/openstack/blazar-nova"
+blazar_nova_git_install_branch: bec9434e93ad1baf4a08eb0bd83ad8af83def93e
+blazar_nova_git_track_branch: stable/2023.1
diff --git a/inventory/group_vars/ceilometer_all.yml b/inventory/group_vars/ceilometer_all/defaults.yml
similarity index 100%
rename from inventory/group_vars/ceilometer_all.yml
rename to inventory/group_vars/ceilometer_all/defaults.yml
diff --git a/inventory/group_vars/ceilometer_all/source_git.yml b/inventory/group_vars/ceilometer_all/source_git.yml
new file mode 100644
index 0000000000..6e6c39477f
--- /dev/null
+++ b/inventory/group_vars/ceilometer_all/source_git.yml
@@ -0,0 +1,21 @@
+---
+# Copyright 2023, Cleura AB
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+### HEAD as of 22.03.2023 ###
+
+## Ceilometer service
+ceilometer_git_repo: "{{ openstack_opendev_base_url }}/openstack/ceilometer"
+ceilometer_git_install_branch: 78c2459bdd981a5acab38a445f92d1bfec045cbd
+ceilometer_git_track_branch: stable/2023.1
diff --git a/inventory/group_vars/cinder_all.yml b/inventory/group_vars/cinder_all/defaults.yml
similarity index 63%
rename from inventory/group_vars/cinder_all.yml
rename to inventory/group_vars/cinder_all/defaults.yml
index 4d478a038e..a8c13e5c77 100644
--- a/inventory/group_vars/cinder_all.yml
+++ b/inventory/group_vars/cinder_all/defaults.yml
@@ -26,19 +26,3 @@ glance_default_store: "{{ ((groups['swift_all'] is defined) and (groups['swift_a
 
 # cinder_backend_lvm_inuse: True if current host has an lvm backend
 cinder_backend_lvm_inuse: '{{ (cinder_backends|default("")|to_json).find("cinder.volume.drivers.lvm.LVMVolumeDriver") != -1 }}'
-
-haproxy_cinder_api_service:
-  haproxy_service_name: cinder_api
-  haproxy_backend_nodes: "{{ groups['cinder_api'] | default([]) }}"
-  haproxy_ssl: "{{ haproxy_ssl }}"
-  haproxy_ssl_all_vips: "{{ haproxy_ssl_all_vips }}"
-  haproxy_port: 8776
-  haproxy_balance_type: http
-  haproxy_backend_options:
-    - "httpchk HEAD /healthcheck HTTP/1.0\\r\\nUser-agent:\\ osa-haproxy-healthcheck"
-  haproxy_backend_ssl: "{{ cinder_backend_ssl | default(openstack_service_backend_ssl) }}"
-  haproxy_backend_ca: "{{ cinder_haproxy_backend_ca | default(openstack_haproxy_backend_ca) }}"
-  haproxy_service_enabled: "{{ groups['cinder_api'] is defined and groups['cinder_api'] | length > 0 }}"
-
-cinder_haproxy_services:
-  - "{{ haproxy_cinder_api_service | combine(haproxy_cinder_api_service_overrides | default({})) }}"
diff --git a/inventory/group_vars/cinder_all/haproxy_service.yml b/inventory/group_vars/cinder_all/haproxy_service.yml
new file mode 100644
index 0000000000..46e3c09e0c
--- /dev/null
+++ b/inventory/group_vars/cinder_all/haproxy_service.yml
@@ -0,0 +1,30 @@
+---
+# Copyright 2023, Cleura AB
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+haproxy_cinder_api_service:
+  haproxy_service_name: cinder_api
+  haproxy_backend_nodes: "{{ groups['cinder_api'] | default([]) }}"
+  haproxy_ssl: "{{ haproxy_ssl }}"
+  haproxy_ssl_all_vips: "{{ haproxy_ssl_all_vips }}"
+  haproxy_port: 8776
+  haproxy_balance_type: http
+  haproxy_backend_options:
+    - "httpchk HEAD /healthcheck HTTP/1.0\\r\\nUser-agent:\\ osa-haproxy-healthcheck"
+  haproxy_backend_ssl: "{{ cinder_backend_ssl | default(openstack_service_backend_ssl) }}"
+  haproxy_backend_ca: "{{ cinder_haproxy_backend_ca | default(openstack_haproxy_backend_ca) }}"
+  haproxy_service_enabled: "{{ groups['cinder_api'] is defined and groups['cinder_api'] | length > 0 }}"
+
+cinder_haproxy_services:
+  - "{{ haproxy_cinder_api_service | combine(haproxy_cinder_api_service_overrides | default({})) }}"
diff --git a/inventory/group_vars/cinder_all/source_git.yml b/inventory/group_vars/cinder_all/source_git.yml
new file mode 100644
index 0000000000..46da30bc5b
--- /dev/null
+++ b/inventory/group_vars/cinder_all/source_git.yml
@@ -0,0 +1,21 @@
+---
+# Copyright 2023, Cleura AB
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+### HEAD as of 22.03.2023 ###
+
+## Cinder service
+cinder_git_repo: "{{ openstack_opendev_base_url }}/openstack/cinder"
+cinder_git_install_branch: 24266a2107b7caffb9fc79769e298a84340d8ba8
+cinder_git_track_branch: stable/2023.1
diff --git a/inventory/group_vars/cloudkitty_all.yml b/inventory/group_vars/cloudkitty_all/haproxy_service.yml
similarity index 100%
rename from inventory/group_vars/cloudkitty_all.yml
rename to inventory/group_vars/cloudkitty_all/haproxy_service.yml
diff --git a/inventory/group_vars/cloudkitty_all/source_git.yml b/inventory/group_vars/cloudkitty_all/source_git.yml
new file mode 100644
index 0000000000..96c4a9ebff
--- /dev/null
+++ b/inventory/group_vars/cloudkitty_all/source_git.yml
@@ -0,0 +1,21 @@
+---
+# Copyright 2023, Cleura AB
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+### HEAD as of 22.03.2023 ###
+
+## Cloudkitty service
+cloudkitty_git_repo: "{{ openstack_opendev_base_url }}/openstack/cloudkitty"
+cloudkitty_git_install_branch: 73d5543f15ec188fafa1562f4142edd41afbad5c
+cloudkitty_git_track_branch: stable/2023.1
diff --git a/inventory/group_vars/designate_all.yml b/inventory/group_vars/designate_all/haproxy_service.yml
similarity index 100%
rename from inventory/group_vars/designate_all.yml
rename to inventory/group_vars/designate_all/haproxy_service.yml
diff --git a/inventory/group_vars/designate_all/source_git.yml b/inventory/group_vars/designate_all/source_git.yml
new file mode 100644
index 0000000000..17cd79c8d4
--- /dev/null
+++ b/inventory/group_vars/designate_all/source_git.yml
@@ -0,0 +1,21 @@
+---
+# Copyright 2023, Cleura AB
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+### HEAD as of 22.03.2023 ###
+
+## Designate service
+designate_git_repo: "{{ openstack_opendev_base_url }}/openstack/designate"
+designate_git_install_branch: bda31ec62c3eaa7fcdd25d69f97742744debf915
+designate_git_track_branch: stable/2023.1
diff --git a/inventory/group_vars/glance_all/defaults.yml b/inventory/group_vars/glance_all/defaults.yml
new file mode 100644
index 0000000000..7d54f11754
--- /dev/null
+++ b/inventory/group_vars/glance_all/defaults.yml
@@ -0,0 +1,26 @@
+---
+# Copyright 2016, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# If there are Swift hosts in the environment, then use it as the default Glance store
+glance_default_store: "{{ ((groups['swift_all'] is defined) and (groups['swift_all'] | length > 0)) | ternary('swift', 'file') }}"
+glance_available_stores: "{{ [ glance_default_store ] + (glance_additional_stores | default([])) }}"
+glance_use_uwsgi: "{{ ('ceph' not in glance_available_stores) }}"
+
+# glance default list of bind mounts
+glance_container_bind_mounts:
+  - bind_dir_path: "/var/lib/glance/images"
+    mount_path: "/openstack/{{ inventory_hostname }}"
+  - bind_dir_path: "/var/lib/glance/cache"
+    mount_path: "/openstack/{{ inventory_hostname }}"
diff --git a/inventory/group_vars/glance_all.yml b/inventory/group_vars/glance_all/haproxy_service.yml
similarity index 67%
rename from inventory/group_vars/glance_all.yml
rename to inventory/group_vars/glance_all/haproxy_service.yml
index edc025fe49..aa4ed1e2fa 100644
--- a/inventory/group_vars/glance_all.yml
+++ b/inventory/group_vars/glance_all/haproxy_service.yml
@@ -1,5 +1,5 @@
 ---
-# Copyright 2016, Rackspace US, Inc.
+# Copyright 2023, Cleura AB
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,18 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# If there are Swift hosts in the environment, then use it as the default Glance store
-glance_default_store: "{{ ((groups['swift_all'] is defined) and (groups['swift_all'] | length > 0)) | ternary('swift', 'file') }}"
-glance_available_stores: "{{ [ glance_default_store ] + (glance_additional_stores | default([])) }}"
-glance_use_uwsgi: "{{ ('ceph' not in glance_available_stores) }}"
-
-# glance default list of bind mounts
-glance_container_bind_mounts:
-  - bind_dir_path: "/var/lib/glance/images"
-    mount_path: "/openstack/{{ inventory_hostname }}"
-  - bind_dir_path: "/var/lib/glance/cache"
-    mount_path: "/openstack/{{ inventory_hostname }}"
-
 haproxy_glance_api_service:
   haproxy_service_name: glance_api
   haproxy_backend_nodes: "{{ groups['glance_api'] | default([]) }}"
diff --git a/inventory/group_vars/glance_all/source_git.yml b/inventory/group_vars/glance_all/source_git.yml
new file mode 100644
index 0000000000..562155e695
--- /dev/null
+++ b/inventory/group_vars/glance_all/source_git.yml
@@ -0,0 +1,21 @@
+---
+# Copyright 2023, Cleura AB
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+### HEAD as of 22.03.2023 ###
+
+## Glance service
+glance_git_repo: "{{ openstack_opendev_base_url }}/openstack/glance"
+glance_git_install_branch: 285021bdb0ea344f995508fabb8b4e2485f2cf3c
+glance_git_track_branch: stable/2023.1
diff --git a/inventory/group_vars/gnocchi_all/defaults.yml b/inventory/group_vars/gnocchi_all/defaults.yml
new file mode 100644
index 0000000000..f91ea9bbe9
--- /dev/null
+++ b/inventory/group_vars/gnocchi_all/defaults.yml
@@ -0,0 +1,19 @@
+---
+# Copyright 2016, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Gnocchi default list of bind mounts
+gnocchi_container_bind_mounts:
+  - bind_dir_path: "/var/lib/gnocchi"
+    mount_path: "/openstack/{{ inventory_hostname }}"
diff --git a/inventory/group_vars/gnocchi_all.yml b/inventory/group_vars/gnocchi_all/haproxy_services.yml
similarity index 87%
rename from inventory/group_vars/gnocchi_all.yml
rename to inventory/group_vars/gnocchi_all/haproxy_services.yml
index 28831db673..8cfde6f36d 100644
--- a/inventory/group_vars/gnocchi_all.yml
+++ b/inventory/group_vars/gnocchi_all/haproxy_services.yml
@@ -1,5 +1,5 @@
 ---
-# Copyright 2016, Rackspace US, Inc.
+# Copyright 2023, Cleura AB
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,11 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Gnocchi default list of bind mounts
-gnocchi_container_bind_mounts:
-  - bind_dir_path: "/var/lib/gnocchi"
-    mount_path: "/openstack/{{ inventory_hostname }}"
-
 haproxy_gnocchi_service:
   haproxy_service_name: gnocchi
   haproxy_backend_nodes: "{{ groups['gnocchi_all'] | default([]) }}"
diff --git a/playbooks/defaults/repo_packages/gnocchi.yml b/inventory/group_vars/gnocchi_all/source_git.yml
similarity index 54%
rename from playbooks/defaults/repo_packages/gnocchi.yml
rename to inventory/group_vars/gnocchi_all/source_git.yml
index 2d1131cd84..58a6602bb3 100644
--- a/playbooks/defaults/repo_packages/gnocchi.yml
+++ b/inventory/group_vars/gnocchi_all/source_git.yml
@@ -1,5 +1,5 @@
 ---
-# Copyright 2016, Rackspace US, Inc.
+# Copyright 2023, Cleura AB
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,22 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
-## NOTICE on items in this file:
-##   * If you use anything in the *._git_install_branch field that is not a TAG
-##     make sure to leave an in-line comment as to "why".
-
-## For the sake of anyone else editing this file:
-##   * If you add services to this file please do so in alphabetical order.
-##   * Every entry should be name spaced with the name of the client followed by an "_"
-##   * All items with this file should be separated by `name_` note that the name of the
-##     package should be one long name with no additional `_` separating it.
-
-
-### Before this is shipped all of these services should have a tag set as the branch,
-### or have a comment / reason attached to them as to why a tag can not work.
-
-
 ### HEAD as of 22.03.2023 ###
 
 ## Gnocchi service
diff --git a/inventory/group_vars/heat_all/defaults.yml b/inventory/group_vars/heat_all/defaults.yml
new file mode 100644
index 0000000000..ee1067c563
--- /dev/null
+++ b/inventory/group_vars/heat_all/defaults.yml
@@ -0,0 +1,18 @@
+---
+# Copyright 2016, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Only enable the heat cinder backups functionality if the cinder backup
+# service is enabled.
+heat_cinder_backups_enabled: "{{ hostvars['localhost']['cinder_service_backup_program_enabled'] }}"
diff --git a/inventory/group_vars/heat_all.yml b/inventory/group_vars/heat_all/haproxy_service.yml
similarity index 90%
rename from inventory/group_vars/heat_all.yml
rename to inventory/group_vars/heat_all/haproxy_service.yml
index e142b09934..d31c7a4695 100644
--- a/inventory/group_vars/heat_all.yml
+++ b/inventory/group_vars/heat_all/haproxy_service.yml
@@ -1,5 +1,5 @@
 ---
-# Copyright 2016, Rackspace US, Inc.
+# Copyright 2023, Cleura AB
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,10 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Only enable the heat cinder backups functionality if the cinder backup
-# service is enabled.
-heat_cinder_backups_enabled: "{{ hostvars['localhost']['cinder_service_backup_program_enabled'] }}"
-
 haproxy_heat_api_service:
   haproxy_service_name: heat_api
   haproxy_backend_nodes: "{{ groups['heat_api'] | default([]) }}"
diff --git a/inventory/group_vars/heat_all/source_git.yml b/inventory/group_vars/heat_all/source_git.yml
new file mode 100644
index 0000000000..8848ea55c1
--- /dev/null
+++ b/inventory/group_vars/heat_all/source_git.yml
@@ -0,0 +1,21 @@
+---
+# Copyright 2023, Cleura AB
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+### HEAD as of 22.03.2023 ###
+
+## Heat service
+heat_git_repo: "{{ openstack_opendev_base_url }}/openstack/heat"
+heat_git_install_branch: 6a4c7b57b8383bef4a02fb485e781c4cbb2a03d8
+heat_git_track_branch: stable/2023.1
diff --git a/inventory/group_vars/horizon_all/defaults.yml b/inventory/group_vars/horizon_all/defaults.yml
new file mode 100644
index 0000000000..c46d7cbc50
--- /dev/null
+++ b/inventory/group_vars/horizon_all/defaults.yml
@@ -0,0 +1,17 @@
+---
+# Copyright 2016, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+horizon_enable_cinder_backup: "{{ hostvars['localhost']['cinder_service_backup_program_enabled'] }}"
+horizon_enable_ha_router: "{{ groups['neutron_l3_agent'] | length >= 2 }}"
diff --git a/inventory/group_vars/horizon_all.yml b/inventory/group_vars/horizon_all/haproxy_service.yml
similarity index 91%
rename from inventory/group_vars/horizon_all.yml
rename to inventory/group_vars/horizon_all/haproxy_service.yml
index ca47a63d7d..930d27b31d 100644
--- a/inventory/group_vars/horizon_all.yml
+++ b/inventory/group_vars/horizon_all/haproxy_service.yml
@@ -1,5 +1,5 @@
 ---
-# Copyright 2016, Rackspace US, Inc.
+# Copyright 2023, Cleura AB
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,9 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-horizon_enable_cinder_backup: "{{ hostvars['localhost']['cinder_service_backup_program_enabled'] }}"
-horizon_enable_ha_router: "{{ groups['neutron_l3_agent'] | length >= 2 }}"
-
 # special haproxy stick table for horizon
 # returns 429 when more than 20 calls to /auth per 10 second window
 # returns 429 when more than 20 4xx responses per 10 second window
diff --git a/inventory/group_vars/horizon_all/source_git.yml b/inventory/group_vars/horizon_all/source_git.yml
new file mode 100644
index 0000000000..74fb20a615
--- /dev/null
+++ b/inventory/group_vars/horizon_all/source_git.yml
@@ -0,0 +1,81 @@
+---
+# Copyright 2023, Cleura AB
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+### HEAD as of 22.03.2023 ###
+
+## Horizon service
+horizon_git_repo: "{{ openstack_opendev_base_url }}/openstack/horizon"
+horizon_git_install_branch: 3dd3d4ffe09b62569b187f2b0efb88dbfc1eddaf
+horizon_git_track_branch: stable/2023.1
+
+## Adjutant dashboard plugin
+adjutant_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/adjutant-ui"
+adjutant_dashboard_git_install_branch: 6fa9478b154ba07e4c70aba6c8fa6cc65450fb42
+adjutant_dashboard_git_track_branch: stable/2023.1
+
+## Barbican dashboard plugin
+barbican_dashboard_git_repo: "{{ openstack_opendev_base_url }}//openstack/barbican-ui"
+barbican_dashboard_git_install_branch: 3a78a743426376250f43508d4281e86c75067271
+barbican_dashboard_git_track_branch: master
+
+## Cloudkitty dashboard plugin
+cloudkitty_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/cloudkitty-dashboard"
+cloudkitty_dashboard_git_install_branch: 7cdee86bac20a38d191677eaefe94914cc5207f7
+cloudkitty_dashboard_git_track_branch: stable/2023.1
+
+## Horizon Designate dashboard plugin
+designate_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/designate-dashboard"
+designate_dashboard_git_install_branch: 7bc6a1fc3828d529df37b05f15a84dc8be4223b7
+designate_dashboard_git_track_branch: stable/2023.1
+
+## Horizon Heat dashboard plugin
+heat_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/heat-dashboard"
+heat_dashboard_git_install_branch: 007a7a5a3b338543dd6e3badd04967324e8f0e9b
+heat_dashboard_git_track_branch: stable/2023.1
+
+## Horizon Ironic dashboard plugin
+ironic_dashboard_git_repo: "{{ openstack_opendev_base_url}}/openstack/ironic-ui"
+ironic_dashboard_git_install_branch: 2b93b84b90b2a5953a68bde6e9ee0d15df6e5e83
+ironic_dashboard_git_track_branch: stable/2023.1
+
+## Horizon Magnum dashboard plugin
+magnum_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/magnum-ui"
+magnum_dashboard_git_install_branch: 452ca7da23f4489bc0dd25cfd031d4f1db04dfa6
+magnum_dashboard_git_track_branch: stable/2023.1
+
+## Horizon Masakari dashboard plugin
+masakari_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/masakari-dashboard"
+masakari_dashboard_git_install_branch: 8c7435371df311c8c362fa99007d0d76852d7d79
+masakari_dashboard_git_track_branch: stable/2023.1
+
+## Horizon Murano dashboard plugin
+murano_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/murano-dashboard"
+murano_dashboard_git_install_branch: 6c93b2ca8a840b1299ebf4b654f2ce041374f808
+murano_dashboard_git_track_branch: stable/2023.1
+
+## Horizon Sahara dashboard plugin
+sahara_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/sahara-dashboard"
+sahara_dashboard_git_install_branch: 628ccfadc3922852fb02ad6c26f74ed8f77f7f75
+sahara_dashboard_git_track_branch: stable/2023.1
+
+## Horizon Trove dashboard plugin
+trove_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/trove-dashboard"
+trove_dashboard_git_install_branch: aadf4a9ce2ed542e6b68e3c2f212fef9d9948b50
+trove_dashboard_git_track_branch: stable/2023.1
+
+## Horizon Octavia dashboard plugin
+octavia_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/octavia-dashboard"
+octavia_dashboard_git_install_branch: d1a6dd8995c0fcd7333408eae4f38437f65ef9b8
+octavia_dashboard_git_track_branch: stable/2023.1
diff --git a/inventory/group_vars/ironic_all.yml b/inventory/group_vars/ironic_all/haproxy_service.yml
similarity index 100%
rename from inventory/group_vars/ironic_all.yml
rename to inventory/group_vars/ironic_all/haproxy_service.yml
diff --git a/inventory/group_vars/ironic_all/source_git.yml b/inventory/group_vars/ironic_all/source_git.yml
new file mode 100644
index 0000000000..aed93623bc
--- /dev/null
+++ b/inventory/group_vars/ironic_all/source_git.yml
@@ -0,0 +1,26 @@
+---
+# Copyright 2023, Cleura AB
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+### HEAD as of 22.03.2023 ###
+
+## Ironic service
+ironic_git_repo: "{{ openstack_opendev_base_url }}/openstack/ironic"
+ironic_git_install_branch: 943604cb417914194331b8ce5916766b50553128
+ironic_git_track_branch: stable/2023.1
+
+## Ironic inspector service
+ironic_inspector_git_repo: "{{ openstack_opendev_base_url }}/openstack/ironic-inspector"
+ironic_inspector_git_install_branch: 8258f1e15a7d76063b26cdd20d4ef9b0ec8d643a
+ironic_inspector_git_track_branch: stable/2023.1
diff --git a/inventory/group_vars/keystone_all/defaults.yml b/inventory/group_vars/keystone_all/defaults.yml
new file mode 100644
index 0000000000..694b2a3007
--- /dev/null
+++ b/inventory/group_vars/keystone_all/defaults.yml
@@ -0,0 +1,20 @@
+---
+# Copyright 2016, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# These are here rather than in keystone_all because
+# both the os_ceilometer and os_keystone roles require them
+
+# Hosts allowed to override remote IP with X-Forwarded-For
+keystone_set_real_ip_from: "{{ groups['haproxy'] | map('extract', hostvars, 'container_address') | list }}"
diff --git a/inventory/group_vars/keystone_all.yml b/inventory/group_vars/keystone_all/haproxy_service.yml
similarity index 81%
rename from inventory/group_vars/keystone_all.yml
rename to inventory/group_vars/keystone_all/haproxy_service.yml
index b021a132a4..6829feb53c 100644
--- a/inventory/group_vars/keystone_all.yml
+++ b/inventory/group_vars/keystone_all/haproxy_service.yml
@@ -1,5 +1,5 @@
 ---
-# Copyright 2016, Rackspace US, Inc.
+# Copyright 2023, Cleura AB
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,12 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# These are here rather than in keystone_all because
-# both the os_ceilometer and os_keystone roles require them
-
-# Hosts allowed to override remote IP with X-Forwarded-For
-keystone_set_real_ip_from: "{{ groups['haproxy'] | map('extract', hostvars, 'container_address') | list }}"
-
 haproxy_keystone_service:
   haproxy_service_name: keystone_service
   haproxy_backend_nodes: "{{ groups['keystone_all'] | default([])  }}"
diff --git a/inventory/group_vars/keystone_all/source_git.yml b/inventory/group_vars/keystone_all/source_git.yml
new file mode 100644
index 0000000000..abd12ca7aa
--- /dev/null
+++ b/inventory/group_vars/keystone_all/source_git.yml
@@ -0,0 +1,21 @@
+---
+# Copyright 2023, Cleura AB
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+### HEAD as of 22.03.2023 ###
+
+## Keystone service
+keystone_git_repo: "{{ openstack_opendev_base_url }}/openstack/keystone"
+keystone_git_install_branch: c08d97672dcd40f8d927f91e59049053cfe3b5e4
+keystone_git_track_branch: stable/2023.1
diff --git a/inventory/group_vars/magnum_all.yml b/inventory/group_vars/magnum_all/haproxy_service.yml
similarity index 100%
rename from inventory/group_vars/magnum_all.yml
rename to inventory/group_vars/magnum_all/haproxy_service.yml
diff --git a/inventory/group_vars/magnum_all/source_git.yml b/inventory/group_vars/magnum_all/source_git.yml
new file mode 100644
index 0000000000..42b7724dea
--- /dev/null
+++ b/inventory/group_vars/magnum_all/source_git.yml
@@ -0,0 +1,21 @@
+---
+# Copyright 2023, Cleura AB
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+### HEAD as of 22.03.2023 ###
+
+## Magnum service
+magnum_git_repo: "{{ openstack_opendev_base_url }}/openstack/magnum"
+magnum_git_install_branch: 848c34a420aac00731447436c282e5c94d4e7b20
+magnum_git_track_branch: stable/2023.1
diff --git a/inventory/group_vars/manila_all.yml b/inventory/group_vars/manila_all/haproxy_service.yml
similarity index 100%
rename from inventory/group_vars/manila_all.yml
rename to inventory/group_vars/manila_all/haproxy_service.yml
diff --git a/inventory/group_vars/manila_all/source_git.yml b/inventory/group_vars/manila_all/source_git.yml
new file mode 100644
index 0000000000..9f57e7cae4
--- /dev/null
+++ b/inventory/group_vars/manila_all/source_git.yml
@@ -0,0 +1,21 @@
+---
+# Copyright 2023, Cleura AB
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+### HEAD as of 22.03.2023 ###
+
+## Manila service
+manila_git_repo: "{{ openstack_opendev_base_url }}/openstack/manila"
+manila_git_install_branch: f03e84ae6212ed80e3b1e56ff289cf13634e9a80
+manila_git_track_branch: stable/2023.1
diff --git a/inventory/group_vars/masakari_all.yml b/inventory/group_vars/masakari_all/haproxy_service.yml
similarity index 100%
rename from inventory/group_vars/masakari_all.yml
rename to inventory/group_vars/masakari_all/haproxy_service.yml
diff --git a/inventory/group_vars/masakari_all/source_git.yml b/inventory/group_vars/masakari_all/source_git.yml
new file mode 100644
index 0000000000..478ab59b16
--- /dev/null
+++ b/inventory/group_vars/masakari_all/source_git.yml
@@ -0,0 +1,26 @@
+---
+# Copyright 2023, Cleura AB
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+### HEAD as of 22.03.2023 ###
+
+## Masakari service
+masakari_git_repo: "{{ openstack_opendev_base_url }}/openstack/masakari"
+masakari_git_install_branch: 72b6929271a38b87cf43489fd9ce28e35c41cedb
+masakari_git_track_branch: stable/2023.1
+
+## Masakari monitors services
+masakari_monitors_git_repo: "{{ openstack_opendev_base_url }}/openstack/masakari-monitors"
+masakari_monitors_git_install_branch: 9192f777840a45a5bc14e261813004ecfc59cf45
+masakari_monitors_git_track_branch: stable/2023.1
diff --git a/inventory/group_vars/mistral_all.yml b/inventory/group_vars/mistral_all/haproxy_service.yml
similarity index 100%
rename from inventory/group_vars/mistral_all.yml
rename to inventory/group_vars/mistral_all/haproxy_service.yml
diff --git a/inventory/group_vars/mistral_all/source_git.yml b/inventory/group_vars/mistral_all/source_git.yml
new file mode 100644
index 0000000000..82e60ca903
--- /dev/null
+++ b/inventory/group_vars/mistral_all/source_git.yml
@@ -0,0 +1,25 @@
+---
+# Copyright 2023, Cleura AB
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+### HEAD as of 22.03.2023 ###
+
+## Mistral service
+mistral_git_repo: "{{ openstack_opendev_base_url }}/openstack/mistral"
+mistral_git_install_branch: af2b9c5cd8d3bca74f560491fb140809fc27931c
+mistral_git_track_branch: stable/2023.1
+
+mistral_extra_git_repo: "{{ openstack_opendev_base_url }}/openstack/mistral-extra"
+mistral_extra_git_install_branch: e0687d607319b796503859353b8f3ab1cc9aa9f5
+mistral_extra_git_track_branch: stable/2023.1
diff --git a/inventory/group_vars/murano_all.yml b/inventory/group_vars/murano_all/haproxy_service.yml
similarity index 100%
rename from inventory/group_vars/murano_all.yml
rename to inventory/group_vars/murano_all/haproxy_service.yml
diff --git a/inventory/group_vars/murano_all/source_git.yml b/inventory/group_vars/murano_all/source_git.yml
new file mode 100644
index 0000000000..3ea1c3e81b
--- /dev/null
+++ b/inventory/group_vars/murano_all/source_git.yml
@@ -0,0 +1,21 @@
+---
+# Copyright 2023, Cleura AB
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+### HEAD as of 22.03.2023 ###
+
+## Murano service
+murano_git_repo: "{{ openstack_opendev_base_url }}/openstack/murano"
+murano_git_install_branch: 19dc9648e1a760037b7a67a3ec169483b3bc0609
+murano_git_track_branch: stable/2023.1
diff --git a/inventory/group_vars/neutron_all.yml b/inventory/group_vars/neutron_all/haproxy_service.yml
similarity index 100%
rename from inventory/group_vars/neutron_all.yml
rename to inventory/group_vars/neutron_all/haproxy_service.yml
diff --git a/inventory/group_vars/neutron_all/source_git.yml b/inventory/group_vars/neutron_all/source_git.yml
new file mode 100644
index 0000000000..663a29b66e
--- /dev/null
+++ b/inventory/group_vars/neutron_all/source_git.yml
@@ -0,0 +1,57 @@
+---
+# Copyright 2023, Cleura AB
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+### HEAD as of 22.03.2023 ###
+
+## Neutron service
+neutron_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron"
+neutron_git_install_branch: f822742af06b4e0e7e9729ad600102258df0ddad
+neutron_git_track_branch: stable/2023.1
+
+neutron_vpnaas_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron-vpnaas"
+neutron_vpnaas_git_install_branch: 6ed22d4d75112a19aabde2816694d94e44ca16a2
+neutron_vpnaas_git_track_branch: stable/2023.1
+
+neutron_dynamic_routing_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron-dynamic-routing"
+neutron_dynamic_routing_git_install_branch: 13e0d8a63dbdbd9e1a863144999794d4fc9af22d
+neutron_dynamic_routing_git_track_branch: stable/2023.1
+
+networking_odl_git_repo: "{{ openstack_opendev_base_url }}/openstack/networking-odl"
+networking_odl_git_install_branch: 48936559c71606d5e43fba1ad4382d74110e7d01
+networking_odl_git_track_branch: stable/2023.1
+
+networking_bgpvpn_git_repo: "{{ openstack_opendev_base_url }}/openstack/networking-bgpvpn"
+networking_bgpvpn_git_install_branch: 039fdc096e0971b90a96ea07a2ef6e3196858594
+networking_bgpvpn_git_track_branch: stable/2023.1
+
+networking_sfc_git_repo: "{{ openstack_opendev_base_url }}/openstack/networking-sfc"
+networking_sfc_git_install_branch: a93b4de04b0f1e34119ab306331b211c0c9dd815
+networking_sfc_git_track_branch: stable/2023.1
+
+networking_generic_switch_git_repo: "{{ openstack_opendev_base_url}}/openstack/networking-generic-switch"
+networking_generic_switch_git_install_branch: 6dcc83c4bac921cbcfc37ece974287f095611883
+networking_generic_switch_git_track_branch: stable/2023.1
+
+networking_nsx_git_repo: "{{ openstack_opendev_base_url }}/x/vmware-nsx"
+networking_nsx_git_install_branch: 0253265f75f63d5619b30f16a6b64459dec79d82
+networking_nsx_git_track_branch: master
+
+networking_nsxlib_git_repo: "{{ openstack_opendev_base_url }}/x/vmware-nsxlib"
+networking_nsxlib_git_install_branch: acb8f2d53fa12880fab548e21f15b0329c5f8eb5
+networking_nsxlib_git_track_branch: master
+
+networking_baremetal_git_repo: "{{ openstack_opendev_base_url }}/openstack/networking-baremetal"
+networking_baremetal_git_install_branch: 1529ce98313336e2ef431bc1113139b790d1c92c
+networking_baremetal_git_track_branch: stable/2023.1
diff --git a/inventory/group_vars/nova_all/defaults.yml b/inventory/group_vars/nova_all/defaults.yml
new file mode 100644
index 0000000000..1db815051d
--- /dev/null
+++ b/inventory/group_vars/nova_all/defaults.yml
@@ -0,0 +1,16 @@
+---
+# Copyright 2016, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+nova_ceph_client_uuid: '{{ cinder_ceph_client_uuid | default() }}'
diff --git a/inventory/group_vars/nova_all.yml b/inventory/group_vars/nova_all/haproxy_service.yml
similarity index 98%
rename from inventory/group_vars/nova_all.yml
rename to inventory/group_vars/nova_all/haproxy_service.yml
index f7755f23ac..332c43a00c 100644
--- a/inventory/group_vars/nova_all.yml
+++ b/inventory/group_vars/nova_all/haproxy_service.yml
@@ -1,5 +1,5 @@
 ---
-# Copyright 2016, Rackspace US, Inc.
+# Copyright 2023, Cleura AB
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-nova_ceph_client_uuid: '{{ cinder_ceph_client_uuid | default() }}'
-
 # By default the nova console service on HAProxy is configured in HTTP mode to
 # allow for more fine grained control. But if the SSL connection is terminated
 # on the nova console container it has to be run in TCP mode.
diff --git a/playbooks/defaults/repo_packages/nova_consoles.yml b/inventory/group_vars/nova_all/source_git.yml
similarity index 87%
rename from playbooks/defaults/repo_packages/nova_consoles.yml
rename to inventory/group_vars/nova_all/source_git.yml
index f05f21defd..68ab8fccae 100644
--- a/playbooks/defaults/repo_packages/nova_consoles.yml
+++ b/inventory/group_vars/nova_all/source_git.yml
@@ -1,5 +1,5 @@
 ---
-# Copyright 2014, Rackspace US, Inc.
+# Copyright 2023, Cleura AB
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
 ## NOTICE on items in this file:
 ##   * If you use anything in the *._git_install_branch field that is not a TAG
 ##     make sure to leave an in-line comment as to "why".
@@ -31,8 +30,12 @@ novncproxy_git_repo: "{{ openstack_github_base_url }}/novnc/noVNC"
 novncproxy_git_install_branch: 9985950bfa7bd712b957be8d3358049b54cd534d
 novncproxy_git_track_branch: master
 
-
 ## spice-html5 from source
 spicehtml5_git_repo: "https://gitlab.freedesktop.org/spice/spice-html5"
 spicehtml5_git_install_branch: 56ddb3005e39a9e76670fec9676e667d44167bf3
 spicehtml5_git_track_branch: master
+
+## Nova service
+nova_git_repo: "{{ openstack_opendev_base_url }}/openstack/nova"
+nova_git_install_branch: 47b6850bb1f3681e6af7d8248152a979bf5051d1
+nova_git_track_branch: stable/2023.1
diff --git a/inventory/group_vars/octavia_all.yml b/inventory/group_vars/octavia_all/haproxy_service.yml
similarity index 100%
rename from inventory/group_vars/octavia_all.yml
rename to inventory/group_vars/octavia_all/haproxy_service.yml
diff --git a/inventory/group_vars/octavia_all/source_git.yml b/inventory/group_vars/octavia_all/source_git.yml
new file mode 100644
index 0000000000..1a02c8c942
--- /dev/null
+++ b/inventory/group_vars/octavia_all/source_git.yml
@@ -0,0 +1,26 @@
+---
+# Copyright 2023, Cleura AB
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+### HEAD as of 22.03.2023 ###
+
+## Octavia service
+octavia_git_repo: "{{ openstack_opendev_base_url }}/openstack/octavia"
+octavia_git_install_branch: 4486d2416f600df15df1b5c98a676f898e2b1d42
+octavia_git_track_branch: stable/2023.1
+
+## Octavia OVN provider
+octavia_ovn_octavia_provider_git_repo: "{{ openstack_opendev_base_url }}/openstack/ovn-octavia-provider"
+octavia_ovn_octavia_provider_git_install_branch: b29211686375b7179641c8580264e11f85a63a24
+octavia_ovn_octavia_provider_git_track_branch: stable/2023.1
diff --git a/inventory/group_vars/placement_all.yml b/inventory/group_vars/placement_all/haproxy_service.yml
similarity index 100%
rename from inventory/group_vars/placement_all.yml
rename to inventory/group_vars/placement_all/haproxy_service.yml
diff --git a/inventory/group_vars/placement_all/source_git.yml b/inventory/group_vars/placement_all/source_git.yml
new file mode 100644
index 0000000000..63baad9e79
--- /dev/null
+++ b/inventory/group_vars/placement_all/source_git.yml
@@ -0,0 +1,21 @@
+---
+# Copyright 2023, Cleura AB
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+### HEAD as of 22.03.2023 ###
+
+## Placement service
+placement_git_repo: "{{ openstack_opendev_base_url }}/openstack/placement"
+placement_git_install_branch: b3652feea1855c9481c9441976379d9851c0c62f
+placement_git_track_branch: stable/2023.1
diff --git a/inventory/group_vars/sahara_all.yml b/inventory/group_vars/sahara_all/haproxy_service.yml
similarity index 100%
rename from inventory/group_vars/sahara_all.yml
rename to inventory/group_vars/sahara_all/haproxy_service.yml
diff --git a/inventory/group_vars/sahara_all/source_git.yml b/inventory/group_vars/sahara_all/source_git.yml
new file mode 100644
index 0000000000..9d232ad702
--- /dev/null
+++ b/inventory/group_vars/sahara_all/source_git.yml
@@ -0,0 +1,21 @@
+---
+# Copyright 2023, Cleura AB
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+### HEAD as of 22.03.2023 ###
+
+## Sahara service
+sahara_git_repo: "{{ openstack_opendev_base_url }}/openstack/sahara"
+sahara_git_install_branch: 5e7258bcc8807493f08671be9b8f4f4c4232eb0a
+sahara_git_track_branch: stable/2023.1
diff --git a/inventory/group_vars/senlin_all.yml b/inventory/group_vars/senlin_all/haproxy_service.yml
similarity index 100%
rename from inventory/group_vars/senlin_all.yml
rename to inventory/group_vars/senlin_all/haproxy_service.yml
diff --git a/inventory/group_vars/senlin_all/source_git.yml b/inventory/group_vars/senlin_all/source_git.yml
new file mode 100644
index 0000000000..cc57d551cc
--- /dev/null
+++ b/inventory/group_vars/senlin_all/source_git.yml
@@ -0,0 +1,21 @@
+---
+# Copyright 2023, Cleura AB
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+### HEAD as of 22.03.2023 ###
+
+## Senlin service
+senlin_git_repo: "{{ openstack_opendev_base_url }}/openstack/senlin"
+senlin_git_install_branch: 22fd77946723e25e595676e61893c1f645709b2f
+senlin_git_track_branch: stable/2023.1
diff --git a/inventory/group_vars/swift_all/defaults.yml b/inventory/group_vars/swift_all/defaults.yml
new file mode 100644
index 0000000000..07b2a6a11f
--- /dev/null
+++ b/inventory/group_vars/swift_all/defaults.yml
@@ -0,0 +1,20 @@
+---
+# Copyright 2016, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+swift_proxy_port: "{{ hostvars['localhost']['swift_proxy_port'] }}"
+swift_system_user_name: "{{ hostvars['localhost']['swift_system_user_name'] }}"
+swift_system_shell: "{{ hostvars['localhost']['swift_system_shell'] }}"
+swift_system_comment: "{{ hostvars['localhost']['swift_system_comment'] }}"
+swift_system_home_folder: "{{ hostvars['localhost']['swift_system_home_folder'] }}"
diff --git a/inventory/group_vars/swift_all.yml b/inventory/group_vars/swift_all/haproxy_service.yml
similarity index 79%
rename from inventory/group_vars/swift_all.yml
rename to inventory/group_vars/swift_all/haproxy_service.yml
index a1b59a10cf..c7374ce3a9 100644
--- a/inventory/group_vars/swift_all.yml
+++ b/inventory/group_vars/swift_all/haproxy_service.yml
@@ -1,5 +1,5 @@
 ---
-# Copyright 2016, Rackspace US, Inc.
+# Copyright 2023, Cleura AB
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,12 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-swift_proxy_port: "{{ hostvars['localhost']['swift_proxy_port'] }}"
-swift_system_user_name: "{{ hostvars['localhost']['swift_system_user_name'] }}"
-swift_system_shell: "{{ hostvars['localhost']['swift_system_shell'] }}"
-swift_system_comment: "{{ hostvars['localhost']['swift_system_comment'] }}"
-swift_system_home_folder: "{{ hostvars['localhost']['swift_system_home_folder'] }}"
-
 haproxy_swift_proxy_service:
   haproxy_service_name: swift_proxy
   haproxy_backend_nodes: "{{ groups['swift_proxy'] | default([]) }}"
diff --git a/inventory/group_vars/swift_all/source_git.yml b/inventory/group_vars/swift_all/source_git.yml
new file mode 100644
index 0000000000..c939dc146b
--- /dev/null
+++ b/inventory/group_vars/swift_all/source_git.yml
@@ -0,0 +1,21 @@
+---
+# Copyright 2023, Cleura AB
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+### HEAD as of 22.03.2023 ###
+
+## Swift service
+swift_git_repo: "{{ openstack_opendev_base_url }}/openstack/swift"
+swift_git_install_branch: 9a1bfb8975fb1315fb417161a2865b6bb4760415
+swift_git_track_branch: master
diff --git a/inventory/group_vars/tacker_all.yml b/inventory/group_vars/tacker_all/haproxy_service.yml
similarity index 100%
rename from inventory/group_vars/tacker_all.yml
rename to inventory/group_vars/tacker_all/haproxy_service.yml
diff --git a/inventory/group_vars/tacker_all/source_git.yml b/inventory/group_vars/tacker_all/source_git.yml
new file mode 100644
index 0000000000..10e1fc18da
--- /dev/null
+++ b/inventory/group_vars/tacker_all/source_git.yml
@@ -0,0 +1,21 @@
+---
+# Copyright 2023, Cleura AB
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+### HEAD as of 22.03.2023 ###
+
+## Tacker service
+tacker_git_repo: "{{ openstack_opendev_base_url }}/openstack/tacker"
+tacker_git_install_branch: 40a15b59455fdc6b34eecd641af514d32888a5a2
+tacker_git_track_branch: stable/2023.1
diff --git a/inventory/group_vars/trove_all/defaults.yml b/inventory/group_vars/trove_all/defaults.yml
new file mode 100644
index 0000000000..5b090aa94c
--- /dev/null
+++ b/inventory/group_vars/trove_all/defaults.yml
@@ -0,0 +1,16 @@
+---
+# Copyright 2016 Internet Solutions (Pty) Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+swift_proxy_port: "{{ hostvars['localhost']['swift_proxy_port'] }}"
diff --git a/inventory/group_vars/trove_all.yml b/inventory/group_vars/trove_all/haproxy_service.yml
similarity index 91%
rename from inventory/group_vars/trove_all.yml
rename to inventory/group_vars/trove_all/haproxy_service.yml
index cdd014f865..c21dbdea1f 100644
--- a/inventory/group_vars/trove_all.yml
+++ b/inventory/group_vars/trove_all/haproxy_service.yml
@@ -1,5 +1,5 @@
 ---
-# Copyright 2016 Internet Solutions (Pty) Ltd
+# Copyright 2023, Cleura AB
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-swift_proxy_port: "{{ hostvars['localhost']['swift_proxy_port'] }}"
-
 haproxy_trove_service:
   haproxy_service_name: trove
   haproxy_backend_nodes: "{{ groups['trove_api'] | default([]) }}"
diff --git a/inventory/group_vars/trove_all/source_git.yml b/inventory/group_vars/trove_all/source_git.yml
new file mode 100644
index 0000000000..a33865b5d8
--- /dev/null
+++ b/inventory/group_vars/trove_all/source_git.yml
@@ -0,0 +1,21 @@
+---
+# Copyright 2023, Cleura AB
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+### HEAD as of 22.03.2023 ###
+
+## Trove service
+trove_git_repo: "{{ openstack_opendev_base_url }}/openstack/trove"
+trove_git_install_branch: 8d54913b36fc3d8a80fb02f78dc541f0f08f763b
+trove_git_track_branch: stable/2023.1
diff --git a/inventory/group_vars/utility_all.yml b/inventory/group_vars/utility_all/defaults.yml
similarity index 100%
rename from inventory/group_vars/utility_all.yml
rename to inventory/group_vars/utility_all/defaults.yml
diff --git a/playbooks/defaults/repo_packages/openstack_testing.yml b/inventory/group_vars/utility_all/source_git.yml
similarity index 100%
rename from playbooks/defaults/repo_packages/openstack_testing.yml
rename to inventory/group_vars/utility_all/source_git.yml
diff --git a/inventory/group_vars/zun_all.yml b/inventory/group_vars/zun_all/haproxy_service.yml
similarity index 100%
rename from inventory/group_vars/zun_all.yml
rename to inventory/group_vars/zun_all/haproxy_service.yml
diff --git a/inventory/group_vars/zun_all/source_git.yml b/inventory/group_vars/zun_all/source_git.yml
new file mode 100644
index 0000000000..7aff72b8b0
--- /dev/null
+++ b/inventory/group_vars/zun_all/source_git.yml
@@ -0,0 +1,31 @@
+---
+# Copyright 2023, Cleura AB
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+### HEAD as of 22.03.2023 ###
+
+## Zun service
+zun_git_repo: "{{ openstack_opendev_base_url }}/openstack/zun"
+zun_git_install_branch: 6d4039bc7bc88ecd3caaeee33126ed85e8cf09f0
+zun_git_track_branch: stable/2023.1
+
+## Zun kuryr service
+zun_kuryr_git_repo: "{{ openstack_opendev_base_url }}/openstack/kuryr-libnetwork"
+zun_kuryr_git_install_branch: a6628c266cb364ffddf3f15c2ccb1ee3ee474f44
+zun_kuryr_git_track_branch: stable/2023.1
+
+## Zun kuryr library
+zun_kuryr_lib_git_repo: "{{ openstack_opendev_base_url }}/openstack/kuryr"
+zun_kuryr_lib_git_install_branch: 1616fda8d29814c106ab7a95c5661887516f825a
+zun_kuryr_lib_git_track_branch: stable/2023.1
diff --git a/playbooks/common-playbooks/cinder.yml b/playbooks/common-playbooks/cinder.yml
index f79ef25e8d..c26aaf53b8 100644
--- a/playbooks/common-playbooks/cinder.yml
+++ b/playbooks/common-playbooks/cinder.yml
@@ -39,7 +39,6 @@
   user: root
   environment: "{{ deployment_environment_variables | default({}) }}"
   vars_files:
-    - "../defaults/repo_packages/openstack_services.yml"
     - "../defaults/{{ install_method }}_install.yml"
   tags:
     - cinder
diff --git a/playbooks/common-playbooks/neutron.yml b/playbooks/common-playbooks/neutron.yml
index f9e5aa5bc9..5627fd3de2 100644
--- a/playbooks/common-playbooks/neutron.yml
+++ b/playbooks/common-playbooks/neutron.yml
@@ -39,7 +39,6 @@
   user: root
   environment: "{{ deployment_environment_variables | default({}) }}"
   vars_files:
-    - "../defaults/repo_packages/openstack_services.yml"
     - "../defaults/{{ install_method }}_install.yml"
   tags:
     - neutron
diff --git a/playbooks/common-playbooks/nova.yml b/playbooks/common-playbooks/nova.yml
index c39e069cfb..de1ae135f8 100644
--- a/playbooks/common-playbooks/nova.yml
+++ b/playbooks/common-playbooks/nova.yml
@@ -39,8 +39,6 @@
   user: root
   environment: "{{ deployment_environment_variables | default({}) }}"
   vars_files:
-    - "../defaults/repo_packages/openstack_services.yml"
-    - "../defaults/repo_packages/nova_consoles.yml"
     - "../defaults/{{ install_method }}_install.yml"
   tags:
     - nova
diff --git a/playbooks/containers-lxc-create.yml b/playbooks/containers-lxc-create.yml
index e9527769b7..aae8a5af91 100644
--- a/playbooks/containers-lxc-create.yml
+++ b/playbooks/containers-lxc-create.yml
@@ -68,7 +68,6 @@
   user: root
   gather_facts: false
   vars_files:
-    - defaults/repo_packages/openstack_services.yml
     - "defaults/{{ install_method }}_install.yml"
   environment: "{{ deployment_environment_variables | default({}) }}"
   tags:
diff --git a/playbooks/containers-lxc-host.yml b/playbooks/containers-lxc-host.yml
index 69ccd9c4e7..3768603b0f 100644
--- a/playbooks/containers-lxc-host.yml
+++ b/playbooks/containers-lxc-host.yml
@@ -25,7 +25,6 @@
   gather_facts: false
   serial: "{{ lxc_hosts_serial | default(['100%']) }}"
   vars_files:
-    - defaults/repo_packages/openstack_services.yml
     - "defaults/{{ install_method }}_install.yml"
   environment: "{{ deployment_environment_variables | default({}) }}"
   tags:
diff --git a/playbooks/defaults/repo_packages/openstack_services.yml b/playbooks/defaults/repo_packages/openstack_services.yml
deleted file mode 100644
index 983b9ea174..0000000000
--- a/playbooks/defaults/repo_packages/openstack_services.yml
+++ /dev/null
@@ -1,309 +0,0 @@
----
-# Copyright 2014, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-## NOTICE on items in this file:
-##   * If you use anything in the *._git_install_branch field that is not a TAG
-##     or SHA make sure to leave an in-line comment as to "why".
-
-## For the sake of anyone else editing this file:
-##   * If you add services to this file please do so in alphabetical order.
-##   * Every entry should be name spaced with the name of the client followed by an "_"
-##   * All items with this file should be separated by `name_` note that the name of the
-##     package should be one long name with no additional `_` separating it.
-
-### Default values for variables in this file are:
-## openstack_opendev_base_url: https://opendev.org
-## openstack_github_base_url: https://github.com
-
-### Before this is shipped all of these services should have a tag set as the branch,
-### or have a comment / reason attached to them as to why a tag can not work.
-
-### HEAD as of 22.03.2023 ###
-
-## Global Requirements
-requirements_git_repo: "{{ openstack_opendev_base_url }}/openstack/requirements"
-requirements_git_install_branch: 65245016de7cf2d1e585eeb1378aac6aa6d75de0
-requirements_git_track_branch: stable/2023.1
-
-## Adjutant service
-adjutant_git_repo: "{{ openstack_opendev_base_url }}/openstack/adjutant"
-adjutant_git_install_branch: df8c3e4a8b70be8697ac46f0acec9169752b4698
-adjutant_git_track_branch: stable/2023.1
-
-## Adjutant dashboard plugin
-adjutant_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/adjutant-ui"
-adjutant_dashboard_git_install_branch: 6fa9478b154ba07e4c70aba6c8fa6cc65450fb42
-adjutant_dashboard_git_track_branch: stable/2023.1
-
-## Aodh service
-aodh_git_repo: "{{ openstack_opendev_base_url }}/openstack/aodh"
-aodh_git_install_branch: ecbbd3078e2ee17f01eb4048770c851b864d9122
-aodh_git_track_branch: stable/2023.1
-
-## Barbican service
-barbican_git_repo: "{{ openstack_opendev_base_url }}/openstack/barbican"
-barbican_git_install_branch: b5c2f8385c17ac9e02cfb12bcff606788043961d
-barbican_git_track_branch: stable/2023.1
-
-## Barbican dashboard plugin
-barbican_dashboard_git_repo: "{{ openstack_opendev_base_url }}//openstack/barbican-ui"
-barbican_dashboard_git_install_branch: 3a78a743426376250f43508d4281e86c75067271
-barbican_dashboard_git_track_branch: master
-
-## Ceilometer service
-ceilometer_git_repo: "{{ openstack_opendev_base_url }}/openstack/ceilometer"
-ceilometer_git_install_branch: 78c2459bdd981a5acab38a445f92d1bfec045cbd
-ceilometer_git_track_branch: stable/2023.1
-
-## Cinder service
-cinder_git_repo: "{{ openstack_opendev_base_url }}/openstack/cinder"
-cinder_git_install_branch: 24266a2107b7caffb9fc79769e298a84340d8ba8
-cinder_git_track_branch: stable/2023.1
-
-## Cloudkitty service
-cloudkitty_git_repo: "{{ openstack_opendev_base_url }}/openstack/cloudkitty"
-cloudkitty_git_install_branch: 73d5543f15ec188fafa1562f4142edd41afbad5c
-cloudkitty_git_track_branch: stable/2023.1
-
-## Cloudkitty dashboard plugin
-cloudkitty_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/cloudkitty-dashboard"
-cloudkitty_dashboard_git_install_branch: 7cdee86bac20a38d191677eaefe94914cc5207f7
-cloudkitty_dashboard_git_track_branch: stable/2023.1
-
-## Designate service
-designate_git_repo: "{{ openstack_opendev_base_url }}/openstack/designate"
-designate_git_install_branch: bda31ec62c3eaa7fcdd25d69f97742744debf915
-designate_git_track_branch: stable/2023.1
-
-## Horizon Designate dashboard plugin
-designate_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/designate-dashboard"
-designate_dashboard_git_install_branch: 7bc6a1fc3828d529df37b05f15a84dc8be4223b7
-designate_dashboard_git_track_branch: stable/2023.1
-
-## Glance service
-glance_git_repo: "{{ openstack_opendev_base_url }}/openstack/glance"
-glance_git_install_branch: 285021bdb0ea344f995508fabb8b4e2485f2cf3c
-glance_git_track_branch: stable/2023.1
-
-## Heat service
-heat_git_repo: "{{ openstack_opendev_base_url }}/openstack/heat"
-heat_git_install_branch: 6a4c7b57b8383bef4a02fb485e781c4cbb2a03d8
-heat_git_track_branch: stable/2023.1
-
-## Horizon Heat dashboard plugin
-heat_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/heat-dashboard"
-heat_dashboard_git_install_branch: 007a7a5a3b338543dd6e3badd04967324e8f0e9b
-heat_dashboard_git_track_branch: stable/2023.1
-
-## Horizon service
-horizon_git_repo: "{{ openstack_opendev_base_url }}/openstack/horizon"
-horizon_git_install_branch: 3dd3d4ffe09b62569b187f2b0efb88dbfc1eddaf
-horizon_git_track_branch: stable/2023.1
-
-## Horizon Ironic dashboard plugin
-ironic_dashboard_git_repo: "{{ openstack_opendev_base_url}}/openstack/ironic-ui"
-ironic_dashboard_git_install_branch: 2b93b84b90b2a5953a68bde6e9ee0d15df6e5e83
-ironic_dashboard_git_track_branch: stable/2023.1
-
-## Horizon Magnum dashboard plugin
-magnum_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/magnum-ui"
-magnum_dashboard_git_install_branch: 452ca7da23f4489bc0dd25cfd031d4f1db04dfa6
-magnum_dashboard_git_track_branch: stable/2023.1
-
-## Horizon Masakari dashboard plugin
-masakari_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/masakari-dashboard"
-masakari_dashboard_git_install_branch: 8c7435371df311c8c362fa99007d0d76852d7d79
-masakari_dashboard_git_track_branch: stable/2023.1
-
-## Horizon Sahara dashboard plugin
-sahara_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/sahara-dashboard"
-sahara_dashboard_git_install_branch: 628ccfadc3922852fb02ad6c26f74ed8f77f7f75
-sahara_dashboard_git_track_branch: stable/2023.1
-
-## Keystone service
-keystone_git_repo: "{{ openstack_opendev_base_url }}/openstack/keystone"
-keystone_git_install_branch: c08d97672dcd40f8d927f91e59049053cfe3b5e4
-keystone_git_track_branch: stable/2023.1
-
-## Manila service
-manila_git_repo: "{{ openstack_opendev_base_url }}/openstack/manila"
-manila_git_install_branch: f03e84ae6212ed80e3b1e56ff289cf13634e9a80
-manila_git_track_branch: stable/2023.1
-
-## Neutron service
-neutron_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron"
-neutron_git_install_branch: f822742af06b4e0e7e9729ad600102258df0ddad
-neutron_git_track_branch: stable/2023.1
-
-neutron_vpnaas_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron-vpnaas"
-neutron_vpnaas_git_install_branch: 6ed22d4d75112a19aabde2816694d94e44ca16a2
-neutron_vpnaas_git_track_branch: stable/2023.1
-
-
-neutron_dynamic_routing_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron-dynamic-routing"
-neutron_dynamic_routing_git_install_branch: 13e0d8a63dbdbd9e1a863144999794d4fc9af22d
-neutron_dynamic_routing_git_track_branch: stable/2023.1
-
-networking_odl_git_repo: "{{ openstack_opendev_base_url }}/openstack/networking-odl"
-networking_odl_git_install_branch: 48936559c71606d5e43fba1ad4382d74110e7d01
-networking_odl_git_track_branch: stable/2023.1
-
-networking_bgpvpn_git_repo: "{{ openstack_opendev_base_url }}/openstack/networking-bgpvpn"
-networking_bgpvpn_git_install_branch: 039fdc096e0971b90a96ea07a2ef6e3196858594
-networking_bgpvpn_git_track_branch: stable/2023.1
-
-networking_sfc_git_repo: "{{ openstack_opendev_base_url }}/openstack/networking-sfc"
-networking_sfc_git_install_branch: a93b4de04b0f1e34119ab306331b211c0c9dd815
-networking_sfc_git_track_branch: stable/2023.1
-
-networking_generic_switch_git_repo: "{{ openstack_opendev_base_url}}/openstack/networking-generic-switch"
-networking_generic_switch_git_install_branch: 6dcc83c4bac921cbcfc37ece974287f095611883
-networking_generic_switch_git_track_branch: stable/2023.1
-
-networking_nsx_git_repo: "{{ openstack_opendev_base_url }}/x/vmware-nsx"
-networking_nsx_git_install_branch: 0253265f75f63d5619b30f16a6b64459dec79d82
-networking_nsx_git_track_branch: master
-
-networking_nsxlib_git_repo: "{{ openstack_opendev_base_url }}/x/vmware-nsxlib"
-networking_nsxlib_git_install_branch: acb8f2d53fa12880fab548e21f15b0329c5f8eb5
-networking_nsxlib_git_track_branch: master
-
-networking_baremetal_git_repo: "{{ openstack_opendev_base_url }}/openstack/networking-baremetal"
-networking_baremetal_git_install_branch: 1529ce98313336e2ef431bc1113139b790d1c92c
-networking_baremetal_git_track_branch: stable/2023.1
-
-## Nova service
-nova_git_repo: "{{ openstack_opendev_base_url }}/openstack/nova"
-nova_git_install_branch: 47b6850bb1f3681e6af7d8248152a979bf5051d1
-nova_git_track_branch: stable/2023.1
-
-## Sahara service
-sahara_git_repo: "{{ openstack_opendev_base_url }}/openstack/sahara"
-sahara_git_install_branch: 5e7258bcc8807493f08671be9b8f4f4c4232eb0a
-sahara_git_track_branch: stable/2023.1
-
-## Senlin service
-senlin_git_repo: "{{ openstack_opendev_base_url }}/openstack/senlin"
-senlin_git_install_branch: 22fd77946723e25e595676e61893c1f645709b2f
-senlin_git_track_branch: stable/2023.1
-
-## Swift service
-swift_git_repo: "{{ openstack_opendev_base_url }}/openstack/swift"
-swift_git_install_branch: 9a1bfb8975fb1315fb417161a2865b6bb4760415
-swift_git_track_branch: master
-
-## Ironic service
-ironic_git_repo: "{{ openstack_opendev_base_url }}/openstack/ironic"
-ironic_git_install_branch: 943604cb417914194331b8ce5916766b50553128
-ironic_git_track_branch: stable/2023.1
-
-## Ironic inspector service
-ironic_inspector_git_repo: "{{ openstack_opendev_base_url }}/openstack/ironic-inspector"
-ironic_inspector_git_install_branch: 8258f1e15a7d76063b26cdd20d4ef9b0ec8d643a
-ironic_inspector_git_track_branch: stable/2023.1
-
-## Magnum service
-magnum_git_repo: "{{ openstack_opendev_base_url }}/openstack/magnum"
-magnum_git_install_branch: 848c34a420aac00731447436c282e5c94d4e7b20
-magnum_git_track_branch: stable/2023.1
-
-## Masakari service
-masakari_git_repo: "{{ openstack_opendev_base_url }}/openstack/masakari"
-masakari_git_install_branch: 72b6929271a38b87cf43489fd9ce28e35c41cedb
-masakari_git_track_branch: stable/2023.1
-
-## Masakari monitors services
-masakari_monitors_git_repo: "{{ openstack_opendev_base_url }}/openstack/masakari-monitors"
-masakari_monitors_git_install_branch: 9192f777840a45a5bc14e261813004ecfc59cf45
-masakari_monitors_git_track_branch: stable/2023.1
-
-## Mistral service
-mistral_git_repo: "{{ openstack_opendev_base_url }}/openstack/mistral"
-mistral_git_install_branch: af2b9c5cd8d3bca74f560491fb140809fc27931c
-mistral_git_track_branch: stable/2023.1
-
-mistral_extra_git_repo: "{{ openstack_opendev_base_url }}/openstack/mistral-extra"
-mistral_extra_git_install_branch: e0687d607319b796503859353b8f3ab1cc9aa9f5
-mistral_extra_git_track_branch: stable/2023.1
-
-## Murano service
-murano_git_repo: "{{ openstack_opendev_base_url }}/openstack/murano"
-murano_git_install_branch: 19dc9648e1a760037b7a67a3ec169483b3bc0609
-murano_git_track_branch: stable/2023.1
-
-murano_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/murano-dashboard"
-murano_dashboard_git_install_branch: 6c93b2ca8a840b1299ebf4b654f2ce041374f808
-murano_dashboard_git_track_branch: stable/2023.1
-
-## Trove service
-trove_git_repo: "{{ openstack_opendev_base_url }}/openstack/trove"
-trove_git_install_branch: 8d54913b36fc3d8a80fb02f78dc541f0f08f763b
-trove_git_track_branch: stable/2023.1
-
-## Horizon Trove dashboard plugin
-trove_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/trove-dashboard"
-trove_dashboard_git_install_branch: aadf4a9ce2ed542e6b68e3c2f212fef9d9948b50
-trove_dashboard_git_track_branch: stable/2023.1
-
-## Octavia service
-octavia_git_repo: "{{ openstack_opendev_base_url }}/openstack/octavia"
-octavia_git_install_branch: 4486d2416f600df15df1b5c98a676f898e2b1d42
-octavia_git_track_branch: stable/2023.1
-
-## Octavia OVN provider
-octavia_ovn_octavia_provider_git_repo: "{{ openstack_opendev_base_url }}/openstack/ovn-octavia-provider"
-octavia_ovn_octavia_provider_git_install_branch: b29211686375b7179641c8580264e11f85a63a24
-octavia_ovn_octavia_provider_git_track_branch: stable/2023.1
-
-## Placement service
-placement_git_repo: "{{ openstack_opendev_base_url }}/openstack/placement"
-placement_git_install_branch: b3652feea1855c9481c9441976379d9851c0c62f
-placement_git_track_branch: stable/2023.1
-
-## Tacker service
-tacker_git_repo: "{{ openstack_opendev_base_url }}/openstack/tacker"
-tacker_git_install_branch: 40a15b59455fdc6b34eecd641af514d32888a5a2
-tacker_git_track_branch: stable/2023.1
-
-## Horizon Octavia dashboard plugin
-octavia_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/octavia-dashboard"
-octavia_dashboard_git_install_branch: d1a6dd8995c0fcd7333408eae4f38437f65ef9b8
-octavia_dashboard_git_track_branch: stable/2023.1
-
-## Blazar service
-blazar_git_repo: "{{ openstack_opendev_base_url }}/openstack/blazar"
-blazar_git_install_branch: 24ca97091bcb0d231af98276a6e80013a170d438
-blazar_git_track_branch: stable/2023.1
-
-## Blazar Nova Service
-blazar_nova_git_repo: "{{ openstack_opendev_base_url }}/openstack/blazar-nova"
-blazar_nova_git_install_branch: bec9434e93ad1baf4a08eb0bd83ad8af83def93e
-blazar_nova_git_track_branch: stable/2023.1
-
-## Zun service
-zun_git_repo: "{{ openstack_opendev_base_url }}/openstack/zun"
-zun_git_install_branch: 6d4039bc7bc88ecd3caaeee33126ed85e8cf09f0
-zun_git_track_branch: stable/2023.1
-
-## Zun kuryr service
-zun_kuryr_git_repo: "{{ openstack_opendev_base_url }}/openstack/kuryr-libnetwork"
-zun_kuryr_git_install_branch: a6628c266cb364ffddf3f15c2ccb1ee3ee474f44
-zun_kuryr_git_track_branch: stable/2023.1
-
-## Zun kuryr library
-zun_kuryr_lib_git_repo: "{{ openstack_opendev_base_url }}/openstack/kuryr"
-zun_kuryr_lib_git_install_branch: 1616fda8d29814c106ab7a95c5661887516f825a
-zun_kuryr_lib_git_track_branch: stable/2023.1
diff --git a/playbooks/defaults/repo_packages/readme.rst b/playbooks/defaults/repo_packages/readme.rst
deleted file mode 100644
index 70b64e0e2a..0000000000
--- a/playbooks/defaults/repo_packages/readme.rst
+++ /dev/null
@@ -1,32 +0,0 @@
-Packages built by python from git
-#################################
-:date: 2014-09-01 09:57
-:tags: python, pip, wheel, lxc, openstack, cloud, ansible
-:category: \*nix
-
-Packages Downloads and Installable
-==================================
-
-Any and all packages that need to be installed for this repository to work should be specified here in the, ``repo_packages`` directory. The files in this directory are given to the python wheel builder for construction. 
-
-Inside these files all download-able objects such as tar-balls and random files should also be specified. While the packaging roles may not be used to process these links the stated purpose of this directory is to have anything that is "installable" in a single location with the goal to allow for easily manipulation of requirements as they change.
-
-NOTICE on items in this file:
-  * If you use anything in the "*._git_install_branch" field that is not a TAG 
-    make sure to leave an in-line comment as to "why".
-
-For the sake of anyone else editing this file: 
-  * If you add clients to this file please do so in alphabetical order.
-  * Every entry should be name spaced with the name of the client followed by an "_"
-
-Repository data can be set in any of the following locations by default.
-    - <MAIN REPO LOCATION>
-    - /etc/ansible/roles
-    - /etc/openstack_deploy
-
-The basic structure of all of these files:
-  * git_repo: ``string`` URI to the git repository to clone from.
-  * git_fallback_repo: ``string`` URI to an alternative git repository to clone from when **git_repo** fails.
-  * git_install_branch: ``string`` branch, tag or SHA of a git repository to clone into.
-  * git_repo_plugins: ``list`` of ``hashes`` with keys: path, package | This is used to install additional packages which may be installable from the same base repository.
-  * git_package_name: ``string`` that will override the "egg" name given for the repo.
diff --git a/playbooks/openstack-hosts-setup.yml b/playbooks/openstack-hosts-setup.yml
index 385995424a..09e297f17d 100644
--- a/playbooks/openstack-hosts-setup.yml
+++ b/playbooks/openstack-hosts-setup.yml
@@ -63,7 +63,6 @@
   roles:
     - role: "openstack_hosts"
   vars_files:
-    - defaults/repo_packages/openstack_services.yml
     - "defaults/{{ install_method }}_install.yml"
   post_tasks:
     - name: Ensure deploy host SSH connection is reset
diff --git a/playbooks/os-adjutant-install.yml b/playbooks/os-adjutant-install.yml
index 1dc6323984..b080430ba6 100644
--- a/playbooks/os-adjutant-install.yml
+++ b/playbooks/os-adjutant-install.yml
@@ -39,7 +39,6 @@
   user: root
   environment: "{{ deployment_environment_variables | default({}) }}"
   vars_files:
-    - "defaults/repo_packages/openstack_services.yml"
     - "defaults/{{ install_method }}_install.yml"
   tags:
     - adjutant
diff --git a/playbooks/os-aodh-install.yml b/playbooks/os-aodh-install.yml
index 80013b1401..8e49b96716 100644
--- a/playbooks/os-aodh-install.yml
+++ b/playbooks/os-aodh-install.yml
@@ -39,7 +39,6 @@
   user: root
   environment: "{{ deployment_environment_variables | default({}) }}"
   vars_files:
-    - "defaults/repo_packages/openstack_services.yml"
     - "defaults/{{ install_method }}_install.yml"
   tags:
     - aodh
diff --git a/playbooks/os-barbican-install.yml b/playbooks/os-barbican-install.yml
index 5a9373bb63..e119e68aca 100644
--- a/playbooks/os-barbican-install.yml
+++ b/playbooks/os-barbican-install.yml
@@ -39,7 +39,6 @@
   user: root
   environment: "{{ deployment_environment_variables | default({}) }}"
   vars_files:
-    - "defaults/repo_packages/openstack_services.yml"
     - "defaults/{{ install_method }}_install.yml"
   tags:
     - barbican
diff --git a/playbooks/os-blazar-install.yml b/playbooks/os-blazar-install.yml
index 66ae1cac6c..27781393ab 100644
--- a/playbooks/os-blazar-install.yml
+++ b/playbooks/os-blazar-install.yml
@@ -39,7 +39,6 @@
   environment: "{{ deployment_environment_variables | default({}) }}"
   user: root
   vars_files:
-    - "defaults/repo_packages/openstack_services.yml"
     - "defaults/{{ install_method }}_install.yml"
   tags:
     - blazar
diff --git a/playbooks/os-ceilometer-install.yml b/playbooks/os-ceilometer-install.yml
index e737cccc67..b427a5a368 100644
--- a/playbooks/os-ceilometer-install.yml
+++ b/playbooks/os-ceilometer-install.yml
@@ -29,7 +29,6 @@
   serial: "{{ ceilometer_serial | default(['1','100%']) }}"
   user: root
   vars_files:
-    - "defaults/repo_packages/openstack_services.yml"
     - "defaults/{{ install_method }}_install.yml"
   pre_tasks:
     - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
diff --git a/playbooks/os-cloudkitty-install.yml b/playbooks/os-cloudkitty-install.yml
index 4853c9a9f1..34b5461e1e 100644
--- a/playbooks/os-cloudkitty-install.yml
+++ b/playbooks/os-cloudkitty-install.yml
@@ -40,7 +40,6 @@
   user: root
   environment: "{{ deployment_environment_variables | default({}) }}"
   vars_files:
-    - "defaults/repo_packages/openstack_services.yml"
     - "defaults/{{ install_method }}_install.yml"
   tags:
     - cloudkitty
diff --git a/playbooks/os-designate-install.yml b/playbooks/os-designate-install.yml
index 30010155a0..658f4707a0 100644
--- a/playbooks/os-designate-install.yml
+++ b/playbooks/os-designate-install.yml
@@ -42,7 +42,6 @@
   user: root
   environment: "{{ deployment_environment_variables | default({}) }}"
   vars_files:
-    - "defaults/repo_packages/openstack_services.yml"
     - "defaults/{{ install_method }}_install.yml"
   tags:
     - designate
diff --git a/playbooks/os-glance-install.yml b/playbooks/os-glance-install.yml
index 157954dc0a..7a3cd7281a 100644
--- a/playbooks/os-glance-install.yml
+++ b/playbooks/os-glance-install.yml
@@ -39,7 +39,6 @@
   user: root
   environment: "{{ deployment_environment_variables | default({}) }}"
   vars_files:
-    - "defaults/repo_packages/openstack_services.yml"
     - "defaults/{{ install_method }}_install.yml"
   tags:
     - glance
diff --git a/playbooks/os-gnocchi-install.yml b/playbooks/os-gnocchi-install.yml
index 9f26d5c6ea..5f3feca631 100644
--- a/playbooks/os-gnocchi-install.yml
+++ b/playbooks/os-gnocchi-install.yml
@@ -39,8 +39,6 @@
   user: root
   environment: "{{ deployment_environment_variables | default({}) }}"
   vars_files:
-    - "defaults/repo_packages/openstack_services.yml"
-    - "defaults/repo_packages/gnocchi.yml"
     - "defaults/{{ install_method }}_install.yml"
   tags:
     - gnocchi
diff --git a/playbooks/os-heat-install.yml b/playbooks/os-heat-install.yml
index 740177ca37..05854725d7 100644
--- a/playbooks/os-heat-install.yml
+++ b/playbooks/os-heat-install.yml
@@ -41,7 +41,6 @@
   tags:
     - heat
   vars_files:
-    - defaults/repo_packages/openstack_services.yml
     - "defaults/{{ install_method }}_install.yml"
   pre_tasks:
     - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
diff --git a/playbooks/os-horizon-install.yml b/playbooks/os-horizon-install.yml
index e89b0f1f5a..a15a152dcc 100644
--- a/playbooks/os-horizon-install.yml
+++ b/playbooks/os-horizon-install.yml
@@ -39,7 +39,6 @@
   user: root
   environment: "{{ deployment_environment_variables | default({}) }}"
   vars_files:
-    - "defaults/repo_packages/openstack_services.yml"
     - "defaults/{{ install_method }}_install.yml"
   tags:
     - horizon
diff --git a/playbooks/os-ironic-install.yml b/playbooks/os-ironic-install.yml
index a3e9d33e53..e254c88160 100644
--- a/playbooks/os-ironic-install.yml
+++ b/playbooks/os-ironic-install.yml
@@ -39,7 +39,6 @@
   user: root
   environment: "{{ deployment_environment_variables | default({}) }}"
   vars_files:
-    - "defaults/repo_packages/openstack_services.yml"
     - "defaults/{{ install_method }}_install.yml"
   tags:
     - ironic
diff --git a/playbooks/os-keystone-install.yml b/playbooks/os-keystone-install.yml
index 273c2bed26..3c56aadac0 100644
--- a/playbooks/os-keystone-install.yml
+++ b/playbooks/os-keystone-install.yml
@@ -67,7 +67,6 @@
   user: root
   environment: "{{ deployment_environment_variables | default({}) }}"
   vars_files:
-    - "defaults/repo_packages/openstack_services.yml"
     - "defaults/{{ install_method }}_install.yml"
   tags:
     - keystone
diff --git a/playbooks/os-magnum-install.yml b/playbooks/os-magnum-install.yml
index 88a953b1f9..c155e636a3 100644
--- a/playbooks/os-magnum-install.yml
+++ b/playbooks/os-magnum-install.yml
@@ -42,7 +42,6 @@
   serial: "{{ magnum_serial | default(['1','100%']) }}"
   environment: "{{ deployment_environment_variables | default({}) }}"
   vars_files:
-    - "defaults/repo_packages/openstack_services.yml"
     - "defaults/{{ install_method }}_install.yml"
   tags:
     - magnum
diff --git a/playbooks/os-manila-install.yml b/playbooks/os-manila-install.yml
index a0c998476a..7d3a04e804 100644
--- a/playbooks/os-manila-install.yml
+++ b/playbooks/os-manila-install.yml
@@ -38,7 +38,6 @@
   user: root
   environment: "{{ deployment_environment_variables | default({}) }}"
   vars_files:
-    - "defaults/repo_packages/openstack_services.yml"
     - "defaults/{{ install_method }}_install.yml"
   tags:
     - manila
@@ -89,7 +88,6 @@
   user: root
   environment: "{{ deployment_environment_variables | default({}) }}"
   vars_files:
-    - "defaults/repo_packages/openstack_services.yml"
     - "defaults/{{ install_method }}_install.yml"
   tags:
     - manila
diff --git a/playbooks/os-masakari-install.yml b/playbooks/os-masakari-install.yml
index f2e44fd212..c51179525b 100644
--- a/playbooks/os-masakari-install.yml
+++ b/playbooks/os-masakari-install.yml
@@ -59,7 +59,6 @@
   serial: "{{ masakari_api_serial | default(['1','100%']) }}"
   user: root
   vars_files:
-    - "defaults/repo_packages/openstack_services.yml"
     - "defaults/{{ install_method }}_install.yml"
   pre_tasks:
     - name: Gather additional facts
diff --git a/playbooks/os-mistral-install.yml b/playbooks/os-mistral-install.yml
index eb3c7ffa6f..7c47ef6e0c 100644
--- a/playbooks/os-mistral-install.yml
+++ b/playbooks/os-mistral-install.yml
@@ -39,7 +39,6 @@
   environment: "{{ deployment_environment_variables | default({}) }}"
   user: root
   vars_files:
-    - "defaults/repo_packages/openstack_services.yml"
     - "defaults/{{ install_method }}_install.yml"
   tags:
     - mistral
diff --git a/playbooks/os-murano-install.yml b/playbooks/os-murano-install.yml
index ef3a994f07..66e58f4c04 100644
--- a/playbooks/os-murano-install.yml
+++ b/playbooks/os-murano-install.yml
@@ -39,7 +39,6 @@
   environment: "{{ deployment_environment_variables | default({}) }}"
   user: root
   vars_files:
-    - "defaults/repo_packages/openstack_services.yml"
     - "defaults/{{ install_method }}_install.yml"
   tags:
     - murano
diff --git a/playbooks/os-octavia-install.yml b/playbooks/os-octavia-install.yml
index 05921a671f..34038dac25 100644
--- a/playbooks/os-octavia-install.yml
+++ b/playbooks/os-octavia-install.yml
@@ -39,7 +39,6 @@
   user: root
   environment: "{{ deployment_environment_variables | default({}) }}"
   vars_files:
-    - "defaults/repo_packages/openstack_services.yml"
     - "defaults/{{ install_method }}_install.yml"
   tags:
     - octavia
diff --git a/playbooks/os-placement-install.yml b/playbooks/os-placement-install.yml
index e8a1eb9949..70a38c5cc6 100644
--- a/playbooks/os-placement-install.yml
+++ b/playbooks/os-placement-install.yml
@@ -39,7 +39,6 @@
   environment: "{{ deployment_environment_variables | default({}) }}"
   user: root
   vars_files:
-    - "defaults/repo_packages/openstack_services.yml"
     - "defaults/{{ install_method }}_install.yml"
   tags:
     - placement
diff --git a/playbooks/os-rally-install.yml b/playbooks/os-rally-install.yml
index cc6da93369..18f769de2d 100644
--- a/playbooks/os-rally-install.yml
+++ b/playbooks/os-rally-install.yml
@@ -25,7 +25,6 @@
   user: root
   environment: "{{ deployment_environment_variables | default({}) }}"
   vars_files:
-    - "defaults/repo_packages/openstack_services.yml"
     - "defaults/{{ install_method }}_install.yml"
   tags:
     - rally
diff --git a/playbooks/os-sahara-install.yml b/playbooks/os-sahara-install.yml
index 4d0f1f9d63..9e1f2c7ddd 100644
--- a/playbooks/os-sahara-install.yml
+++ b/playbooks/os-sahara-install.yml
@@ -37,7 +37,6 @@
   user: root
   environment: "{{ deployment_environment_variables | default({}) }}"
   vars_files:
-    - "defaults/repo_packages/openstack_services.yml"
     - "defaults/{{ install_method }}_install.yml"
   tags:
     - sahara
diff --git a/playbooks/os-senlin-install.yml b/playbooks/os-senlin-install.yml
index a0c6217d00..006bf0f9a5 100644
--- a/playbooks/os-senlin-install.yml
+++ b/playbooks/os-senlin-install.yml
@@ -39,7 +39,6 @@
   user: root
   environment: "{{ deployment_environment_variables | default({}) }}"
   vars_files:
-    - "defaults/repo_packages/openstack_services.yml"
     - "defaults/{{ install_method }}_install.yml"
   tags:
     - senlin
diff --git a/playbooks/os-swift-install.yml b/playbooks/os-swift-install.yml
index 3068418ab0..250eb291dd 100644
--- a/playbooks/os-swift-install.yml
+++ b/playbooks/os-swift-install.yml
@@ -37,7 +37,6 @@
   gather_facts: false
   user: root
   vars_files:
-    - "defaults/repo_packages/openstack_services.yml"
     - "defaults/{{ install_method }}_install.yml"
   pre_tasks:
     - include_tasks: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml"
diff --git a/playbooks/os-swift-sync.yml b/playbooks/os-swift-sync.yml
index 9164867929..fe8bd06952 100644
--- a/playbooks/os-swift-sync.yml
+++ b/playbooks/os-swift-sync.yml
@@ -20,7 +20,6 @@
   gather_facts: "{{ osa_gather_facts | default(True) }}"
   user: root
   vars_files:
-    - "defaults/repo_packages/openstack_services.yml"
     - "defaults/{{ install_method }}_install.yml"
   roles:
     - role: "os_swift"
diff --git a/playbooks/os-tacker-install.yml b/playbooks/os-tacker-install.yml
index 8c1a097b8e..9be2bed0ae 100644
--- a/playbooks/os-tacker-install.yml
+++ b/playbooks/os-tacker-install.yml
@@ -39,7 +39,6 @@
   user: root
   environment: "{{ deployment_environment_variables | default({}) }}"
   vars_files:
-    - "defaults/repo_packages/openstack_services.yml"
     - "defaults/{{ install_method }}_install.yml"
   tags:
     - tacker
diff --git a/playbooks/os-tempest-install.yml b/playbooks/os-tempest-install.yml
index 3b5985c71b..3e8067ffcf 100644
--- a/playbooks/os-tempest-install.yml
+++ b/playbooks/os-tempest-install.yml
@@ -28,8 +28,6 @@
   gather_facts: false
   user: root
   vars_files:
-    - "defaults/repo_packages/openstack_services.yml"
-    - "defaults/repo_packages/openstack_testing.yml"
     - "defaults/{{ install_method }}_install.yml"
   pre_tasks:
     - name: End playbook
diff --git a/playbooks/os-trove-install.yml b/playbooks/os-trove-install.yml
index 4a65d7208b..cd69a6a438 100644
--- a/playbooks/os-trove-install.yml
+++ b/playbooks/os-trove-install.yml
@@ -42,7 +42,6 @@
   user: root
   environment: "{{ deployment_environment_variables | default({}) }}"
   vars_files:
-    - "defaults/repo_packages/openstack_services.yml"
     - "defaults/{{ install_method }}_install.yml"
   tags:
     - trove
diff --git a/playbooks/os-zun-install.yml b/playbooks/os-zun-install.yml
index ec876a862f..20f252295c 100644
--- a/playbooks/os-zun-install.yml
+++ b/playbooks/os-zun-install.yml
@@ -51,7 +51,6 @@
   serial: "{{ zun_serial | default(['1','100%']) }}"
   user: root
   vars_files:
-    - "defaults/repo_packages/openstack_services.yml"
     - "defaults/{{ install_method }}_install.yml"
   pre_tasks:
     # In order to ensure that any container, software or
diff --git a/playbooks/repo-install.yml b/playbooks/repo-install.yml
index 3ef2f1f34d..38dba3b2e2 100644
--- a/playbooks/repo-install.yml
+++ b/playbooks/repo-install.yml
@@ -72,7 +72,6 @@
   roles:
     - role: "repo_server"
   vars_files:
-    - defaults/repo_packages/openstack_services.yml
     - "defaults/{{ install_method }}_install.yml"
   environment: "{{ deployment_environment_variables | default({}) }}"
   tags:
diff --git a/playbooks/unbound-install.yml b/playbooks/unbound-install.yml
index 8e3e2a211a..e2d362ca5d 100644
--- a/playbooks/unbound-install.yml
+++ b/playbooks/unbound-install.yml
@@ -35,8 +35,6 @@
     - role: "openstack.osa.system_crontab_coordination"
       tags:
         - "system-crontab-coordination"
-  vars_files:
-    - defaults/repo_packages/openstack_services.yml
 
 - name: Install unbound DNS resolver client configurations
   hosts:
diff --git a/playbooks/utility-install.yml b/playbooks/utility-install.yml
index dd9889f4d9..883d6f8de4 100644
--- a/playbooks/utility-install.yml
+++ b/playbooks/utility-install.yml
@@ -26,7 +26,6 @@
   serial: "{{ utility_serial | default(['1','100%']) }}"
   environment: "{{ deployment_environment_variables | default({}) }}"
   vars_files:
-    - "defaults/repo_packages/openstack_services.yml"
     - "defaults/{{ install_method }}_install.yml"
   vars:
     utility_upper_constraints_url: "{{ requirements_git_url | default('https://releases.openstack.org/constraints/upper/' ~
diff --git a/releasenotes/notes/repo_packages_in_group_vars-ccd59bb64439500f.yaml b/releasenotes/notes/repo_packages_in_group_vars-ccd59bb64439500f.yaml
new file mode 100644
index 0000000000..4bc386090c
--- /dev/null
+++ b/releasenotes/notes/repo_packages_in_group_vars-ccd59bb64439500f.yaml
@@ -0,0 +1,7 @@
+---
+other:
+  - |
+    SHA of services that are used during source install were moved from
+    `playbooks/defaults/repo_packages` folder to
+    `inventory/group_vars/<service_group>/source_git.yml` files that
+    correspond to each individual service.
diff --git a/scripts/bootstrap-ansible.sh b/scripts/bootstrap-ansible.sh
index f5ca5d4e9e..83e929c2ad 100755
--- a/scripts/bootstrap-ansible.sh
+++ b/scripts/bootstrap-ansible.sh
@@ -125,7 +125,7 @@ fi
 PYTHON_EXEC_PATH="${PYTHON_EXEC_PATH:-$(which python3)}"
 
 # Obtain the SHA of the upper-constraints to use for the ansible runtime venv
-TOX_CONSTRAINTS_SHA=$(awk '/requirements_git_install_branch:/ {print $2}' playbooks/defaults/repo_packages/openstack_services.yml)
+TOX_CONSTRAINTS_SHA=$(awk '/requirements_git_install_branch:/ {print $2}' inventory/group_vars/all/source_git.yml)
 
 # if we are in CI, grab the u-c file from the locally cached repo, otherwise download
 TOX_CONSTRAINTS_PATH="/opt/ansible-runtime-constraints-${TOX_CONSTRAINTS_SHA}.txt"
diff --git a/tests/bootstrap-aio.yml b/tests/bootstrap-aio.yml
index b4c7c23324..ae1d968aa7 100644
--- a/tests/bootstrap-aio.yml
+++ b/tests/bootstrap-aio.yml
@@ -19,8 +19,6 @@
   user: root
   roles:
     - role: "bootstrap-host"
-  vars_files:
-    - "{{ playbook_dir }}/../playbooks/defaults/repo_packages/openstack_services.yml"
   environment: "{{ deployment_environment_variables | default({}) }}"
   pre_tasks:
     - name: Run setup module
diff --git a/tests/test-upstream-shas.yml b/tests/test-upstream-shas.yml
index c31a1ed55f..08b7dd48cb 100644
--- a/tests/test-upstream-shas.yml
+++ b/tests/test-upstream-shas.yml
@@ -21,7 +21,8 @@
   tasks:
     - name: Include repo_packages variables
       include_vars:
-        dir: "{{ playbook_dir }}/../playbooks/defaults/repo_packages"
+        dir: "{{ playbook_dir }}/../inventory/group_vars"
+        files_matching: source_git.yml
         ignore_unknown_extensions: True
         extensions:
           - 'yml'
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index aca2aa716f..5467f8039a 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -318,7 +318,7 @@
     files:
       - ^ansible-collection-requirements\.yml
       - ^ansible-role-requirements\.yml
-      - ^playbooks\/defaults\/repo_packages\/.*\.yml
+      - ^inventory\/group_vars\/*\/source_git\.yml
 
 # Ensuring hosts setup and healthcheck-hosts playbook is valid
 - job: