diff --git a/lib/vagrant/machine/remote.rb b/lib/vagrant/machine/remote.rb
index 225c96589..af41a883d 100644
--- a/lib/vagrant/machine/remote.rb
+++ b/lib/vagrant/machine/remote.rb
@@ -42,6 +42,7 @@ module Vagrant
         # TODO: get trigger config from go
         @triggers        = Vagrant::Plugin::V2::Trigger.new(@env, @config.trigger, self, @ui)
         @provider_options = {} # @config.vm.get_provider_overrides(@provider_name)
+        @provider = Vagrant.plugin("2").manager.providers[provider_name].first.new(self)
 
         # Keep track of where our UUID should be placed
         @index_uuid_file = nil
@@ -137,7 +138,7 @@ module Vagrant
 
       def provider
         return @provider if @provider
-        @provider = Vagrant.plugin("2").local_manager.providers[provider_name].first.new(self)
+        @provider = Vagrant.plugin("2").manager.providers[provider_name].first.new(self)
         @provider
       end
 
diff --git a/plugins/commands/serve/service/provider_service.rb b/plugins/commands/serve/service/provider_service.rb
index c05d8c34f..b0a9fd174 100644
--- a/plugins/commands/serve/service/provider_service.rb
+++ b/plugins/commands/serve/service/provider_service.rb
@@ -110,7 +110,7 @@ module VagrantPlugins
         def state_spec(*_)
           funcspec(
             args: [
-              SDK::Args::Target
+              SDK::Args::Target::Machine
             ],
             result: SDK::Args::Target::Machine::State,
           )