diff --git a/OliveTin.proto b/OliveTin.proto
index 0444837..f3979ad 100644
--- a/OliveTin.proto
+++ b/OliveTin.proto
@@ -78,6 +78,8 @@ message StartActionResponse {
 
 message StartActionAndWaitRequest {
 	string action_id = 1;
+
+	repeated StartActionArgument arguments = 2;
 }
 
 message StartActionAndWaitResponse {
diff --git a/internal/grpcapi/grpcApi.go b/internal/grpcapi/grpcApi.go
index 9668d59..940a89d 100644
--- a/internal/grpcapi/grpcApi.go
+++ b/internal/grpcapi/grpcApi.go
@@ -134,6 +134,10 @@ func (api *oliveTinAPI) LocalUserLogin(ctx ctx.Context, req *pb.LocalUserLoginRe
 func (api *oliveTinAPI) StartActionAndWait(ctx ctx.Context, req *pb.StartActionAndWaitRequest) (*pb.StartActionAndWaitResponse, error) {
 	args := make(map[string]string)
 
+	for _, arg := range req.Arguments {
+		args[arg.Name] = arg.Value
+	}
+
 	execReq := executor.ExecutionRequest{
 		Action:            api.executor.FindActionBindingByID(req.ActionId),
 		TrackingID:        uuid.NewString(),