diff --git a/.rubocop.yml b/.rubocop.yml
deleted file mode 100644
index 5ffd74f..0000000
--- a/.rubocop.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-inherit_from: .rubocop_todo.yml
-
-AllCops:
-  Include:
-    - metadata.rb
-    - Gemfile
-    - attributes/**
-    - libraries/**
-    - providers/**
-    - recipes/**
-    - resources/**
-    - spec/**
-  Exclude:
-    - .cookbooks/**/*
-    - berks-cookbooks/**/*
-    - .bundle/**/*
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
deleted file mode 100644
index 720250b..0000000
--- a/.rubocop_todo.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2018-08-03 05:26:02 -0700 using RuboCop version 0.55.0.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Lint/RedundantWithIndex:
-  Exclude:
-    - 'recipes/setup.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/IfUnlessModifier:
-  Exclude:
-    - 'recipes/create_network.rb'
-
-# Offense count: 33
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 127
diff --git a/README.rst b/README.rst
index c4c1d95..6ec0ca4 100644
--- a/README.rst
+++ b/README.rst
@@ -21,7 +21,7 @@ Requirements
 ============
 
 - Chef 15 or higher
-- Chef Workstation 0.15.18 for testing (also includes Berkshelf for
+- Chef Workstation 0.18.3 for testing (also includes Berkshelf for
   cookbook dependency resolution)
 
 Cookbooks
@@ -31,8 +31,9 @@ The following cookbooks are dependencies:
 
 - 'bind', '~> 2.3.1'
 - 'openstackclient'
-- 'openstack-common', '>= 19.0.0'
-- 'openstack-image', '>= 19.0.0'
+- 'openstack-common', '>= 20.0.0'
+- 'openstack-dns', '>= 20.0.0'
+- 'openstack-image', '>= 20.0.0'
 - 'resolver'
 
 Recipes
diff --git a/metadata.rb b/metadata.rb
index 03be561..f4c915b 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -3,7 +3,7 @@ maintainer       'openstack-chef'
 maintainer_email 'openstack-discuss@lists.openstack.org'
 license          'Apache-2.0'
 description      'Installs and configures the Tempest Integration Test Suite'
-version          '19.0.0'
+version          '20.0.0'
 
 %w(ubuntu redhat centos).each do |os|
   supports os
@@ -11,11 +11,11 @@ end
 
 depends 'bind', '~> 2.3.1'
 depends 'openstackclient'
-depends 'openstack-common', '>= 19.0.0'
-depends 'openstack-dns', '>= 19.0.0'
-depends 'openstack-image', '>= 19.0.0'
+depends 'openstack-common', '>= 20.0.0'
+depends 'openstack-dns', '>= 20.0.0'
+depends 'openstack-image', '>= 20.0.0'
 depends 'resolver'
 
 issues_url 'https://launchpad.net/openstack-chef'
 source_url 'https://opendev.org/openstack/cookbook-openstack-integration-test'
-chef_version '>= 15.0'
+chef_version '>= 15.8'
diff --git a/recipes/run_tempest.rb b/recipes/run_tempest.rb
index ef58ad9..2318de9 100644
--- a/recipes/run_tempest.rb
+++ b/recipes/run_tempest.rb
@@ -26,8 +26,6 @@ execute 'run_tempest' do
 end
 
 # Run tempest after everything else.
-log 'start_tempest' do
-  message 'Starting tempest at the very end.'
-  level :info
+notify_group 'start_tempest' do
   notifies :run, 'execute[run_tempest]', :delayed
 end
diff --git a/recipes/setup.rb b/recipes/setup.rb
index 78888e9..e0501c3 100644
--- a/recipes/setup.rb
+++ b/recipes/setup.rb
@@ -55,7 +55,7 @@ connection_params = {
   openstack_endpoint_type: endpoint_type,
 }
 
-%w(user1 user2).each_with_index do |user|
+%w(user1 user2).each do |user|
   service_user = node['openstack']['integration-test'][user]['user_name']
   service_project = node['openstack']['integration-test'][user]['project_name']
   service_role = node['openstack']['integration-test'][user]['role']