diff --git a/app/models/manageiq/providers/openstack/cloud_manager.rb b/app/models/manageiq/providers/openstack/cloud_manager.rb
index 6a5e8b1f2..574432fb9 100644
--- a/app/models/manageiq/providers/openstack/cloud_manager.rb
+++ b/app/models/manageiq/providers/openstack/cloud_manager.rb
@@ -38,9 +38,9 @@ class ManageIQ::Providers::Openstack::CloudManager < ManageIQ::Providers::CloudM
   supports :provisioning
   supports :cloud_tenants
   supports :cloud_tenant_mapping do
-    if defined?(self.class.parent::CloudManager::CloudTenant) && !tenant_mapping_enabled?
+    if defined?(self.class.module_parent::CloudManager::CloudTenant) && !tenant_mapping_enabled?
       unsupported_reason_add(:cloud_tenant_mapping, _("Tenant mapping is disabled on the Provider"))
-    elsif !defined?(self.class.parent::CloudManager::CloudTenant)
+    elsif !defined?(self.class.module_parent::CloudManager::CloudTenant)
       unsupported_reason_add(:cloud_tenant_mapping, _("Tenant mapping is supported only when CloudTenant exists "\
                                                       "on the CloudManager"))
     end
diff --git a/manageiq-providers-openstack.gemspec b/manageiq-providers-openstack.gemspec
index 308b694a6..a8503aef3 100644
--- a/manageiq-providers-openstack.gemspec
+++ b/manageiq-providers-openstack.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activesupport",        "~> 5.2.4", ">= 5.2.4.3"
+  spec.add_dependency "activesupport",        "~> 6.0"
   spec.add_dependency "bunny",                "~> 2.1.0"
   spec.add_dependency "excon",                "~> 0.71"
   spec.add_dependency "fog-openstack",        ">= 0.3.10"