diff --git a/app/models/concerns/foreman_vmware_advanced/vmware_extensions.rb b/app/models/concerns/foreman_vmware_advanced/vmware_extensions.rb
index 2bef1695b5d55f62e70d1963fb7b1912c7e077d5..5c1cbb2810de33164a3428b00d9a3a92a3e49a57 100644
--- a/app/models/concerns/foreman_vmware_advanced/vmware_extensions.rb
+++ b/app/models/concerns/foreman_vmware_advanced/vmware_extensions.rb
@@ -1,13 +1,7 @@
 module ForemanVmwareAdvanced
   module VmwareExtensions
-    extend ActiveSupport::Concern
-
-    included do
-      alias_method_chain :parse_args, :vmware_advanced
-    end
-
-    def parse_args_with_vmware_advanced(inp_args)
-      args = parse_args_without_vmware_advanced(inp_args)
+    def parse_args(inp_args)
+      args = super(inp_args)
 
       args[:extra_config] = (args[:extra_config] || {}).merge(
         'bios.bootOrder'.to_sym  => 'ethernet0',
diff --git a/lib/foreman_vmware_advanced/engine.rb b/lib/foreman_vmware_advanced/engine.rb
index 2745c822a667bec74bea8dfa482781b364c73559..ce18b524d45d4ec4706090d6873d9a6f53b78abe 100644
--- a/lib/foreman_vmware_advanced/engine.rb
+++ b/lib/foreman_vmware_advanced/engine.rb
@@ -10,7 +10,7 @@ module ForemanVmwareAdvanced
 
     config.to_prepare do
       begin
-        ::Foreman::Model::Vmware.send :include, ForemanVmwareAdvanced::VmwareExtensions
+        ::Foreman::Model::Vmware.send :prepend, ForemanVmwareAdvanced::VmwareExtensions
       rescue => e
         Rails.logger.warn "ForemanVmwareAdvanced: skipping engine hook(#{e})"
       end