The growing penetration of renewable energy sources in electricity systems requires adapting operation models to face the inherent variability and uncertainty of wind or solar generation. In addition, the volatility of fuel prices (such as natural gas) or the uncertainty of the hydraulic natural inflows requires to take into account all these sources of uncertainty within the operation planning of the generation system. Thus, stochastic optimization techniques have been widely used in this context. From the point of view of the system operation, the introduction of wind and solar generation in the mix has forced conventional generators to be subject to more demanding schedules from the technical point of view, increasing for example the number of start-up and shutdown decisions during the week, or having to face more pronounced ramps. From the point of view of the market, all these technical issues are transferred to the market prices that are subject to greater volatility. This thesis focuses on the problem of risk management using the Conditional Value at Risk (CVaR) as a coherent risk measure. The thesis presents a novel iterative method that can be used by a market agent to optimize its operating decisions in the short term when the uncertainty is characterized by a set of random variable scenarios. The thesis analyses how it is possible to decompose the problem of risk management by means of Lagrangian Relaxation techniques and Benders decomposition, and shows that the proposed iterative algorithm (Iterative-CVaR) converges to the same solution as under the direct optimization setting. The algorithm is applied to two typical problems faced by agents: 1) optimization of the operation of a combined cycle power plant (CCGT) that has to cope with the volatility in the spot market price to build the supply curve for the futures market, and 2) strategic unit-commitment model. In a second part of the thesis the problem of market equilibrium is studied to model the interaction between several generating companies with mixed generation portfolios (thermal, hydraulic and renewable). The thesis analyses how the Nash equilibrium solution is modified at different risk-aversion level of the risk of the agents. In particular, the thesis studies how the management of hydroelectric reservoirs ismodified along the annual horizon when agents are risk-averse, and it is compared with the risk-neutral solution that coincides with a centralized planning when the objective is the minimization expected operational cost.