diff --git a/playbooks/roles/bifrost-ironic-install/defaults/main.yml b/playbooks/roles/bifrost-ironic-install/defaults/main.yml
index 87c363c4f..6c0c9efb9 100644
--- a/playbooks/roles/bifrost-ironic-install/defaults/main.yml
+++ b/playbooks/roles/bifrost-ironic-install/defaults/main.yml
@@ -327,13 +327,6 @@ ansible_python_interpreter: "{{ bifrost_venv_dir + '/bin/python3' }}"
 # conditional statements in the playbooks.
 noauth_mode: false
 
-# A work around for installing older releases, remove when no longer supporting
-# Ussuri.
-git_branch: master
-supports_http_auth: >-
-  {{ git_branch == "master"
-     or git_branch[7:] not in ["queens", "rocky", "stein", "train", "ussuri"] }}
-
 # Keystone Support
 # Default parameter if keystone is enabled, or disabled.
 enable_keystone: false
diff --git a/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2 b/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2
index 1bdd87691..431952583 100644
--- a/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2
+++ b/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2
@@ -236,8 +236,6 @@ username = {{ ironic.service_catalog.username }}
 password = {{ ironic.service_catalog.password }}
 user_domain_id = default
 project_domain_id = default
-{% elif not supports_http_auth | bool %}
-auth_strategy = noauth
 {% else %}
 auth_strategy = http_basic
 auth_type = http_basic