diff --git a/internal/server/proto/ruby_vagrant/ruby-server.pb.go b/internal/server/proto/ruby_vagrant/ruby-server.pb.go
index f6e7ccfba..2f4b3b3b5 100644
--- a/internal/server/proto/ruby_vagrant/ruby-server.pb.go
+++ b/internal/server/proto/ruby_vagrant/ruby-server.pb.go
@@ -1,18 +1,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.23.0
-// 	protoc        v3.13.0
+// 	protoc-gen-go v1.25.0
+// 	protoc        v3.18.1
 // source: proto/ruby_vagrant/ruby-server.proto
 
 package ruby_vagrant
 
 import (
 	proto "github.com/golang/protobuf/proto"
-	_ "github.com/golang/protobuf/ptypes/any"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	vagrant_plugin_sdk "github.com/hashicorp/vagrant-plugin-sdk/proto/vagrant_plugin_sdk"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	_ "google.golang.org/protobuf/types/known/anypb"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
 	reflect "reflect"
 	sync "sync"
 )
@@ -401,7 +401,7 @@ var file_proto_ruby_vagrant_ruby_server_proto_goTypes = []interface{}{
 	(*ParseVagrantfileRequest)(nil),                    // 3: hashicorp.vagrant.ParseVagrantfileRequest
 	(*ParseVagrantfileResponse)(nil),                   // 4: hashicorp.vagrant.ParseVagrantfileResponse
 	(*vagrant_plugin_sdk.Vagrantfile_Vagrantfile)(nil), // 5: hashicorp.vagrant.sdk.Vagrantfile.Vagrantfile
-	(*empty.Empty)(nil),                                // 6: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                              // 6: google.protobuf.Empty
 }
 var file_proto_ruby_vagrant_ruby_server_proto_depIdxs = []int32{
 	2, // 0: hashicorp.vagrant.GetPluginsResponse.plugins:type_name -> hashicorp.vagrant.Plugin
diff --git a/internal/server/proto/ruby_vagrant/ruby-server_grpc.pb.go b/internal/server/proto/ruby_vagrant/ruby-server_grpc.pb.go
index 1a56c679e..6bf16396e 100644
--- a/internal/server/proto/ruby_vagrant/ruby-server_grpc.pb.go
+++ b/internal/server/proto/ruby_vagrant/ruby-server_grpc.pb.go
@@ -4,10 +4,10 @@ package ruby_vagrant
 
 import (
 	context "context"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
 )
 
 // This is a compile-time assertion to ensure that this generated file
@@ -20,7 +20,7 @@ const _ = grpc.SupportPackageIsVersion7
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
 type RubyVagrantClient interface {
 	// Gets available ruby plugins
-	GetPlugins(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*GetPluginsResponse, error)
+	GetPlugins(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*GetPluginsResponse, error)
 	ParseVagrantfile(ctx context.Context, in *ParseVagrantfileRequest, opts ...grpc.CallOption) (*ParseVagrantfileResponse, error)
 }
 
@@ -32,7 +32,7 @@ func NewRubyVagrantClient(cc grpc.ClientConnInterface) RubyVagrantClient {
 	return &rubyVagrantClient{cc}
 }
 
-func (c *rubyVagrantClient) GetPlugins(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*GetPluginsResponse, error) {
+func (c *rubyVagrantClient) GetPlugins(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*GetPluginsResponse, error) {
 	out := new(GetPluginsResponse)
 	err := c.cc.Invoke(ctx, "/hashicorp.vagrant.RubyVagrant/GetPlugins", in, out, opts...)
 	if err != nil {
@@ -55,7 +55,7 @@ func (c *rubyVagrantClient) ParseVagrantfile(ctx context.Context, in *ParseVagra
 // for forward compatibility
 type RubyVagrantServer interface {
 	// Gets available ruby plugins
-	GetPlugins(context.Context, *empty.Empty) (*GetPluginsResponse, error)
+	GetPlugins(context.Context, *emptypb.Empty) (*GetPluginsResponse, error)
 	ParseVagrantfile(context.Context, *ParseVagrantfileRequest) (*ParseVagrantfileResponse, error)
 	mustEmbedUnimplementedRubyVagrantServer()
 }
@@ -64,7 +64,7 @@ type RubyVagrantServer interface {
 type UnimplementedRubyVagrantServer struct {
 }
 
-func (UnimplementedRubyVagrantServer) GetPlugins(context.Context, *empty.Empty) (*GetPluginsResponse, error) {
+func (UnimplementedRubyVagrantServer) GetPlugins(context.Context, *emptypb.Empty) (*GetPluginsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetPlugins not implemented")
 }
 func (UnimplementedRubyVagrantServer) ParseVagrantfile(context.Context, *ParseVagrantfileRequest) (*ParseVagrantfileResponse, error) {
@@ -84,7 +84,7 @@ func RegisterRubyVagrantServer(s grpc.ServiceRegistrar, srv RubyVagrantServer) {
 }
 
 func _RubyVagrant_GetPlugins_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(empty.Empty)
+	in := new(emptypb.Empty)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -96,7 +96,7 @@ func _RubyVagrant_GetPlugins_Handler(srv interface{}, ctx context.Context, dec f
 		FullMethod: "/hashicorp.vagrant.RubyVagrant/GetPlugins",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(RubyVagrantServer).GetPlugins(ctx, req.(*empty.Empty))
+		return srv.(RubyVagrantServer).GetPlugins(ctx, req.(*emptypb.Empty))
 	}
 	return interceptor(ctx, in, info, handler)
 }
diff --git a/internal/server/proto/vagrant_server/server.pb.go b/internal/server/proto/vagrant_server/server.pb.go
index f57bbe907..1f9f5af34 100644
--- a/internal/server/proto/vagrant_server/server.pb.go
+++ b/internal/server/proto/vagrant_server/server.pb.go
@@ -1,21 +1,21 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.23.0
-// 	protoc        v3.13.0
+// 	protoc-gen-go v1.25.0
+// 	protoc        v3.18.1
 // source: proto/vagrant_server/server.proto
 
 package vagrant_server
 
 import (
 	proto "github.com/golang/protobuf/proto"
-	any "github.com/golang/protobuf/ptypes/any"
-	empty "github.com/golang/protobuf/ptypes/empty"
-	_ "github.com/golang/protobuf/ptypes/struct"
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	vagrant_plugin_sdk "github.com/hashicorp/vagrant-plugin-sdk/proto/vagrant_plugin_sdk"
 	status "google.golang.org/genproto/googleapis/rpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	anypb "google.golang.org/protobuf/types/known/anypb"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	_ "google.golang.org/protobuf/types/known/structpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 	reflect "reflect"
 	sync "sync"
 )
@@ -951,7 +951,7 @@ type Box struct {
 	// The box name. This is the logical name used when adding the box.
 	Name string `protobuf:"bytes,7,opt,name=name,proto3" json:"name,omitempty"`
 	// Tracks the last automatic update for the box
-	LastUpdate *timestamp.Timestamp `protobuf:"bytes,8,opt,name=last_update,json=lastUpdate,proto3" json:"last_update,omitempty"`
+	LastUpdate *timestamppb.Timestamp `protobuf:"bytes,8,opt,name=last_update,json=lastUpdate,proto3" json:"last_update,omitempty"`
 }
 
 func (x *Box) Reset() {
@@ -1035,7 +1035,7 @@ func (x *Box) GetName() string {
 	return ""
 }
 
-func (x *Box) GetLastUpdate() *timestamp.Timestamp {
+func (x *Box) GetLastUpdate() *timestamppb.Timestamp {
 	if x != nil {
 		return x.LastUpdate
 	}
@@ -1068,7 +1068,7 @@ type Target struct {
 	// Serialized configuration of the target (Vagrantfile)
 	Configuration *vagrant_plugin_sdk.Vagrantfile_MachineConfig `protobuf:"bytes,10,opt,name=configuration,proto3" json:"configuration,omitempty"`
 	// Specialized target information (from provider)
-	Record *any.Any `protobuf:"bytes,11,opt,name=record,proto3" json:"record,omitempty"`
+	Record *anypb.Any `protobuf:"bytes,11,opt,name=record,proto3" json:"record,omitempty"`
 	// Provider name backing machine
 	Provider string `protobuf:"bytes,12,opt,name=provider,proto3" json:"provider,omitempty"`
 	// If true, then the `-remote` flag or the `vagrant build project/app`
@@ -1185,7 +1185,7 @@ func (x *Target) GetConfiguration() *vagrant_plugin_sdk.Vagrantfile_MachineConfi
 	return nil
 }
 
-func (x *Target) GetRecord() *any.Any {
+func (x *Target) GetRecord() *anypb.Any {
 	if x != nil {
 		return x.Record
 	}
@@ -1402,9 +1402,9 @@ type Status struct {
 	// error is set if the state == ERROR with the error that occurred.
 	Error *status.Status `protobuf:"bytes,3,opt,name=error,proto3" json:"error,omitempty"`
 	// start_time is the time the operation was started.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// complete_time is the time the operation completed (success or fail).
-	CompleteTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=complete_time,json=completeTime,proto3" json:"complete_time,omitempty"`
+	CompleteTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=complete_time,json=completeTime,proto3" json:"complete_time,omitempty"`
 }
 
 func (x *Status) Reset() {
@@ -1460,14 +1460,14 @@ func (x *Status) GetError() *status.Status {
 	return nil
 }
 
-func (x *Status) GetStartTime() *timestamp.Timestamp {
+func (x *Status) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *Status) GetCompleteTime() *timestamp.Timestamp {
+func (x *Status) GetCompleteTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CompleteTime
 	}
@@ -1965,10 +1965,10 @@ type Job struct {
 	// runner may have been ephemeral and may no longer exist.
 	AssignedRunner *Ref_RunnerId `protobuf:"bytes,101,opt,name=assigned_runner,json=assignedRunner,proto3" json:"assigned_runner,omitempty"`
 	// The time when the job was queued.
-	QueueTime    *timestamp.Timestamp `protobuf:"bytes,102,opt,name=queue_time,json=queueTime,proto3" json:"queue_time,omitempty"`
-	AssignTime   *timestamp.Timestamp `protobuf:"bytes,103,opt,name=assign_time,json=assignTime,proto3" json:"assign_time,omitempty"`
-	AckTime      *timestamp.Timestamp `protobuf:"bytes,104,opt,name=ack_time,json=ackTime,proto3" json:"ack_time,omitempty"`
-	CompleteTime *timestamp.Timestamp `protobuf:"bytes,105,opt,name=complete_time,json=completeTime,proto3" json:"complete_time,omitempty"`
+	QueueTime    *timestamppb.Timestamp `protobuf:"bytes,102,opt,name=queue_time,json=queueTime,proto3" json:"queue_time,omitempty"`
+	AssignTime   *timestamppb.Timestamp `protobuf:"bytes,103,opt,name=assign_time,json=assignTime,proto3" json:"assign_time,omitempty"`
+	AckTime      *timestamppb.Timestamp `protobuf:"bytes,104,opt,name=ack_time,json=ackTime,proto3" json:"ack_time,omitempty"`
+	CompleteTime *timestamppb.Timestamp `protobuf:"bytes,105,opt,name=complete_time,json=completeTime,proto3" json:"complete_time,omitempty"`
 	// error is set if state == ERROR
 	Error *status.Status `protobuf:"bytes,106,opt,name=error,proto3" json:"error,omitempty"`
 	// result is set based on the operation specified. A nil result is possible
@@ -1978,12 +1978,12 @@ type Job struct {
 	// If this is zero then this job was not cancelled. Note that this is the
 	// cancellation _request_ time. The actual time a job ended is noted by
 	// the complete_time field.
-	CancelTime *timestamp.Timestamp `protobuf:"bytes,108,opt,name=cancel_time,json=cancelTime,proto3" json:"cancel_time,omitempty"`
+	CancelTime *timestamppb.Timestamp `protobuf:"bytes,108,opt,name=cancel_time,json=cancelTime,proto3" json:"cancel_time,omitempty"`
 	// expire time is the time when this job would expire. If this isn't set
 	// then this is a non-expiring job. This will remain set even if the job
 	// never expired because it was accepted and run. This field can be used
 	// to detect that it was configured to expire.
-	ExpireTime *timestamp.Timestamp `protobuf:"bytes,109,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
+	ExpireTime *timestamppb.Timestamp `protobuf:"bytes,109,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
 }
 
 func (x *Job) Reset() {
@@ -2137,28 +2137,28 @@ func (x *Job) GetAssignedRunner() *Ref_RunnerId {
 	return nil
 }
 
-func (x *Job) GetQueueTime() *timestamp.Timestamp {
+func (x *Job) GetQueueTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.QueueTime
 	}
 	return nil
 }
 
-func (x *Job) GetAssignTime() *timestamp.Timestamp {
+func (x *Job) GetAssignTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.AssignTime
 	}
 	return nil
 }
 
-func (x *Job) GetAckTime() *timestamp.Timestamp {
+func (x *Job) GetAckTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.AckTime
 	}
 	return nil
 }
 
-func (x *Job) GetCompleteTime() *timestamp.Timestamp {
+func (x *Job) GetCompleteTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CompleteTime
 	}
@@ -2179,14 +2179,14 @@ func (x *Job) GetResult() *Job_Result {
 	return nil
 }
 
-func (x *Job) GetCancelTime() *timestamp.Timestamp {
+func (x *Job) GetCancelTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CancelTime
 	}
 	return nil
 }
 
-func (x *Job) GetExpireTime() *timestamp.Timestamp {
+func (x *Job) GetExpireTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ExpireTime
 	}
@@ -6098,7 +6098,7 @@ type Token struct {
 	TokenId []byte `protobuf:"bytes,2,opt,name=token_id,json=tokenId,proto3" json:"token_id,omitempty"`
 	// When the token is valid until. After the given date, the token will be rejected.
 	// When this is not set, the token is valid forever.
-	ValidUntil *timestamp.Timestamp `protobuf:"bytes,3,opt,name=valid_until,json=validUntil,proto3" json:"valid_until,omitempty"`
+	ValidUntil *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=valid_until,json=validUntil,proto3" json:"valid_until,omitempty"`
 	// Indicates whether or not this token can be used for to authenticate RPCs.
 	Login bool `protobuf:"varint,4,opt,name=login,proto3" json:"login,omitempty"`
 	// Inidicates whether or not this token can be used as an invite.
@@ -6154,7 +6154,7 @@ func (x *Token) GetTokenId() []byte {
 	return nil
 }
 
-func (x *Token) GetValidUntil() *timestamp.Timestamp {
+func (x *Token) GetValidUntil() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ValidUntil
 	}
@@ -9669,7 +9669,7 @@ type GetJobStreamResponse_Terminal_Event struct {
 	// timestamp of the event as seen by the runner. This might be
 	// skewed from the server or the client but relative to all other
 	// line output, it will be accurate.
-	Timestamp *timestamp.Timestamp `protobuf:"bytes,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
+	Timestamp *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
 	// Types that are assignable to Event:
 	//	*GetJobStreamResponse_Terminal_Event_Line_
 	//	*GetJobStreamResponse_Terminal_Event_Status_
@@ -9713,7 +9713,7 @@ func (*GetJobStreamResponse_Terminal_Event) Descriptor() ([]byte, []int) {
 	return file_proto_vagrant_server_server_proto_rawDescGZIP(), []int{24, 2, 0}
 }
 
-func (x *GetJobStreamResponse_Terminal_Event) GetTimestamp() *timestamp.Timestamp {
+func (x *GetJobStreamResponse_Terminal_Event) GetTimestamp() *timestamppb.Timestamp {
 	if x != nil {
 		return x.Timestamp
 	}
@@ -9819,7 +9819,8 @@ func (*GetJobStreamResponse_Terminal_Event_Raw_) isGetJobStreamResponse_Terminal
 
 func (*GetJobStreamResponse_Terminal_Event_Table_) isGetJobStreamResponse_Terminal_Event_Event() {}
 
-func (*GetJobStreamResponse_Terminal_Event_StepGroup_) isGetJobStreamResponse_Terminal_Event_Event() {}
+func (*GetJobStreamResponse_Terminal_Event_StepGroup_) isGetJobStreamResponse_Terminal_Event_Event() {
+}
 
 func (*GetJobStreamResponse_Terminal_Event_Step_) isGetJobStreamResponse_Terminal_Event_Event() {}
 
@@ -10816,8 +10817,8 @@ type LogBatch_Entry struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Timestamp *timestamp.Timestamp `protobuf:"bytes,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
-	Line      string               `protobuf:"bytes,2,opt,name=line,proto3" json:"line,omitempty"`
+	Timestamp *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
+	Line      string                 `protobuf:"bytes,2,opt,name=line,proto3" json:"line,omitempty"`
 }
 
 func (x *LogBatch_Entry) Reset() {
@@ -10852,7 +10853,7 @@ func (*LogBatch_Entry) Descriptor() ([]byte, []int) {
 	return file_proto_vagrant_server_server_proto_rawDescGZIP(), []int{68, 0}
 }
 
-func (x *LogBatch_Entry) GetTimestamp() *timestamp.Timestamp {
+func (x *LogBatch_Entry) GetTimestamp() *timestamppb.Timestamp {
 	if x != nil {
 		return x.Timestamp
 	}
@@ -13874,15 +13875,15 @@ var file_proto_vagrant_server_server_proto_goTypes = []interface{}{
 	(*vagrant_plugin_sdk.Vagrantfile_Vagrantfile)(nil),      // 197: hashicorp.vagrant.sdk.Vagrantfile.Vagrantfile
 	(*vagrant_plugin_sdk.Ref_Target)(nil),                   // 198: hashicorp.vagrant.sdk.Ref.Target
 	(*vagrant_plugin_sdk.Ref_Basis)(nil),                    // 199: hashicorp.vagrant.sdk.Ref.Basis
-	(*timestamp.Timestamp)(nil),                             // 200: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),                           // 200: google.protobuf.Timestamp
 	(*vagrant_plugin_sdk.Args_DataDir_Target)(nil),          // 201: hashicorp.vagrant.sdk.Args.DataDir.Target
 	(*vagrant_plugin_sdk.Vagrantfile_MachineConfig)(nil),    // 202: hashicorp.vagrant.sdk.Vagrantfile.MachineConfig
-	(*any.Any)(nil),                                         // 203: google.protobuf.Any
+	(*anypb.Any)(nil),                                       // 203: google.protobuf.Any
 	(*status.Status)(nil),                                   // 204: google.rpc.Status
 	(*vagrant_plugin_sdk.Ref_Box)(nil),                      // 205: hashicorp.vagrant.sdk.Ref.Box
 	(*vagrant_plugin_sdk.Command_Arguments)(nil),            // 206: hashicorp.vagrant.sdk.Command.Arguments
 	(*vagrant_plugin_sdk.Args_Target_Machine_State)(nil),    // 207: hashicorp.vagrant.sdk.Args.Target.Machine.State
-	(*empty.Empty)(nil),                                     // 208: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                                   // 208: google.protobuf.Empty
 }
 var file_proto_vagrant_server_server_proto_depIdxs = []int32{
 	11,  // 0: hashicorp.vagrant.GetVersionInfoResponse.info:type_name -> hashicorp.vagrant.VersionInfo
diff --git a/internal/server/proto/vagrant_server/server_grpc.pb.go b/internal/server/proto/vagrant_server/server_grpc.pb.go
index ebc467130..e64ae8cc3 100644
--- a/internal/server/proto/vagrant_server/server_grpc.pb.go
+++ b/internal/server/proto/vagrant_server/server_grpc.pb.go
@@ -4,10 +4,10 @@ package vagrant_server
 
 import (
 	context "context"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
 )
 
 // This is a compile-time assertion to ensure that this generated file
@@ -22,11 +22,11 @@ type VagrantClient interface {
 	// GetVersionInfo returns information about the server. This RPC call does
 	// NOT require authentication. It can be used by clients to determine if they
 	// are capable of talking to this server.
-	GetVersionInfo(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*GetVersionInfoResponse, error)
+	GetVersionInfo(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*GetVersionInfoResponse, error)
 	UpsertBasis(ctx context.Context, in *UpsertBasisRequest, opts ...grpc.CallOption) (*UpsertBasisResponse, error)
 	GetBasis(ctx context.Context, in *GetBasisRequest, opts ...grpc.CallOption) (*GetBasisResponse, error)
 	FindBasis(ctx context.Context, in *FindBasisRequest, opts ...grpc.CallOption) (*FindBasisResponse, error)
-	ListBasis(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*ListBasisResponse, error)
+	ListBasis(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ListBasisResponse, error)
 	// ListTasks returns the tasks.
 	ListTasks(ctx context.Context, in *ListTasksRequest, opts ...grpc.CallOption) (*ListTasksResponse, error)
 	// GetTask returns a task
@@ -44,19 +44,19 @@ type VagrantClient interface {
 	// ListProjects returns a list of all the projects. There is no equivalent
 	// ListApplications because applications are a part of projects and you
 	// can use GetProject to get more information about the project.
-	ListProjects(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*ListProjectsResponse, error)
+	ListProjects(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ListProjectsResponse, error)
 	// UpsertTarget upserts a target with a project. If the target
 	// is already registered this does nothing.
 	UpsertTarget(ctx context.Context, in *UpsertTargetRequest, opts ...grpc.CallOption) (*UpsertTargetResponse, error)
-	DeleteTarget(ctx context.Context, in *DeleteTargetRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteTarget(ctx context.Context, in *DeleteTargetRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	GetTarget(ctx context.Context, in *GetTargetRequest, opts ...grpc.CallOption) (*GetTargetResponse, error)
 	FindTarget(ctx context.Context, in *FindTargetRequest, opts ...grpc.CallOption) (*FindTargetResponse, error)
-	ListTargets(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*ListTargetsResponse, error)
+	ListTargets(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ListTargetsResponse, error)
 	// CRUD operations for box
 	UpsertBox(ctx context.Context, in *UpsertBoxRequest, opts ...grpc.CallOption) (*UpsertBoxResponse, error)
-	DeleteBox(ctx context.Context, in *DeleteBoxRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteBox(ctx context.Context, in *DeleteBoxRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	GetBox(ctx context.Context, in *GetBoxRequest, opts ...grpc.CallOption) (*GetBoxResponse, error)
-	ListBoxes(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*ListBoxesResponse, error)
+	ListBoxes(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ListBoxesResponse, error)
 	FindBox(ctx context.Context, in *FindBoxRequest, opts ...grpc.CallOption) (*FindBoxResponse, error)
 	// GetLogStream reads the log stream for a deployment. This will immediately
 	// send a single LogEntry with the lines we have so far. If there are no
@@ -79,7 +79,7 @@ type VagrantClient interface {
 	//
 	// This RPC always returns immediately. You must use GetJob or GetJobStream
 	// to wait on the status of the cancellation.
-	CancelJob(ctx context.Context, in *CancelJobRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	CancelJob(ctx context.Context, in *CancelJobRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// GetJob queries a job by ID.
 	GetJob(ctx context.Context, in *GetJobRequest, opts ...grpc.CallOption) (*Job, error)
 	// INTERNAL: ListJobs lists all the jobs the server has processed. This
@@ -94,15 +94,15 @@ type VagrantClient interface {
 	// Multiple listeners can open a job stream.
 	GetJobStream(ctx context.Context, in *GetJobStreamRequest, opts ...grpc.CallOption) (Vagrant_GetJobStreamClient, error)
 	// Clean out old jobs from the job database
-	PruneOldJobs(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*empty.Empty, error)
+	PruneOldJobs(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// GetRunner gets information about a single runner.
 	GetRunner(ctx context.Context, in *GetRunnerRequest, opts ...grpc.CallOption) (*Runner, error)
 	// GetServerConfig sets configuration for the Vagrant server.
-	GetServerConfig(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*GetServerConfigResponse, error)
+	GetServerConfig(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*GetServerConfigResponse, error)
 	// SetServerConfig sets configuration for the Vagrant server.
-	SetServerConfig(ctx context.Context, in *SetServerConfigRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	SetServerConfig(ctx context.Context, in *SetServerConfigRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// CreateSnapshot creates a new database snapshot.
-	CreateSnapshot(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (Vagrant_CreateSnapshotClient, error)
+	CreateSnapshot(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (Vagrant_CreateSnapshotClient, error)
 	// RestoreSnapshot performs a database restore with the given snapshot.
 	// This API doesn't do a full online restore, it only stages the restore
 	// for the next server start to finalize the restore. See the arguments for
@@ -111,11 +111,11 @@ type VagrantClient interface {
 	// BootstrapToken returns the initial token for the server. This can only
 	// be requested once on first startup. After initial request this will
 	// always return a PermissionDenied error.
-	BootstrapToken(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*NewTokenResponse, error)
+	BootstrapToken(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*NewTokenResponse, error)
 	// Generate a new invite token that users can exchange for a login token.
 	GenerateInviteToken(ctx context.Context, in *InviteTokenRequest, opts ...grpc.CallOption) (*NewTokenResponse, error)
 	// Generate a new login token that users can use to login directly.
-	GenerateLoginToken(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*NewTokenResponse, error)
+	GenerateLoginToken(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*NewTokenResponse, error)
 	// Exchange a invite token for a login token.
 	ConvertInviteToken(ctx context.Context, in *ConvertInviteTokenRequest, opts ...grpc.CallOption) (*NewTokenResponse, error)
 	// RunnerConfig is called to register a runner and receive the configuration
@@ -135,7 +135,7 @@ func NewVagrantClient(cc grpc.ClientConnInterface) VagrantClient {
 	return &vagrantClient{cc}
 }
 
-func (c *vagrantClient) GetVersionInfo(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*GetVersionInfoResponse, error) {
+func (c *vagrantClient) GetVersionInfo(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*GetVersionInfoResponse, error) {
 	out := new(GetVersionInfoResponse)
 	err := c.cc.Invoke(ctx, "/hashicorp.vagrant.Vagrant/GetVersionInfo", in, out, opts...)
 	if err != nil {
@@ -171,7 +171,7 @@ func (c *vagrantClient) FindBasis(ctx context.Context, in *FindBasisRequest, opt
 	return out, nil
 }
 
-func (c *vagrantClient) ListBasis(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*ListBasisResponse, error) {
+func (c *vagrantClient) ListBasis(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ListBasisResponse, error) {
 	out := new(ListBasisResponse)
 	err := c.cc.Invoke(ctx, "/hashicorp.vagrant.Vagrant/ListBasis", in, out, opts...)
 	if err != nil {
@@ -243,7 +243,7 @@ func (c *vagrantClient) FindProject(ctx context.Context, in *FindProjectRequest,
 	return out, nil
 }
 
-func (c *vagrantClient) ListProjects(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*ListProjectsResponse, error) {
+func (c *vagrantClient) ListProjects(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ListProjectsResponse, error) {
 	out := new(ListProjectsResponse)
 	err := c.cc.Invoke(ctx, "/hashicorp.vagrant.Vagrant/ListProjects", in, out, opts...)
 	if err != nil {
@@ -261,8 +261,8 @@ func (c *vagrantClient) UpsertTarget(ctx context.Context, in *UpsertTargetReques
 	return out, nil
 }
 
-func (c *vagrantClient) DeleteTarget(ctx context.Context, in *DeleteTargetRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *vagrantClient) DeleteTarget(ctx context.Context, in *DeleteTargetRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/hashicorp.vagrant.Vagrant/DeleteTarget", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -288,7 +288,7 @@ func (c *vagrantClient) FindTarget(ctx context.Context, in *FindTargetRequest, o
 	return out, nil
 }
 
-func (c *vagrantClient) ListTargets(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*ListTargetsResponse, error) {
+func (c *vagrantClient) ListTargets(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ListTargetsResponse, error) {
 	out := new(ListTargetsResponse)
 	err := c.cc.Invoke(ctx, "/hashicorp.vagrant.Vagrant/ListTargets", in, out, opts...)
 	if err != nil {
@@ -306,8 +306,8 @@ func (c *vagrantClient) UpsertBox(ctx context.Context, in *UpsertBoxRequest, opt
 	return out, nil
 }
 
-func (c *vagrantClient) DeleteBox(ctx context.Context, in *DeleteBoxRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *vagrantClient) DeleteBox(ctx context.Context, in *DeleteBoxRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/hashicorp.vagrant.Vagrant/DeleteBox", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -324,7 +324,7 @@ func (c *vagrantClient) GetBox(ctx context.Context, in *GetBoxRequest, opts ...g
 	return out, nil
 }
 
-func (c *vagrantClient) ListBoxes(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*ListBoxesResponse, error) {
+func (c *vagrantClient) ListBoxes(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ListBoxesResponse, error) {
 	out := new(ListBoxesResponse)
 	err := c.cc.Invoke(ctx, "/hashicorp.vagrant.Vagrant/ListBoxes", in, out, opts...)
 	if err != nil {
@@ -401,8 +401,8 @@ func (c *vagrantClient) QueueJob(ctx context.Context, in *QueueJobRequest, opts
 	return out, nil
 }
 
-func (c *vagrantClient) CancelJob(ctx context.Context, in *CancelJobRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *vagrantClient) CancelJob(ctx context.Context, in *CancelJobRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/hashicorp.vagrant.Vagrant/CancelJob", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -469,8 +469,8 @@ func (x *vagrantGetJobStreamClient) Recv() (*GetJobStreamResponse, error) {
 	return m, nil
 }
 
-func (c *vagrantClient) PruneOldJobs(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *vagrantClient) PruneOldJobs(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/hashicorp.vagrant.Vagrant/PruneOldJobs", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -487,7 +487,7 @@ func (c *vagrantClient) GetRunner(ctx context.Context, in *GetRunnerRequest, opt
 	return out, nil
 }
 
-func (c *vagrantClient) GetServerConfig(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*GetServerConfigResponse, error) {
+func (c *vagrantClient) GetServerConfig(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*GetServerConfigResponse, error) {
 	out := new(GetServerConfigResponse)
 	err := c.cc.Invoke(ctx, "/hashicorp.vagrant.Vagrant/GetServerConfig", in, out, opts...)
 	if err != nil {
@@ -496,8 +496,8 @@ func (c *vagrantClient) GetServerConfig(ctx context.Context, in *empty.Empty, op
 	return out, nil
 }
 
-func (c *vagrantClient) SetServerConfig(ctx context.Context, in *SetServerConfigRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *vagrantClient) SetServerConfig(ctx context.Context, in *SetServerConfigRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/hashicorp.vagrant.Vagrant/SetServerConfig", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -505,7 +505,7 @@ func (c *vagrantClient) SetServerConfig(ctx context.Context, in *SetServerConfig
 	return out, nil
 }
 
-func (c *vagrantClient) CreateSnapshot(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (Vagrant_CreateSnapshotClient, error) {
+func (c *vagrantClient) CreateSnapshot(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (Vagrant_CreateSnapshotClient, error) {
 	stream, err := c.cc.NewStream(ctx, &Vagrant_ServiceDesc.Streams[2], "/hashicorp.vagrant.Vagrant/CreateSnapshot", opts...)
 	if err != nil {
 		return nil, err
@@ -548,7 +548,7 @@ func (c *vagrantClient) RestoreSnapshot(ctx context.Context, opts ...grpc.CallOp
 
 type Vagrant_RestoreSnapshotClient interface {
 	Send(*RestoreSnapshotRequest) error
-	CloseAndRecv() (*empty.Empty, error)
+	CloseAndRecv() (*emptypb.Empty, error)
 	grpc.ClientStream
 }
 
@@ -560,18 +560,18 @@ func (x *vagrantRestoreSnapshotClient) Send(m *RestoreSnapshotRequest) error {
 	return x.ClientStream.SendMsg(m)
 }
 
-func (x *vagrantRestoreSnapshotClient) CloseAndRecv() (*empty.Empty, error) {
+func (x *vagrantRestoreSnapshotClient) CloseAndRecv() (*emptypb.Empty, error) {
 	if err := x.ClientStream.CloseSend(); err != nil {
 		return nil, err
 	}
-	m := new(empty.Empty)
+	m := new(emptypb.Empty)
 	if err := x.ClientStream.RecvMsg(m); err != nil {
 		return nil, err
 	}
 	return m, nil
 }
 
-func (c *vagrantClient) BootstrapToken(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*NewTokenResponse, error) {
+func (c *vagrantClient) BootstrapToken(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*NewTokenResponse, error) {
 	out := new(NewTokenResponse)
 	err := c.cc.Invoke(ctx, "/hashicorp.vagrant.Vagrant/BootstrapToken", in, out, opts...)
 	if err != nil {
@@ -589,7 +589,7 @@ func (c *vagrantClient) GenerateInviteToken(ctx context.Context, in *InviteToken
 	return out, nil
 }
 
-func (c *vagrantClient) GenerateLoginToken(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*NewTokenResponse, error) {
+func (c *vagrantClient) GenerateLoginToken(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*NewTokenResponse, error) {
 	out := new(NewTokenResponse)
 	err := c.cc.Invoke(ctx, "/hashicorp.vagrant.Vagrant/GenerateLoginToken", in, out, opts...)
 	if err != nil {
@@ -676,11 +676,11 @@ type VagrantServer interface {
 	// GetVersionInfo returns information about the server. This RPC call does
 	// NOT require authentication. It can be used by clients to determine if they
 	// are capable of talking to this server.
-	GetVersionInfo(context.Context, *empty.Empty) (*GetVersionInfoResponse, error)
+	GetVersionInfo(context.Context, *emptypb.Empty) (*GetVersionInfoResponse, error)
 	UpsertBasis(context.Context, *UpsertBasisRequest) (*UpsertBasisResponse, error)
 	GetBasis(context.Context, *GetBasisRequest) (*GetBasisResponse, error)
 	FindBasis(context.Context, *FindBasisRequest) (*FindBasisResponse, error)
-	ListBasis(context.Context, *empty.Empty) (*ListBasisResponse, error)
+	ListBasis(context.Context, *emptypb.Empty) (*ListBasisResponse, error)
 	// ListTasks returns the tasks.
 	ListTasks(context.Context, *ListTasksRequest) (*ListTasksResponse, error)
 	// GetTask returns a task
@@ -698,19 +698,19 @@ type VagrantServer interface {
 	// ListProjects returns a list of all the projects. There is no equivalent
 	// ListApplications because applications are a part of projects and you
 	// can use GetProject to get more information about the project.
-	ListProjects(context.Context, *empty.Empty) (*ListProjectsResponse, error)
+	ListProjects(context.Context, *emptypb.Empty) (*ListProjectsResponse, error)
 	// UpsertTarget upserts a target with a project. If the target
 	// is already registered this does nothing.
 	UpsertTarget(context.Context, *UpsertTargetRequest) (*UpsertTargetResponse, error)
-	DeleteTarget(context.Context, *DeleteTargetRequest) (*empty.Empty, error)
+	DeleteTarget(context.Context, *DeleteTargetRequest) (*emptypb.Empty, error)
 	GetTarget(context.Context, *GetTargetRequest) (*GetTargetResponse, error)
 	FindTarget(context.Context, *FindTargetRequest) (*FindTargetResponse, error)
-	ListTargets(context.Context, *empty.Empty) (*ListTargetsResponse, error)
+	ListTargets(context.Context, *emptypb.Empty) (*ListTargetsResponse, error)
 	// CRUD operations for box
 	UpsertBox(context.Context, *UpsertBoxRequest) (*UpsertBoxResponse, error)
-	DeleteBox(context.Context, *DeleteBoxRequest) (*empty.Empty, error)
+	DeleteBox(context.Context, *DeleteBoxRequest) (*emptypb.Empty, error)
 	GetBox(context.Context, *GetBoxRequest) (*GetBoxResponse, error)
-	ListBoxes(context.Context, *empty.Empty) (*ListBoxesResponse, error)
+	ListBoxes(context.Context, *emptypb.Empty) (*ListBoxesResponse, error)
 	FindBox(context.Context, *FindBoxRequest) (*FindBoxResponse, error)
 	// GetLogStream reads the log stream for a deployment. This will immediately
 	// send a single LogEntry with the lines we have so far. If there are no
@@ -733,7 +733,7 @@ type VagrantServer interface {
 	//
 	// This RPC always returns immediately. You must use GetJob or GetJobStream
 	// to wait on the status of the cancellation.
-	CancelJob(context.Context, *CancelJobRequest) (*empty.Empty, error)
+	CancelJob(context.Context, *CancelJobRequest) (*emptypb.Empty, error)
 	// GetJob queries a job by ID.
 	GetJob(context.Context, *GetJobRequest) (*Job, error)
 	// INTERNAL: ListJobs lists all the jobs the server has processed. This
@@ -748,15 +748,15 @@ type VagrantServer interface {
 	// Multiple listeners can open a job stream.
 	GetJobStream(*GetJobStreamRequest, Vagrant_GetJobStreamServer) error
 	// Clean out old jobs from the job database
-	PruneOldJobs(context.Context, *empty.Empty) (*empty.Empty, error)
+	PruneOldJobs(context.Context, *emptypb.Empty) (*emptypb.Empty, error)
 	// GetRunner gets information about a single runner.
 	GetRunner(context.Context, *GetRunnerRequest) (*Runner, error)
 	// GetServerConfig sets configuration for the Vagrant server.
-	GetServerConfig(context.Context, *empty.Empty) (*GetServerConfigResponse, error)
+	GetServerConfig(context.Context, *emptypb.Empty) (*GetServerConfigResponse, error)
 	// SetServerConfig sets configuration for the Vagrant server.
-	SetServerConfig(context.Context, *SetServerConfigRequest) (*empty.Empty, error)
+	SetServerConfig(context.Context, *SetServerConfigRequest) (*emptypb.Empty, error)
 	// CreateSnapshot creates a new database snapshot.
-	CreateSnapshot(*empty.Empty, Vagrant_CreateSnapshotServer) error
+	CreateSnapshot(*emptypb.Empty, Vagrant_CreateSnapshotServer) error
 	// RestoreSnapshot performs a database restore with the given snapshot.
 	// This API doesn't do a full online restore, it only stages the restore
 	// for the next server start to finalize the restore. See the arguments for
@@ -765,11 +765,11 @@ type VagrantServer interface {
 	// BootstrapToken returns the initial token for the server. This can only
 	// be requested once on first startup. After initial request this will
 	// always return a PermissionDenied error.
-	BootstrapToken(context.Context, *empty.Empty) (*NewTokenResponse, error)
+	BootstrapToken(context.Context, *emptypb.Empty) (*NewTokenResponse, error)
 	// Generate a new invite token that users can exchange for a login token.
 	GenerateInviteToken(context.Context, *InviteTokenRequest) (*NewTokenResponse, error)
 	// Generate a new login token that users can use to login directly.
-	GenerateLoginToken(context.Context, *empty.Empty) (*NewTokenResponse, error)
+	GenerateLoginToken(context.Context, *emptypb.Empty) (*NewTokenResponse, error)
 	// Exchange a invite token for a login token.
 	ConvertInviteToken(context.Context, *ConvertInviteTokenRequest) (*NewTokenResponse, error)
 	// RunnerConfig is called to register a runner and receive the configuration
@@ -785,7 +785,7 @@ type VagrantServer interface {
 type UnimplementedVagrantServer struct {
 }
 
-func (UnimplementedVagrantServer) GetVersionInfo(context.Context, *empty.Empty) (*GetVersionInfoResponse, error) {
+func (UnimplementedVagrantServer) GetVersionInfo(context.Context, *emptypb.Empty) (*GetVersionInfoResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetVersionInfo not implemented")
 }
 func (UnimplementedVagrantServer) UpsertBasis(context.Context, *UpsertBasisRequest) (*UpsertBasisResponse, error) {
@@ -797,7 +797,7 @@ func (UnimplementedVagrantServer) GetBasis(context.Context, *GetBasisRequest) (*
 func (UnimplementedVagrantServer) FindBasis(context.Context, *FindBasisRequest) (*FindBasisResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindBasis not implemented")
 }
-func (UnimplementedVagrantServer) ListBasis(context.Context, *empty.Empty) (*ListBasisResponse, error) {
+func (UnimplementedVagrantServer) ListBasis(context.Context, *emptypb.Empty) (*ListBasisResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ListBasis not implemented")
 }
 func (UnimplementedVagrantServer) ListTasks(context.Context, *ListTasksRequest) (*ListTasksResponse, error) {
@@ -821,13 +821,13 @@ func (UnimplementedVagrantServer) GetProject(context.Context, *GetProjectRequest
 func (UnimplementedVagrantServer) FindProject(context.Context, *FindProjectRequest) (*FindProjectResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindProject not implemented")
 }
-func (UnimplementedVagrantServer) ListProjects(context.Context, *empty.Empty) (*ListProjectsResponse, error) {
+func (UnimplementedVagrantServer) ListProjects(context.Context, *emptypb.Empty) (*ListProjectsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ListProjects not implemented")
 }
 func (UnimplementedVagrantServer) UpsertTarget(context.Context, *UpsertTargetRequest) (*UpsertTargetResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpsertTarget not implemented")
 }
-func (UnimplementedVagrantServer) DeleteTarget(context.Context, *DeleteTargetRequest) (*empty.Empty, error) {
+func (UnimplementedVagrantServer) DeleteTarget(context.Context, *DeleteTargetRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteTarget not implemented")
 }
 func (UnimplementedVagrantServer) GetTarget(context.Context, *GetTargetRequest) (*GetTargetResponse, error) {
@@ -836,19 +836,19 @@ func (UnimplementedVagrantServer) GetTarget(context.Context, *GetTargetRequest)
 func (UnimplementedVagrantServer) FindTarget(context.Context, *FindTargetRequest) (*FindTargetResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method FindTarget not implemented")
 }
-func (UnimplementedVagrantServer) ListTargets(context.Context, *empty.Empty) (*ListTargetsResponse, error) {
+func (UnimplementedVagrantServer) ListTargets(context.Context, *emptypb.Empty) (*ListTargetsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ListTargets not implemented")
 }
 func (UnimplementedVagrantServer) UpsertBox(context.Context, *UpsertBoxRequest) (*UpsertBoxResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpsertBox not implemented")
 }
-func (UnimplementedVagrantServer) DeleteBox(context.Context, *DeleteBoxRequest) (*empty.Empty, error) {
+func (UnimplementedVagrantServer) DeleteBox(context.Context, *DeleteBoxRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteBox not implemented")
 }
 func (UnimplementedVagrantServer) GetBox(context.Context, *GetBoxRequest) (*GetBoxResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetBox not implemented")
 }
-func (UnimplementedVagrantServer) ListBoxes(context.Context, *empty.Empty) (*ListBoxesResponse, error) {
+func (UnimplementedVagrantServer) ListBoxes(context.Context, *emptypb.Empty) (*ListBoxesResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ListBoxes not implemented")
 }
 func (UnimplementedVagrantServer) FindBox(context.Context, *FindBoxRequest) (*FindBoxResponse, error) {
@@ -866,7 +866,7 @@ func (UnimplementedVagrantServer) GetConfig(context.Context, *ConfigGetRequest)
 func (UnimplementedVagrantServer) QueueJob(context.Context, *QueueJobRequest) (*QueueJobResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method QueueJob not implemented")
 }
-func (UnimplementedVagrantServer) CancelJob(context.Context, *CancelJobRequest) (*empty.Empty, error) {
+func (UnimplementedVagrantServer) CancelJob(context.Context, *CancelJobRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CancelJob not implemented")
 }
 func (UnimplementedVagrantServer) GetJob(context.Context, *GetJobRequest) (*Job, error) {
@@ -881,31 +881,31 @@ func (UnimplementedVagrantServer) ValidateJob(context.Context, *ValidateJobReque
 func (UnimplementedVagrantServer) GetJobStream(*GetJobStreamRequest, Vagrant_GetJobStreamServer) error {
 	return status.Errorf(codes.Unimplemented, "method GetJobStream not implemented")
 }
-func (UnimplementedVagrantServer) PruneOldJobs(context.Context, *empty.Empty) (*empty.Empty, error) {
+func (UnimplementedVagrantServer) PruneOldJobs(context.Context, *emptypb.Empty) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method PruneOldJobs not implemented")
 }
 func (UnimplementedVagrantServer) GetRunner(context.Context, *GetRunnerRequest) (*Runner, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetRunner not implemented")
 }
-func (UnimplementedVagrantServer) GetServerConfig(context.Context, *empty.Empty) (*GetServerConfigResponse, error) {
+func (UnimplementedVagrantServer) GetServerConfig(context.Context, *emptypb.Empty) (*GetServerConfigResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetServerConfig not implemented")
 }
-func (UnimplementedVagrantServer) SetServerConfig(context.Context, *SetServerConfigRequest) (*empty.Empty, error) {
+func (UnimplementedVagrantServer) SetServerConfig(context.Context, *SetServerConfigRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SetServerConfig not implemented")
 }
-func (UnimplementedVagrantServer) CreateSnapshot(*empty.Empty, Vagrant_CreateSnapshotServer) error {
+func (UnimplementedVagrantServer) CreateSnapshot(*emptypb.Empty, Vagrant_CreateSnapshotServer) error {
 	return status.Errorf(codes.Unimplemented, "method CreateSnapshot not implemented")
 }
 func (UnimplementedVagrantServer) RestoreSnapshot(Vagrant_RestoreSnapshotServer) error {
 	return status.Errorf(codes.Unimplemented, "method RestoreSnapshot not implemented")
 }
-func (UnimplementedVagrantServer) BootstrapToken(context.Context, *empty.Empty) (*NewTokenResponse, error) {
+func (UnimplementedVagrantServer) BootstrapToken(context.Context, *emptypb.Empty) (*NewTokenResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method BootstrapToken not implemented")
 }
 func (UnimplementedVagrantServer) GenerateInviteToken(context.Context, *InviteTokenRequest) (*NewTokenResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GenerateInviteToken not implemented")
 }
-func (UnimplementedVagrantServer) GenerateLoginToken(context.Context, *empty.Empty) (*NewTokenResponse, error) {
+func (UnimplementedVagrantServer) GenerateLoginToken(context.Context, *emptypb.Empty) (*NewTokenResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GenerateLoginToken not implemented")
 }
 func (UnimplementedVagrantServer) ConvertInviteToken(context.Context, *ConvertInviteTokenRequest) (*NewTokenResponse, error) {
@@ -930,7 +930,7 @@ func RegisterVagrantServer(s grpc.ServiceRegistrar, srv VagrantServer) {
 }
 
 func _Vagrant_GetVersionInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(empty.Empty)
+	in := new(emptypb.Empty)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -942,7 +942,7 @@ func _Vagrant_GetVersionInfo_Handler(srv interface{}, ctx context.Context, dec f
 		FullMethod: "/hashicorp.vagrant.Vagrant/GetVersionInfo",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(VagrantServer).GetVersionInfo(ctx, req.(*empty.Empty))
+		return srv.(VagrantServer).GetVersionInfo(ctx, req.(*emptypb.Empty))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -1002,7 +1002,7 @@ func _Vagrant_FindBasis_Handler(srv interface{}, ctx context.Context, dec func(i
 }
 
 func _Vagrant_ListBasis_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(empty.Empty)
+	in := new(emptypb.Empty)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -1014,7 +1014,7 @@ func _Vagrant_ListBasis_Handler(srv interface{}, ctx context.Context, dec func(i
 		FullMethod: "/hashicorp.vagrant.Vagrant/ListBasis",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(VagrantServer).ListBasis(ctx, req.(*empty.Empty))
+		return srv.(VagrantServer).ListBasis(ctx, req.(*emptypb.Empty))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -1146,7 +1146,7 @@ func _Vagrant_FindProject_Handler(srv interface{}, ctx context.Context, dec func
 }
 
 func _Vagrant_ListProjects_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(empty.Empty)
+	in := new(emptypb.Empty)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -1158,7 +1158,7 @@ func _Vagrant_ListProjects_Handler(srv interface{}, ctx context.Context, dec fun
 		FullMethod: "/hashicorp.vagrant.Vagrant/ListProjects",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(VagrantServer).ListProjects(ctx, req.(*empty.Empty))
+		return srv.(VagrantServer).ListProjects(ctx, req.(*emptypb.Empty))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -1236,7 +1236,7 @@ func _Vagrant_FindTarget_Handler(srv interface{}, ctx context.Context, dec func(
 }
 
 func _Vagrant_ListTargets_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(empty.Empty)
+	in := new(emptypb.Empty)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -1248,7 +1248,7 @@ func _Vagrant_ListTargets_Handler(srv interface{}, ctx context.Context, dec func
 		FullMethod: "/hashicorp.vagrant.Vagrant/ListTargets",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(VagrantServer).ListTargets(ctx, req.(*empty.Empty))
+		return srv.(VagrantServer).ListTargets(ctx, req.(*emptypb.Empty))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -1308,7 +1308,7 @@ func _Vagrant_GetBox_Handler(srv interface{}, ctx context.Context, dec func(inte
 }
 
 func _Vagrant_ListBoxes_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(empty.Empty)
+	in := new(emptypb.Empty)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -1320,7 +1320,7 @@ func _Vagrant_ListBoxes_Handler(srv interface{}, ctx context.Context, dec func(i
 		FullMethod: "/hashicorp.vagrant.Vagrant/ListBoxes",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(VagrantServer).ListBoxes(ctx, req.(*empty.Empty))
+		return srv.(VagrantServer).ListBoxes(ctx, req.(*emptypb.Empty))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -1512,7 +1512,7 @@ func (x *vagrantGetJobStreamServer) Send(m *GetJobStreamResponse) error {
 }
 
 func _Vagrant_PruneOldJobs_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(empty.Empty)
+	in := new(emptypb.Empty)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -1524,7 +1524,7 @@ func _Vagrant_PruneOldJobs_Handler(srv interface{}, ctx context.Context, dec fun
 		FullMethod: "/hashicorp.vagrant.Vagrant/PruneOldJobs",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(VagrantServer).PruneOldJobs(ctx, req.(*empty.Empty))
+		return srv.(VagrantServer).PruneOldJobs(ctx, req.(*emptypb.Empty))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -1548,7 +1548,7 @@ func _Vagrant_GetRunner_Handler(srv interface{}, ctx context.Context, dec func(i
 }
 
 func _Vagrant_GetServerConfig_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(empty.Empty)
+	in := new(emptypb.Empty)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -1560,7 +1560,7 @@ func _Vagrant_GetServerConfig_Handler(srv interface{}, ctx context.Context, dec
 		FullMethod: "/hashicorp.vagrant.Vagrant/GetServerConfig",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(VagrantServer).GetServerConfig(ctx, req.(*empty.Empty))
+		return srv.(VagrantServer).GetServerConfig(ctx, req.(*emptypb.Empty))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -1584,7 +1584,7 @@ func _Vagrant_SetServerConfig_Handler(srv interface{}, ctx context.Context, dec
 }
 
 func _Vagrant_CreateSnapshot_Handler(srv interface{}, stream grpc.ServerStream) error {
-	m := new(empty.Empty)
+	m := new(emptypb.Empty)
 	if err := stream.RecvMsg(m); err != nil {
 		return err
 	}
@@ -1609,7 +1609,7 @@ func _Vagrant_RestoreSnapshot_Handler(srv interface{}, stream grpc.ServerStream)
 }
 
 type Vagrant_RestoreSnapshotServer interface {
-	SendAndClose(*empty.Empty) error
+	SendAndClose(*emptypb.Empty) error
 	Recv() (*RestoreSnapshotRequest, error)
 	grpc.ServerStream
 }
@@ -1618,7 +1618,7 @@ type vagrantRestoreSnapshotServer struct {
 	grpc.ServerStream
 }
 
-func (x *vagrantRestoreSnapshotServer) SendAndClose(m *empty.Empty) error {
+func (x *vagrantRestoreSnapshotServer) SendAndClose(m *emptypb.Empty) error {
 	return x.ServerStream.SendMsg(m)
 }
 
@@ -1631,7 +1631,7 @@ func (x *vagrantRestoreSnapshotServer) Recv() (*RestoreSnapshotRequest, error) {
 }
 
 func _Vagrant_BootstrapToken_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(empty.Empty)
+	in := new(emptypb.Empty)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -1643,7 +1643,7 @@ func _Vagrant_BootstrapToken_Handler(srv interface{}, ctx context.Context, dec f
 		FullMethod: "/hashicorp.vagrant.Vagrant/BootstrapToken",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(VagrantServer).BootstrapToken(ctx, req.(*empty.Empty))
+		return srv.(VagrantServer).BootstrapToken(ctx, req.(*emptypb.Empty))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -1667,7 +1667,7 @@ func _Vagrant_GenerateInviteToken_Handler(srv interface{}, ctx context.Context,
 }
 
 func _Vagrant_GenerateLoginToken_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(empty.Empty)
+	in := new(emptypb.Empty)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -1679,7 +1679,7 @@ func _Vagrant_GenerateLoginToken_Handler(srv interface{}, ctx context.Context, d
 		FullMethod: "/hashicorp.vagrant.Vagrant/GenerateLoginToken",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(VagrantServer).GenerateLoginToken(ctx, req.(*empty.Empty))
+		return srv.(VagrantServer).GenerateLoginToken(ctx, req.(*emptypb.Empty))
 	}
 	return interceptor(ctx, in, info, handler)
 }
diff --git a/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_pb.rb b/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_pb.rb
index 0252c365e..1bbd7a138 100644
--- a/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_pb.rb
+++ b/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_pb.rb
@@ -152,6 +152,47 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       optional :network, :string, 2
       optional :addr, :string, 3
     end
+    add_message "hashicorp.vagrant.sdk.Args.Connection" do
+    end
+    add_message "hashicorp.vagrant.sdk.Args.Connection.SSHInfo" do
+      optional :host, :string, 1
+      optional :port, :string, 2
+      optional :private_key_path, :string, 3
+      optional :keys_only, :bool, 4
+      optional :verify_host_key, :bool, 5
+      optional :username, :string, 6
+      optional :remote_user, :string, 7
+      optional :compression, :bool, 8
+      optional :dsa_authentication, :bool, 9
+      optional :config, :string, 10
+      repeated :extra_args, :string, 11
+      optional :forward_agent, :bool, 12
+      optional :forward_x11, :bool, 13
+      repeated :forward_env, :string, 14
+      optional :connect_timeout, :int64, 15
+      optional :ssh_command, :string, 16
+      optional :proxy_command, :string, 17
+    end
+    add_message "hashicorp.vagrant.sdk.Args.Connection.WinrmInfo" do
+      optional :username, :string, 1
+      optional :password, :string, 2
+      optional :host, :string, 3
+      optional :port, :int64, 4
+      optional :guest_port, :int64, 5
+      optional :max_tries, :int64, 6
+      optional :retry_delay, :int64, 7
+      optional :timeout, :int64, 8
+      optional :transport, :enum, 9, "hashicorp.vagrant.sdk.Args.Connection.WinrmInfo.Transport"
+      optional :ssl_peer_verification, :bool, 10
+      optional :execution_time_limit, :string, 11
+      optional :basic_auth_only, :bool, 12
+      optional :codepage, :string, 13
+    end
+    add_enum "hashicorp.vagrant.sdk.Args.Connection.WinrmInfo.Transport" do
+      value :NEGOTIATE, 0
+      value :SSL, 1
+      value :PLAINTEXT, 2
+    end
     add_message "hashicorp.vagrant.sdk.Args.Push" do
       optional :stream_id, :uint32, 1
       optional :network, :string, 2
@@ -181,45 +222,6 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     end
     add_message "hashicorp.vagrant.sdk.Args.Null" do
     end
-    add_message "hashicorp.vagrant.sdk.SSHInfo" do
-      optional :host, :string, 1
-      optional :port, :string, 2
-      optional :private_key_path, :string, 3
-      optional :keys_only, :bool, 4
-      optional :verify_host_key, :bool, 5
-      optional :username, :string, 6
-      optional :remote_user, :string, 7
-      optional :compression, :bool, 8
-      optional :dsa_authentication, :bool, 9
-      optional :config, :string, 10
-      repeated :extra_args, :string, 11
-      optional :forward_agent, :bool, 12
-      optional :forward_x11, :bool, 13
-      repeated :forward_env, :string, 14
-      optional :connect_timeout, :int64, 15
-      optional :ssh_command, :string, 16
-      optional :proxy_command, :string, 17
-    end
-    add_message "hashicorp.vagrant.sdk.WinrmInfo" do
-      optional :username, :string, 1
-      optional :password, :string, 2
-      optional :host, :string, 3
-      optional :port, :int64, 4
-      optional :guest_port, :int64, 5
-      optional :max_tries, :int64, 6
-      optional :retry_delay, :int64, 7
-      optional :timeout, :int64, 8
-      optional :transport, :enum, 9, "hashicorp.vagrant.sdk.WinrmInfo.Transport"
-      optional :ssl_peer_verification, :bool, 10
-      optional :execution_time_limit, :string, 11
-      optional :basic_auth_only, :bool, 12
-      optional :codepage, :string, 13
-    end
-    add_enum "hashicorp.vagrant.sdk.WinrmInfo.Transport" do
-      value :NEGOTIATE, 0
-      value :SSL, 1
-      value :PLAINTEXT, 2
-    end
     add_message "hashicorp.vagrant.sdk.FuncSpec" do
       optional :name, :string, 1
       repeated :args, :message, 2, "hashicorp.vagrant.sdk.FuncSpec.Value"
@@ -878,6 +880,10 @@ module Hashicorp
       Args::Host = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.Host").msgclass
       Args::Guest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.Guest").msgclass
       Args::Communicator = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.Communicator").msgclass
+      Args::Connection = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.Connection").msgclass
+      Args::Connection::SSHInfo = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.Connection.SSHInfo").msgclass
+      Args::Connection::WinrmInfo = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.Connection.WinrmInfo").msgclass
+      Args::Connection::WinrmInfo::Transport = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.Connection.WinrmInfo.Transport").enummodule
       Args::Push = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.Push").msgclass
       Args::SyncedFolder = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.SyncedFolder").msgclass
       Args::TargetIndex = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.TargetIndex").msgclass
@@ -886,9 +892,6 @@ module Hashicorp
       Args::Array = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.Array").msgclass
       Args::Hash = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.Hash").msgclass
       Args::Null = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.Args.Null").msgclass
-      SSHInfo = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.SSHInfo").msgclass
-      WinrmInfo = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.WinrmInfo").msgclass
-      WinrmInfo::Transport = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.WinrmInfo.Transport").enummodule
       FuncSpec = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.FuncSpec").msgclass
       FuncSpec::Value = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.FuncSpec.Value").msgclass
       FuncSpec::Args = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("hashicorp.vagrant.sdk.FuncSpec.Args").msgclass
diff --git a/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_services_pb.rb b/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_services_pb.rb
index cfc7722df..aeef1aaac 100644
--- a/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_services_pb.rb
+++ b/lib/vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_services_pb.rb
@@ -124,7 +124,7 @@ module Hashicorp
           rpc :ActionSpec, ::Hashicorp::Vagrant::Sdk::Provider::ActionRequest, ::Hashicorp::Vagrant::Sdk::FuncSpec
           rpc :MachineIdChanged, ::Hashicorp::Vagrant::Sdk::FuncSpec::Args, ::Google::Protobuf::Empty
           rpc :MachineIdChangedSpec, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::FuncSpec
-          rpc :SshInfo, ::Hashicorp::Vagrant::Sdk::FuncSpec::Args, ::Hashicorp::Vagrant::Sdk::SSHInfo
+          rpc :SshInfo, ::Hashicorp::Vagrant::Sdk::FuncSpec::Args, ::Hashicorp::Vagrant::Sdk::Args::Connection::SSHInfo
           rpc :SshInfoSpec, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::FuncSpec
           rpc :State, ::Hashicorp::Vagrant::Sdk::FuncSpec::Args, ::Hashicorp::Vagrant::Sdk::Args::Target::Machine::State
           rpc :StateSpec, ::Google::Protobuf::Empty, ::Hashicorp::Vagrant::Sdk::FuncSpec