diff --git a/proto/headscale/v1/headscale.proto b/proto/headscale/v1/headscale.proto
index 207b4ddd..af3bd8b9 100644
--- a/proto/headscale/v1/headscale.proto
+++ b/proto/headscale/v1/headscale.proto
@@ -81,9 +81,9 @@ service HeadscaleService {
         };
     }
 
-    rpc UpdateMachine(UpdateMachineRequest) returns (UpdateMachineResponse) {
+    rpc SetTags(SetTagsRequest) returns (SetTagsResponse) {
         option (google.api.http) = {
-            post: "/api/v1/machine/{machine.id}"
+            post: "/api/v1/machine/{machine_id}/tags"
             body: "*"
         };
     }
diff --git a/proto/headscale/v1/machine.proto b/proto/headscale/v1/machine.proto
index 86564112..0e5d75ab 100644
--- a/proto/headscale/v1/machine.proto
+++ b/proto/headscale/v1/machine.proto
@@ -62,11 +62,12 @@ message GetMachineResponse {
     Machine machine = 1;
 }
 
-message UpdateMachineRequest {
-    Machine machine = 1;
+message SetTagsRequest {
+    uint64 machine_id = 1;
+    repeated string tags = 2;
 }
 
-message UpdateMachineResponse {
+message SetTagsResponse {
     Machine machine = 1;
 }