diff --git a/src/main/java/com/klaroworks/runtime/controller/RoleMatrixController.java b/src/main/java/com/klaroworks/runtime/controller/RoleMatrixController.java
new file mode 100644
index 0000000..c6580c3
--- /dev/null
+++ b/src/main/java/com/klaroworks/runtime/controller/RoleMatrixController.java
@@ -0,0 +1,50 @@
+package com.klaroworks.runtime.controller;
+
+import com.klaroworks.runtime.dto.ApiResponse;
+import com.klaroworks.runtime.dto.RoleCreateRequest;
+import com.klaroworks.runtime.dto.RoleResponse;
+import com.klaroworks.runtime.service.RoleMatrixService;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/v1/roles")
+@RequiredArgsConstructor
+public class RoleMatrixController {
+    
+    private final RoleMatrixService roleMatrixService;
+    
+    @PostMapping
+    public ResponseEntity<ApiResponse<RoleResponse>> createRole(
+            @Valid @RequestBody RoleCreateRequest request) {
+        return ResponseEntity.status(HttpStatus.CREATED)
+                .body(ApiResponse.success(roleMatrixService.createRole(request)));
+    }
+    
+    @GetMapping("/{id}")
+    public ResponseEntity<ApiResponse<RoleResponse>> getRoleById(@PathVariable Long id) {
+        return ResponseEntity.ok(ApiResponse.success(roleMatrixService.getRoleById(id)));
+    }
+    
+    @GetMapping
+    public ResponseEntity<ApiResponse<List<RoleResponse>>> getAllRoles() {
+        return ResponseEntity.ok(ApiResponse.success(roleMatrixService.getAllRoles()));
+    }
+    
+    @PutMapping("/{id}")
+    public ResponseEntity<ApiResponse<RoleResponse>> updateRole(
+            @PathVariable Long id,
+            @Valid @RequestBody RoleCreateRequest request) {
+        return ResponseEntity.ok(ApiResponse.success(roleMatrixService.updateRole(id, request)));
+    }
+    
+    @DeleteMapping("/{id}")
+    public ResponseEntity<Void> deleteRole(@PathVariable Long id) {
+        roleMatrixService.deleteRole(id);
+        return ResponseEntity.noContent().build();
+    }
+}