diff --git a/handlers/authorize.go b/handlers/authorize.go
index 9223655..02325d0 100644
--- a/handlers/authorize.go
+++ b/handlers/authorize.go
@@ -69,6 +69,9 @@ func AuthorizeHandler(w http.ResponseWriter, r *http.Request) {
 		ctx.Environment = make(map[string]string)
 	}
 
+	// Set RoleID from claims
+	ctx.RoleID = claims.RoleID
+	log.Print("Set context RoleID to ", ctx.RoleID)
 	// Perform authorization
 	log.Printf("[Handler] Performing authorization check for user=%s, resource=%s, action=%s", ctx.UserID, ctx.Resource, ctx.Action)
 	result, err := services.AuthorizeWithCache(authService, &ctx)