diff --git a/playbooks/roles/bifrost-openstack-ci-prep/README.md b/playbooks/roles/bifrost-openstack-ci-prep/README.md
deleted file mode 100644
index 8924b3b8c..000000000
--- a/playbooks/roles/bifrost-openstack-ci-prep/README.md
+++ /dev/null
@@ -1,80 +0,0 @@
-bifrost-openstack-ci-prep
-=========================
-
-This role is intended to be utilized in order to set the installation
-environment and various job settings that are specific to OpenStack CI
-such that the bifrost CI job is able to complete successfully.
-
-Requirements
-------------
-
-This role requires:
-
-- Ansible 2.9
-
-
-Role Variables
---------------
-
-ssh_public_key_path: The path to where the SSH public key can be located.
-                     If missing, it is created.
-
-ironic_git_folder: The folder where the ironic codebase has been cloned to.
-
-ironicclient_git_folder: The folder where the python-ironicclient code base
-                         has been cloned to.
-
-Dependencies
-------------
-
-None at this time.
-
-Example Playbook
-----------------
-
-In this example below, specific facts based on environment variables are
-utilized to engage the role, which first calls bifrost-prep-for-install
-which clones the repositories and resets their state to a known state.
-
-The ci_testing_zuul fact is set in the pre_tasks below to allow for activation
-of the logic to properly handle an OpenStack CI environment node.
-
-- hosts: localhost
-  connection: local
-  name: "Prepare for installation"
-  become: no
-  gather_facts: yes
-  pre_tasks:
-    - name: "Set ci_testing_zuul if it appears we are running in upstream OpenStack CI"
-      set_fact:
-         ci_testing: true
-         ci_testing_zuul: true
-         ironic_git_url: /opt/git/openstack/ironic
-         ironicclient_git_url: /opt/git/openstack/python-ironicclient
-      when: lookup('env', 'ZUUL_BRANCH') != ""
-  roles:
-    - { role: bifrost-prep-for-install, when: skip_install is not defined }
-    - { role: bifrost-openstack-ci-prep, when: ci_testing_zuul is defined }
-
-
-License
--------
-
-Copyright (c) 2015 Hewlett-Packard Development Company, L.P.
-
-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.
-
-Author Information
-------------------
-
-Ironic Developers
diff --git a/playbooks/roles/bifrost-openstack-ci-prep/defaults/main.yml b/playbooks/roles/bifrost-openstack-ci-prep/defaults/main.yml
deleted file mode 100644
index 61044d956..000000000
--- a/playbooks/roles/bifrost-openstack-ci-prep/defaults/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-# Default location of the ssh public key for the user operating Bifrost.
-ssh_public_key_path: "{{ ansible_env.HOME }}/.ssh/id_rsa.pub"
diff --git a/playbooks/roles/bifrost-openstack-ci-prep/meta/main.yml b/playbooks/roles/bifrost-openstack-ci-prep/meta/main.yml
deleted file mode 100644
index bd1957009..000000000
--- a/playbooks/roles/bifrost-openstack-ci-prep/meta/main.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-galaxy_info:
-  author: Ironic Developers
-  description: Prepare and set CI node settings for OpenStack CI tests.
-  company: OpenStack
-  license: Apache
-  min_ansible_version: 1.9
-  platforms:
-  - name: Ubuntu
-    versions:
-    - trusty
-  categories:
-  - cloud
-  - cloud:openstack
-dependencies: []
diff --git a/playbooks/roles/bifrost-openstack-ci-prep/tasks/main.yml b/playbooks/roles/bifrost-openstack-ci-prep/tasks/main.yml
deleted file mode 100644
index 5432e26b0..000000000
--- a/playbooks/roles/bifrost-openstack-ci-prep/tasks/main.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright (c) 2015 Hewlett-Packard Development Company, L.P.
-#
-# 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.
----
-# NOTE(TheJulia): Override the stored fact values for username/password when operating
-# in OpenStack CI.
-- name: "Set facts for OpenStack CI"
-  set_fact:
-    disable_dnsmasq_dns: True
-
-- name: "Determine if OpenStack CI is missing an SSH key"
-  stat: path={{ssh_public_key_path}}
-  register: test_ssh_public_key_path
-  when: ci_testing_zuul is defined
-
-- name: "Create an SSH key for Jenkins user if operating in OpenStack CI"
-  shell: ssh-keygen -f ~/.ssh/id_rsa -N ""
-  when: >
-    ci_testing_zuul is defined and
-    test_ssh_public_key_path.stat.exists |bool  == false
-
-- name: >
-    "Create an empty SSH known_hosts file for Jenkins user
-    if operating in OpenStack CI"
-  file:
-    path: "~/.ssh/known_hosts"
-    state: touch
-    mode: 0600
-  when: >
-    ci_testing_zuul is defined and
-    test_ssh_public_key_path.stat.exists | bool == false
-
-- name: "Stop unbound, the caching dns server"
-  service:
-    name: unbound
-    state: stopped
-    enabled: no
-  ignore_errors: yes
diff --git a/playbooks/test-bifrost.yaml b/playbooks/test-bifrost.yaml
index 0a9689b84..bc08eb9ad 100644
--- a/playbooks/test-bifrost.yaml
+++ b/playbooks/test-bifrost.yaml
@@ -6,19 +6,6 @@
 # Execute the installation and VM startup test.
 # ansible-playbook -vvvv -i inventory/bifrost_inventory.py test-bifrost.yaml -e use_cirros=true -e testing_user=cirros
 ---
-- hosts: localhost
-  connection: local
-  name: "Setting pre-test conditions"
-  become: yes
-  ignore_errors: yes
-  tasks:
-    # NOTE(TheJulia): While the test was created to run with five VMs,
-    # in the interest of keeping the active memory footprint small,
-    # should stop all of the VMs in advance, so we can proceed with
-    # install and initial deploy.
-  - name: Remove pre-existing leases file
-    file: path=/var/lib/misc/dnsmasq.leases state=absent
-
 - hosts: localhost
   connection: local
   name: "Executes install, enrollment, and testing in one playbook"
@@ -47,7 +34,6 @@
          ipv4_gateway: "192.168.122.1"
   roles:
     - { role: bifrost-prep-for-install, when: skip_install is not defined }
-    - { role: bifrost-openstack-ci-prep, when: ci_testing_zuul is defined and ci_testing_zuul | bool == true }
   environment:
     http_proxy: "{{ lookup('env','http_proxy') }}"
     https_proxy: "{{ lookup('env','https_proxy') }}"
diff --git a/releasenotes/notes/bifrost-openstack-ci-prep-172cbb159e0a2b78.yaml b/releasenotes/notes/bifrost-openstack-ci-prep-172cbb159e0a2b78.yaml
new file mode 100644
index 000000000..f211bc832
--- /dev/null
+++ b/releasenotes/notes/bifrost-openstack-ci-prep-172cbb159e0a2b78.yaml
@@ -0,0 +1,5 @@
+---
+other:
+  - |
+    The role ``bifrost-openstack-ci-prep`` has been removed. It was only used
+    in the upstream CI context and is no longer required.