diff --git a/scripts/gate-check-commit.sh b/scripts/gate-check-commit.sh
index 83689c0511..2ac9409d08 100755
--- a/scripts/gate-check-commit.sh
+++ b/scripts/gate-check-commit.sh
@@ -262,6 +262,10 @@ if [[ "${ACTION}" == "upgrade" ]]; then
     echo 'YES' | bash "${OSA_CLONE_DIR}/scripts/run-upgrade.sh"
 
     if [[ $SCENARIO =~ "infra" ]]; then
+      # TODO(noonedeadpunk): Remove after Y release
+      set -a
+      . ${OSA_CLONE_DIR}/scripts/upgrade-utilities/unset-ansible-env.rc
+      set +a
       # Verify our infra setup after upgrade
       openstack-ansible ${OSA_CLONE_DIR}/playbooks/healthcheck-infrastructure.yml -e osa_gather_facts=False
     fi
diff --git a/scripts/run-upgrade.sh b/scripts/run-upgrade.sh
index 6d33874261..f5082f2203 100755
--- a/scripts/run-upgrade.sh
+++ b/scripts/run-upgrade.sh
@@ -166,13 +166,7 @@ function main {
     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
+    source ${SCRIPTS_PATH}/upgrade-utilities/unset-ansible-env.rc
 
     bootstrap_ansible
 
diff --git a/scripts/upgrade-utilities/unset-ansible-env.rc b/scripts/upgrade-utilities/unset-ansible-env.rc
new file mode 100644
index 0000000000..ea039ab190
--- /dev/null
+++ b/scripts/upgrade-utilities/unset-ansible-env.rc
@@ -0,0 +1,7 @@
+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