diff --git a/src/api/machine_api.py b/src/api/machine_api.py
index 2bba152..d70c191 100644
--- a/src/api/machine_api.py
+++ b/src/api/machine_api.py
@@ -13,7 +13,7 @@ def create_machine(self, machine_name: str, machine_type: str) -> Dict[str, str]
             "machine_name": machine_name,
             "machine_type": machine_type,
         }
-        response = self.client.post("machine", data=data)
+        response = self.client.post("machine/fpga", data=data)
         return response
 
     @handle_api_errors
@@ -22,16 +22,16 @@ def list_user_machines(self):
 
     @handle_api_errors
     def get_machine(self, machine_id: str):
-        return self.client.get(f"machines/{machine_id}")
+        return self.client.get(f"machine/{machine_id}")
 
     @handle_api_errors
     def start_machine(self, machine_id: str):
-        return self.client.post(f"machines/start/{machine_id}")
+        return self.client.post(f"machine/start/{machine_id}")
 
     @handle_api_errors
     def stop_machine(self, machine_id: str):
-        return self.client.post(f"machines/stop/{machine_id}")
+        return self.client.post(f"machine/stop/{machine_id}")
 
     @handle_api_errors
     def terminate_machine(self, machine_id: str):
-        return self.client.delete(f"machines/{machine_id}")
+        return self.client.delete(f"machine/{machine_id}")
diff --git a/test/api/test_machine_api.py b/test/api/test_machine_api.py
index 6339d4f..299bf1a 100644
--- a/test/api/test_machine_api.py
+++ b/test/api/test_machine_api.py
@@ -15,7 +15,8 @@ def test_create_machine(self, mock_post):
         response = self.api.create_machine("test_machine", "type_a")
         self.assertEqual(response, {"success": True, "data": {"status": "success"}})
         mock_post.assert_called_with(
-            "machine", data={"machine_name": "test_machine", "machine_type": "type_a"}
+            "machine/fpga",
+            data={"machine_name": "test_machine", "machine_type": "type_a"},
         )
 
     @patch.object(APIClient, "get")
@@ -30,25 +31,25 @@ def test_get_machine(self, mock_get):
         mock_get.return_value = {"machine_id": "123"}
         response = self.api.get_machine("123")
         self.assertEqual(response, {"success": True, "data": {"machine_id": "123"}})
-        mock_get.assert_called_with("machines/123")
+        mock_get.assert_called_with("machine/123")
 
     @patch.object(APIClient, "post")
     def test_start_machine(self, mock_post):
         mock_post.return_value = {"status": "started"}
         response = self.api.start_machine("123")
         self.assertEqual(response, {"success": True, "data": {"status": "started"}})
-        mock_post.assert_called_with("machines/start/123")
+        mock_post.assert_called_with("machine/start/123")
 
     @patch.object(APIClient, "post")
     def test_stop_machine(self, mock_post):
         mock_post.return_value = {"status": "stopped"}
         response = self.api.stop_machine("123")
         self.assertEqual(response, {"success": True, "data": {"status": "stopped"}})
-        mock_post.assert_called_with("machines/stop/123")
+        mock_post.assert_called_with("machine/stop/123")
 
     @patch.object(APIClient, "delete")
     def test_terminate_machine(self, mock_delete):
         mock_delete.return_value = {"status": "terminated"}
         response = self.api.terminate_machine("123")
         self.assertEqual(response, {"success": True, "data": {"status": "terminated"}})
-        mock_delete.assert_called_with("machines/123")
+        mock_delete.assert_called_with("machine/123")