diff --git a/Vagrantfile b/Vagrantfile
index bf2400c1..7691c3cc 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -31,8 +31,8 @@ Vagrant.configure(2) do |config|
          ./run_tests.sh
       SHELL
 
-  config.vm.define "centos7" do |centos7|
-    centos7.vm.box = "centos/7"
+  config.vm.define "centos8" do |centos8|
+    centos8.vm.box = "centos/8"
   end
 
   config.vm.define "debian8" do |debian8|
diff --git a/run_tests.sh b/run_tests.sh
index 3129599c..93e91dde 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -51,13 +51,10 @@ fi
 # Source distribution information
 source /etc/os-release || source /usr/lib/os-release
 
-# Prefer dnf over yum for CentOS.
-which dnf &>/dev/null && RHT_PKG_MGR='dnf' || RHT_PKG_MGR='yum'
-
 # Figure out the appropriate package install command
 case ${ID,,} in
     *suse*) pkg_mgr_cmd="zypper -n in" ;;
-    centos|rhel|fedora) pkg_mgr_cmd="${RHT_PKG_MGR} install -y" ;;
+    centos|rhel|fedora) pkg_mgr_cmd="dnf install -y" ;;
     ubuntu|debian) pkg_mgr_cmd="apt-get install -y" ;;
     # Gentoo needs to have version set since it's rolling
     gentoo) pkg_mgr_cmd="emerge --jobs=4"; VERSION="rolling" ;;
diff --git a/tasks/db_setup.yml b/tasks/db_setup.yml
index aca206e4..09b01f82 100644
--- a/tasks/db_setup.yml
+++ b/tasks/db_setup.yml
@@ -28,7 +28,7 @@
     - common-mariadb
   block:
     - name: Create database for service
-      mysql_db:
+      community.mysql.mysql_db:
         name: "{{ item.name }}"
         login_host: "{{ _oslodb_setup_endpoint | default(omit) }}"
         login_port: "{{ _oslodb_setup_port | default(omit) }}"
@@ -36,7 +36,7 @@
       no_log: true
 
     - name: Grant access to the database for the service
-      mysql_user:
+      community.mysql.mysql_user:
         name: "{{ item.1.username }}"
         password: "{{ item.1.password }}"
         host: "{{ item.1.host | default('%') }}"
diff --git a/tasks/mq_setup.yml b/tasks/mq_setup.yml
index dd6e02ed..3e2a3634 100644
--- a/tasks/mq_setup.yml
+++ b/tasks/mq_setup.yml
@@ -29,12 +29,12 @@
     - common-rabbitmq
   block:
     - name: Add RPC RabbitMQ vhost
-      rabbitmq_vhost:
+      community.rabbitmq.rabbitmq_vhost:
         name: "{{ _oslomsg_rpc_vhost }}"
         state: "present"
 
     - name: Apply RPC RabbitMQ vhost policies
-      rabbitmq_policy:
+      community.rabbitmq.rabbitmq_policy:
         name: "{{ item.name }}"
         pattern: "{{ item.pattern }}"
         priority: "{{ item.priority | default(0) }}"
@@ -43,7 +43,7 @@
       loop: "{{ _oslomsg_rpc_policies | default([]) + oslomsg_rpc_policies }}"
 
     - name: Add RPC RabbitMQ user
-      rabbitmq_user:
+      community.rabbitmq.rabbitmq_user:
         user: "{{ _oslomsg_rpc_userid }}"
         password: "{{ _oslomsg_rpc_password }}"
         update_password: always
@@ -63,7 +63,7 @@
     - common-rabbitmq
   block:
     - name: Add Notify RabbitMQ vhost
-      rabbitmq_vhost:
+      community.rabbitmq.rabbitmq_vhost:
         name: "{{ _oslomsg_notify_vhost }}"
         state: "present"
       when:
@@ -71,7 +71,7 @@
           (_oslomsg_notify_vhost != _oslomsg_rpc_vhost)
 
     - name: Apply Notify RabbitMQ vhost policies
