diff --git a/inventory/group_vars/all/all.yml b/inventory/group_vars/all/all.yml
index 0cbf871efe..eb0b2b2905 100644
--- a/inventory/group_vars/all/all.yml
+++ b/inventory/group_vars/all/all.yml
@@ -23,8 +23,10 @@ debug: False
 ssh_delay: 5
 
 # Set the package install state for distribution packages
-# Options are 'present' and 'latest'
-package_state: "latest"
+# Options are 'present' and 'latest'.
+# NOTE(mhayden): Allowing CentOS 7 to use package_state=present should give
+# gate jobs a better chance to finish and expose more issues to fix.
+package_state: "{{ (ansible_os_family == 'RedHat') | ternary('present', 'latest') }}"
 
 # Set "/var/log" to be a bind mount to the physical host.
 default_bind_mount_logs: true
diff --git a/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml b/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml
index 1c1bb6eb22..44306d7c97 100644
--- a/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml
+++ b/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml
@@ -96,6 +96,18 @@
     path: /etc/pip.conf
   register: pip_conf_file
 
+# NOTE(mhayden): The OpenStack CI images for CentOS 7 recently set SELinux to
+# Enforcing mode by default. While I am normally a supporter of this change,
+# the SELinux policy work for CentOS 7 is not done yet.
+- name: Set SELinux to permissive mode in OpenStack-CI
+  selinux:
+    policy: targeted
+    state: permissive
+  when:
+    - ansible_selinux.status is defined
+    - ansible_selinux.status == "enabled"
+
+
 # This is a very dirty hack due to images.linuxcontainers.org
 # constantly failing to resolve in openstack-infra.
 - name: Implement hard-coded hosts entries for consistently failing name
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 2dd3e1fb81..6c69f3adea 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -119,6 +119,13 @@
     nodeset: centos-7
     voting: false
 
+- job:
+    name: openstack-ansible-deploy-aio_basekit-centos-7
+    parent: openstack-ansible-deploy-aio_lxc-centos-7
+    vars:
+      action: deploy
+      scenario: aio_basekit
+
 - job:
     name: openstack-ansible-deploy-ceph-centos-7
     parent: openstack-ansible-deploy-aio_lxc-centos-7
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 6c4f016126..414ffd9738 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -17,14 +17,17 @@
       jobs:
         - openstack-ansible-linters
         - openstack-ansible-varstest-aio_lxc-ubuntu-xenial
-        - openstack-ansible-deploy-aio_lxc-centos-7
+        # NOTE(mhayden): Temporarily replacing with aio_basekit scenario.
+        # - openstack-ansible-deploy-aio_lxc-centos-7
         - openstack-ansible-deploy-aio_lxc-opensuse-423
         - openstack-ansible-deploy-aio_lxc-ubuntu-xenial
-        - openstack-ansible-deploy-ceph-centos-7
+        # NOTE(mhayden): Temporarily replacing with aio_basekit scenario.
+        # - openstack-ansible-deploy-ceph-centos-7
         - openstack-ansible-deploy-ceph-ubuntu-xenial
         - openstack-ansible-deploy-ceph-opensuse-423
         - openstack-ansible-deploy-aio_metal-ubuntu-xenial
         - openstack-ansible-deploy-aio_nspawn-ubuntu-xenial
+        - openstack-ansible-deploy-aio_basekit-centos-7
     experimental:
       jobs:
         - openstack-ansible-deploy-octavia-ubuntu-xenial