diff --git a/.gitignore b/.gitignore
index ce47fe6f..3a772066 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,14 @@
+# Add patterns in here to exclude files created by tools integrated with this
+# repository, such as test frameworks from the project's recommended workflow,
+# rendered documentation and package builds.
+#
+# Don't add patterns to exclude files created by preferred personal tools
+# (editors, IDEs, your operating system itself even). These should instead be
+# maintained outside the repository, for example in a ~/.gitignore file added
+# with:
+#
+# git config --global core.excludesfile '~/.gitignore'
+
 # Compiled source #
 ###################
 *.com
@@ -33,25 +44,11 @@ logs/*
 
 # OS generated files #
 ######################
-.DS_Store
-.DS_Store?
 ._*
-.Spotlight-V100
-.Trashes
-.idea
 .tox
-*.sublime*
 *.egg-info
-Icon?
-ehthumbs.db
-Thumbs.db
 .eggs
 
-# User driven backup files #
-############################
-*.bak
-*.swp
-
 # Generated by pbr while building docs
 ######################################
 AUTHORS
@@ -70,6 +67,3 @@ tests/*.retry
 # Git clones
 openstack-ansible-ops
 previous
-
-# Editor files
-.vscode
diff --git a/Vagrantfile b/Vagrantfile
index 7acf718d..bf2400c1 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -51,13 +51,8 @@ Vagrant.configure(2) do |config|
     leap150.vm.box = "opensuse/openSUSE-15.0-x86_64"
   end
 
-  config.vm.define "opensuse151" do |leap150|
-    leap150.vm.box = "opensuse/openSUSE-15.1-x86_64"
-  end
-
-  config.vm.define "ubuntu1604" do |xenial|
-    xenial.disksize.size = "40GB"
-    xenial.vm.box = "ubuntu/xenial64"
+  config.vm.define "opensuse151" do |leap151|
+    leap151.vm.box = "opensuse/openSUSE-15.1-x86_64"
   end
 
   config.vm.define "ubuntu1804" do |bionic|
diff --git a/bindep.txt b/bindep.txt
index 795596b9..bb77692e 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -38,19 +38,13 @@ gcc-c++           [platform:rpm]
 git               [platform:rpm !platform:suse]
 libffi-devel      [platform:rpm]
 openssl-devel     [platform:rpm]
-python3-devel     [platform:rpm]
 python3-dnf       [platform:fedora]
+python3-devel     [platform:rpm]
 
 # Base requirements for Gentoo
 git               [platform:gentoo]
 
 # For SELinux
-python3-libselinux  [platform:redhat]
+libselinux-python3  [platform:redhat]
 libsemanage-python3 [platform:redhat]
-
-libselinux-python  [platform:redhat !platform:rhel-8 !platform:centos-8]
-libsemanage-python [platform:redhat !platform:rhel-8 !platform:centos-8]
-
-
-# Required for compressing collected log files in CI
-gzip
+iptables [platform:redhat]
diff --git a/doc/requirements.txt b/doc/requirements.txt
index bf9ebd15..07801f87 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -2,9 +2,15 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-# this is required for the docs build jobs
+# WARNING:
+# This file is maintained in the openstack-ansible-tests repository.
+# https://opendev.org/openstack/openstack-ansible-tests/src/branch/master/sync/doc/requirements.txt
+# If you need to modify this file, update the one in the
+# openstack-ansible-tests repository. Once it merges there, the changes will
+# automatically be proposed to all the repositories which use it.
+
 sphinx>=2.0.0,!=2.1.0 # BSD
 sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD
-openstackdocstheme>=2.0.0 # Apache-2.0
+openstackdocstheme>=2.2.1 # Apache-2.0
+reno>=3.1.0 # Apache-2.0
 doc8>=0.6.0 # Apache-2.0
-reno>=2.5.0 # Apache-2.0