-      rabbitmq_policy:
+      community.rabbitmq.rabbitmq_policy:
         name: "{{ item.name }}"
         pattern: "{{ item.pattern }}"
         priority: "{{ item.priority | default(0) }}"
@@ -83,7 +83,7 @@
           (_oslomsg_notify_vhost != _oslomsg_rpc_vhost)
 
     - name: Add Notify RabbitMQ user
-      rabbitmq_user:
+      community.rabbitmq.rabbitmq_user:
         user: "{{ _oslomsg_notify_userid }}"
         password: "{{ _oslomsg_notify_password }}"
         update_password: always
diff --git a/tasks/octavia_amp_image.yml b/tasks/octavia_amp_image.yml
index 76db10e5..1fe11bd0 100644
--- a/tasks/octavia_amp_image.yml
+++ b/tasks/octavia_amp_image.yml
@@ -47,7 +47,7 @@
         - octavia_download_result is changed
       block:
         - name: Get current image id
-          openstack.cloud.os_image_info:
+          openstack.cloud.image_info:
             auth:
               auth_url: "{{ keystone_service_adminurl }}"
               username: "{{ octavia_service_user_name }}"
@@ -80,7 +80,7 @@
             amphora-x64-haproxy
 
         - name: Delete old image from glance
-          openstack.cloud.os_image:
+          openstack.cloud.image:
             auth:
               auth_url: "{{ keystone_service_adminurl }}"
               username: "{{ octavia_service_user_name }}"
diff --git a/tasks/octavia_flavor_create.yml b/tasks/octavia_flavor_create.yml
index 5e617df7..ed061341 100644
--- a/tasks/octavia_flavor_create.yml
+++ b/tasks/octavia_flavor_create.yml
@@ -25,7 +25,7 @@
   block:
     - name: Create Octavia Flavor
       run_once: true
-      openstack.cloud.os_nova_flavor:
+      openstack.cloud.compute_flavor:
         auth:
           auth_url: "{{ keystone_service_adminurl }}"
           username: "{{ octavia_service_user_name }}"
diff --git a/tasks/octavia_mgmt_network.yml b/tasks/octavia_mgmt_network.yml
index 26440ed4..dc1e5b3f 100644
--- a/tasks/octavia_mgmt_network.yml
+++ b/tasks/octavia_mgmt_network.yml
@@ -25,7 +25,7 @@
   block:
     - name: Create mgmt network
       run_once: true
-      openstack.cloud.os_network:
+      openstack.cloud.network:
         auth:
           auth_url: "{{ keystone_service_adminurl }}"
           username: "{{ octavia_service_user_name }}"
@@ -50,7 +50,7 @@
 
     - name: Ensure mgmt subnet exists
       run_once: true
-      openstack.cloud.os_subnet:
+      openstack.cloud.subnet:
         auth:
           auth_url: "{{ keystone_service_adminurl }}"
           username: "{{ octavia_service_user_name }}"
diff --git a/tasks/octavia_post_install.yml b/tasks/octavia_post_install.yml
index 380f6595..617f3cba 100644
--- a/tasks/octavia_post_install.yml
+++ b/tasks/octavia_post_install.yml
@@ -47,7 +47,7 @@
     - octavia_nova_flavor_uuid is not defined
   block:
     - name: Get Octavia flavor details
-      openstack.cloud.os_flavor_info:
+      openstack.cloud.compute_flavor_info:
         auth:
           auth_url: "{{ keystone_service_adminurl }}"
           username: "{{ octavia_service_user_name }}"
@@ -75,7 +75,7 @@
     - octavia_neutron_management_network_name is defined
   block:
     - name: Get octavia management network details
-      openstack.cloud.os_networks_info:
+      openstack.cloud.networks_info:
         auth:
           auth_url: "{{ keystone_service_adminurl }}"
           username: "{{ octavia_service_user_name }}"
