diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml
index d50119c731..06827e70d1 100644
--- a/ansible-role-requirements.yml
+++ b/ansible-role-requirements.yml
@@ -208,11 +208,6 @@
   src: https://opendev.org/openstack/openstack-ansible-os_zun
   version: master
   trackbranch: master
-- name: plugins
-  scm: git
-  src: https://opendev.org/openstack/openstack-ansible-plugins
-  version: master
-  trackbranch: master
 - name: qdrouterd
   scm: git
   src: https://opendev.org/openstack/ansible-role-qdrouterd
diff --git a/playbooks/galera-install.yml b/playbooks/galera-install.yml
index dadd9653c7..d453ff22c2 100644
--- a/playbooks/galera-install.yml
+++ b/playbooks/galera-install.yml
@@ -53,7 +53,7 @@
       tags:
         - crontab
   vars:
-    galera_server_id: "{{ inventory_hostname | string_2_int }}"
+    galera_server_id: "{{ inventory_hostname | openstack.osa.string_2_int }}"
     galera_wsrep_node_name: "{{ container_name | default(inventory_hostname) }}"
   environment: "{{ deployment_environment_variables | default({}) }}"
   tags:
diff --git a/scripts/openstack-ansible.rc b/scripts/openstack-ansible.rc
index 887b149826..d9aa49f5f4 100644
--- a/scripts/openstack-ansible.rc
+++ b/scripts/openstack-ansible.rc
@@ -26,13 +26,10 @@ export ANSIBLE_ROLES_PATH="${ANSIBLE_ROLES_PATH:-/etc/ansible/roles:OSA_PLAYBOOK
 export ANSIBLE_COLLECTIONS_PATHS="${ANSIBLE_COLLECTIONS_PATHS:-/etc/ansible}"
 export ANSIBLE_COLLECTIONS_PATH="${ANSIBLE_COLLECTIONS_PATH:-/etc/ansible}"
 
-export ANSIBLE_LIBRARY="${ANSIBLE_LIBRARY:-OSA_PLAYBOOK_PATH/library:/etc/ansible/roles/plugins/library:/etc/ansible/roles/ceph-ansible/library}"
-export ANSIBLE_LOOKUP_PLUGINS="${ANSIBLE_LOOKUP_PLUGINS:-/etc/ansible/roles/plugins/lookup}"
-export ANSIBLE_FILTER_PLUGINS="${ANSIBLE_FILTER_PLUGINS:-/etc/ansible/roles/plugins/filter:/etc/ansible/roles/ceph-ansible/plugins/filter}"
-export ANSIBLE_ACTION_PLUGINS="${ANSIBLE_ACTION_PLUGINS:-/etc/ansible/roles/plugins/action:/etc/ansible/roles/ceph-ansible/plugins/actions}"
-export ANSIBLE_CALLBACK_PLUGINS="${ANSIBLE_CALLBACK_PLUGINS:-/etc/ansible/roles/plugins/callback:/etc/ansible/roles/ceph-ansible/plugins/callback}"
-export ANSIBLE_TEST_PLUGINS="${ANSIBLE_TEST_PLUGINS:-/etc/ansible/roles/plugins/test}"
-export ANSIBLE_VARS_PLUGINS="${ANSIBLE_VARS_PLUGINS:-/etc/ansible/roles/plugins/vars_plugins}"
+export ANSIBLE_LIBRARY="${ANSIBLE_LIBRARY:-OSA_PLAYBOOK_PATH/library:/etc/ansible/roles/ceph-ansible/library}"
+export ANSIBLE_FILTER_PLUGINS="${ANSIBLE_FILTER_PLUGINS:-/etc/ansible/roles/ceph-ansible/plugins/filter}"
+export ANSIBLE_ACTION_PLUGINS="${ANSIBLE_ACTION_PLUGINS:-/etc/ansible/roles/ceph-ansible/plugins/actions}"
+export ANSIBLE_CALLBACK_PLUGINS="${ANSIBLE_CALLBACK_PLUGINS:-/etc/ansible/roles/ceph-ansible/plugins/callback}"
 export ANSIBLE_MODULE_UTILS="${ANSIBLE_MODULE_UTILS:-/etc/ansible/roles/ceph-ansible/module_utils}"
 
 export ANSIBLE_GATHERING="${ANSIBLE_GATHERING:-smart}"
@@ -50,14 +47,13 @@ fi
 
 export ANSIBLE_HOST_KEY_CHECKING="${ANSIBLE_HOST_KEY_CHECKING:-False}"
 export ANSIBLE_TIMEOUT="${ANSIBLE_TIMEOUT:-5}"
-export ANSIBLE_TRANSPORT="${ANSIBLE_TRANSPORT:-ssh}"
+export ANSIBLE_TRANSPORT="${ANSIBLE_TRANSPORT:-openstack.osa.ssh}"
 export ANSIBLE_SSH_PIPELINING="${ANSIBLE_SSH_PIPELINING:-True}"
 export ANSIBLE_SSH_RETRIES="${ANSIBLE_SSH_RETRIES:-5}"
 export ANSIBLE_PIPELINING="${ANSIBLE_SSH_PIPELINING}"
 export ANSIBLE_FORKS="${ANSIBLE_FORKS:-OSA_ANSIBLE_FORKS}"
 
-export ANSIBLE_STRATEGY_PLUGINS="${ANSIBLE_STRATEGY_PLUGINS:-/etc/ansible/roles/plugins/strategy}"
-export ANSIBLE_CONNECTION_PLUGINS="${ANSIBLE_CONNECTION_PLUGINS:-/etc/ansible/roles/plugins/connection}"
+export ANSIBLE_STRATEGY="${ANSIBLE_STRATEGY:-openstack.osa.linear}"
 
 export ANSIBLE_FORCE_HANDLERS="${ANSIBLE_FORCE_HANDLERS:-True}"
 export ANSIBLE_PYTHON_INTERPRETER="${ANSIBLE_PYTHON_INTERPRETER:-OSA_ANSIBLE_PYTHON_INTERPRETER}"
diff --git a/scripts/run-upgrade.sh b/scripts/run-upgrade.sh
index a166383567..6d33874261 100755
--- a/scripts/run-upgrade.sh
+++ b/scripts/run-upgrade.sh
@@ -161,10 +161,19 @@ function main {
       tar zcf ${source_series_backup_file} /etc/openstack_deploy /etc/ansible/ /usr/local/bin/openstack-ansible.rc
     fi
 
-    # ANSIBLE_INVENTORY may be set to a previous/incorrect location. To
-    # ensure this is not the case, we unset the environment variable.
+    # Environment variables may be set to a previous/incorrect location.
+    # To ensure this is not the case, we unset the environment variable.
     unset ANSIBLE_INVENTORY
 
+    # TODO(noonedeadpunk): Remove after Y release
+    unset ANSIBLE_LIBRARY
+    unset ANSIBLE_FILTER_PLUGINS
+    unset ANSIBLE_ACTION_PLUGINS
+    unset ANSIBLE_CALLBACK_PLUGINS
+    unset ANSIBLE_TRANSPORT
+    unset ANSIBLE_STRATEGY_PLUGINS
+    unset ANSIBLE_CONNECTION_PLUGINS
+
     bootstrap_ansible
 
     pushd ${MAIN_PATH}/playbooks