diff --git a/devstack_setup.yml b/devstack_setup.yml
index 3d4ec04..954e090 100644
--- a/devstack_setup.yml
+++ b/devstack_setup.yml
@@ -107,7 +107,7 @@
       ansible.builtin.git:
         repo: https://opendev.org/openstack/openstack-ansible
         dest: /opt/openstack-ansible
-        version: master
+        version: "{{ openstack_ansible_version }}"
         force: true
 
     - name: Execute bootstrap script
diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all.yml
new file mode 100644
index 0000000..a3c56eb
--- /dev/null
+++ b/inventory/group_vars/all.yml
@@ -0,0 +1,2 @@
+---
+openstack_ansible_version: stable/2023.1
diff --git a/inventory/group_vars/control.yaml b/inventory/group_vars/control.yaml
index 793cff0..2d0b23b 100644
--- a/inventory/group_vars/control.yaml
+++ b/inventory/group_vars/control.yaml
@@ -4,8 +4,7 @@ install_packages:
   - chrony
   - openssh-server
   - sudo
-  - curl-minimal
-  - rdo-openvswitch
+  - curl
   - NetworkManager-ovs
   - '@Development tools'
 openssh_private_key: !vault |