diff --git a/tasks/octavia_security_group.yml b/tasks/octavia_security_group.yml
index 1997daaf..a2860693 100644
--- a/tasks/octavia_security_group.yml
+++ b/tasks/octavia_security_group.yml
@@ -24,7 +24,7 @@
     ansible_python_interpreter: "{{ octavia_service_setup_host_python_interpreter }}"
   block:
     - name: Setup the service project quota
-      openstack.cloud.os_quota:
+      openstack.cloud.quota:
         cloud: default
         interface: admin
         name: "{{ octavia_service_project_name }}"
@@ -38,7 +38,7 @@
         port: "{{ octavia_num_ports }}"
 
     - name: Create Octavia security group
-      openstack.cloud.os_security_group:
+      openstack.cloud.security_group:
         auth:
           auth_url: "{{ keystone_service_adminurl }}"
           username: "{{ octavia_service_user_name }}"
@@ -57,7 +57,7 @@
       delay: 10
 
     - name: Create security group rule for agent
-      openstack.cloud.os_security_group_rule:
+      openstack.cloud.security_group_rule:
         auth:
           auth_url: "{{ keystone_service_adminurl }}"
           username: "{{ octavia_service_user_name }}"
@@ -79,7 +79,7 @@
       delay: 10
 
     - name: Create security group rule for ssh
-      openstack.cloud.os_security_group_rule:
+      openstack.cloud.security_group_rule:
         auth:
           auth_url: "{{ keystone_service_adminurl }}"
           username: "{{ octavia_service_user_name }}"
@@ -103,7 +103,7 @@
         - octavia_ssh_enabled | bool
 
     - name: Create security group rule for icmp
-      openstack.cloud.os_security_group_rule:
+      openstack.cloud.security_group_rule:
         auth:
           auth_url: "{{ keystone_service_adminurl }}"
           username: "{{ octavia_service_user_name }}"
diff --git a/tasks/service_setup.yml b/tasks/service_setup.yml
index 9ab3cc9d..f9200c28 100644
--- a/tasks/service_setup.yml
+++ b/tasks/service_setup.yml
@@ -32,7 +32,7 @@
     ansible_python_interpreter: "{{ _service_setup_host_python_interpreter }}"
   block:
     - name: Add keystone domain
-      openstack.cloud.os_keystone_domain:
+      openstack.cloud.identity_domain:
         cloud: default
         state: present
         description: "{{ _domain_name_description | default(omit) }}"
@@ -46,7 +46,7 @@
       delay: 10
 
     - name: Add service project
-      openstack.cloud.os_project:
+      openstack.cloud.project:
         cloud: default
         state: present
         name: "{{ _project_name }}"
@@ -63,7 +63,7 @@
       delay: 10
 
     - name: Add services to the keystone service catalog
-      openstack.cloud.os_keystone_service:
+      openstack.cloud.catalog_service:
         cloud: default
         state: "{{ item.state | default('present') }}"
         name: "{{ item.name }}"
@@ -79,7 +79,7 @@
       delay: 10
 
     - name: Add keystone roles
-      openstack.cloud.os_keystone_role:
+      openstack.cloud.identity_role:
         cloud: default
         state: present
         name: "{{ item.role }}"
@@ -98,7 +98,7 @@
       no_log: True
 
     - name: Add service users
-      openstack.cloud.os_user:
+      openstack.cloud.identity_user:
         cloud: default
         state: present
         name: "{{ item.name }}"
@@ -122,7 +122,7 @@
       no_log: True
 
     - name: Add service users to the role
-      openstack.cloud.os_user_role:
+      openstack.cloud.role_assignment:
         cloud: default
         state: present
         user: "{{ item.name }}"
@@ -145,7 +145,7 @@
       no_log: True
 
     - name: Add endpoints to keystone endpoint catalog
-      openstack.cloud.os_keystone_endpoint:
+      openstack.cloud.endpoint:
         cloud: default
         state: "{{ item.state | default('present') }}"
         service: "{{ item.service }}"