diff --git a/app/models/manageiq/providers/vmware/cloud_manager/vm/remote_console.rb b/app/models/manageiq/providers/vmware/cloud_manager/vm/remote_console.rb
index 69ab52d2a..3c2ccae3c 100644
--- a/app/models/manageiq/providers/vmware/cloud_manager/vm/remote_console.rb
+++ b/app/models/manageiq/providers/vmware/cloud_manager/vm/remote_console.rb
@@ -1,6 +1,10 @@
 module ManageIQ::Providers::Vmware::CloudManager::Vm::RemoteConsole
-  def console_supported?(type)
-    %w(WEBMKS).include?(type.upcase)
+  extend ActiveSupport::Concern
+
+  included do
+    supports :console
+    supports :html5_console
+    supports :webmks_console
   end
 
   def validate_remote_console_acquire_ticket(protocol, options = {})
diff --git a/app/models/manageiq/providers/vmware/infra_manager/vm/remote_console.rb b/app/models/manageiq/providers/vmware/infra_manager/vm/remote_console.rb
index 632c54d0c..e29db89be 100644
--- a/app/models/manageiq/providers/vmware/infra_manager/vm/remote_console.rb
+++ b/app/models/manageiq/providers/vmware/infra_manager/vm/remote_console.rb
@@ -1,6 +1,12 @@
 module ManageIQ::Providers::Vmware::InfraManager::Vm::RemoteConsole
-  def console_supported?(type)
-    %w(VMRC VNC WEBMKS).include?(type.upcase)
+  extend ActiveSupport::Concern
+
+  included do
+    supports :console
+    supports :html5_console
+    supports :vmrc_console
+    supports :vnc_console
+    supports :webmks_console
   end
 
   def validate_remote_console_acquire_ticket(protocol, options = {})