diff --git a/scaleway/scaleway/instance/v1/custom_types.py b/scaleway/scaleway/instance/v1/custom_types.py
index ac9eade2..043e9b3e 100644
--- a/scaleway/scaleway/instance/v1/custom_types.py
+++ b/scaleway/scaleway/instance/v1/custom_types.py
@@ -6,27 +6,27 @@
 
 @dataclass
 class GetServerUserDataRequest:
-    zone: Optional[ScwZone]
-    """
-    Zone of the user data to get
-    """
-
     server_id: str
 
-    key: str
     """
     Key defines the user data key to get
     """
+    key: str
+
+    """
+    Zone of the user data to get
+    """
+    zone: Optional[ScwZone]
 
 
 @dataclass
 class GetAllServerUserDataRequest:
-    zone: Optional[ScwZone]
+    server_id: str
+
     """
     Zone of the user data to get
     """
-
-    server_id: str
+    zone: Optional[ScwZone]
 
 
 @dataclass
@@ -36,11 +36,11 @@ class GetAllServerUserDataResponse:
 
 @dataclass
 class SetAllServerUserDataRequest:
-    zone: Optional[ScwZone]
-    """
-    Zone of the user data to set
-    """
-
     server_id: str
 
     user_data: Dict[str, bytes]
+
+    """
+    Zone of the user data to set
+    """
+    zone: Optional[ScwZone]
diff --git a/scaleway/scaleway/instance/v1/test_user_data.py b/scaleway/scaleway/instance/v1/test_user_data.py
index 8c936208..d2259f9c 100644
--- a/scaleway/scaleway/instance/v1/test_user_data.py
+++ b/scaleway/scaleway/instance/v1/test_user_data.py
@@ -30,7 +30,9 @@ def test_set_and_get_server_user_data(self) -> None:
         self.instance_api.set_server_user_data(
             server_id=self.server.server.id, key=key, content=content
         )
-        user_data = self.instance_api.get_server_user_data(server_id=self.server.server.id, key=key)
+        user_data = self.instance_api.get_server_user_data(
+            server_id=self.server.server.id, key=key
+        )
         self.assertIsNotNone(user_data)
 
     def test_set_and_get_all_user_data(self):
@@ -41,7 +43,15 @@ def test_set_and_get_all_user_data(self):
         another_key = "third key"
         another_content = b"another content to test"
 
-        user_data: Dict[str, bytes] = {key_bis:content_bis, another_key:another_content, key:content}
-        self.instance_api.set_all_server_user_data(server_id=self.server.server.id, user_data=user_data)
-        response = self.instance_api.get_all_server_user_data(server_id=self.server.server.id)
+        user_data: Dict[str, bytes] = {
+            key_bis: content_bis,
+            another_key: another_content,
+            key: content,
+        }
+        self.instance_api.set_all_server_user_data(
+            server_id=self.server.server.id, user_data=user_data
+        )
+        response = self.instance_api.get_all_server_user_data(
+            server_id=self.server.server.id
+        )
         self.assertIsNotNone(response)