diff --git a/packages/contracts-core/contracts/Destination.sol b/packages/contracts-core/contracts/Destination.sol
index 8b81dd599c..8089ca7ebb 100644
--- a/packages/contracts-core/contracts/Destination.sol
+++ b/packages/contracts-core/contracts/Destination.sol
@@ -68,7 +68,7 @@ contract Destination is ExecutionHub, DestinationEvents, InterfaceDestination {
     /// - msg.sender is set as contract owner
     function initialize(bytes32 agentRoot) external initializer {
         // Initialize Ownable: msg.sender is set as "owner"
-        __Ownable_init();
+        __Ownable2Step_init();
         // Initialize ReeentrancyGuard
         __ReentrancyGuard_init();
         // Set Agent Merkle Root in Light Manager
diff --git a/packages/contracts-core/contracts/GasOracle.sol b/packages/contracts-core/contracts/GasOracle.sol
index da31a99aa6..f3469d44aa 100644
--- a/packages/contracts-core/contracts/GasOracle.sol
+++ b/packages/contracts-core/contracts/GasOracle.sol
@@ -60,7 +60,7 @@ contract GasOracle is MessagingBase, GasOracleEvents, InterfaceGasOracle {
     /// - msg.sender is set as contract owner
     function initialize() external initializer {
         // Initialize Ownable: msg.sender is set as "owner"
-        __Ownable_init();
+        __Ownable2Step_init();
     }
 
     /// @notice MVP function to set the gas data for the given domain.
diff --git a/packages/contracts-core/contracts/Origin.sol b/packages/contracts-core/contracts/Origin.sol
index 5a8f828aa0..d173a92379 100644
--- a/packages/contracts-core/contracts/Origin.sol
+++ b/packages/contracts-core/contracts/Origin.sol
@@ -49,7 +49,7 @@ contract Origin is StateHub, OriginEvents, InterfaceOrigin {
     /// - State of "empty merkle tree" is saved
     function initialize() external initializer {
         // Initialize Ownable: msg.sender is set as "owner"
-        __Ownable_init();
+        __Ownable2Step_init();
         // Initialize "states": state of an "empty merkle tree" is saved
         _initializeStates();
     }
diff --git a/packages/contracts-core/contracts/Summit.sol b/packages/contracts-core/contracts/Summit.sol
index 893010814d..f13dbcb363 100644
--- a/packages/contracts-core/contracts/Summit.sol
+++ b/packages/contracts-core/contracts/Summit.sol
@@ -93,7 +93,7 @@ contract Summit is SnapshotHub, SummitEvents, InterfaceSummit {
 
     function initialize() external initializer {
         // Initialize Ownable: msg.sender is set as "owner"
-        __Ownable_init();
+        __Ownable2Step_init();
         _initializeAttestations();
     }
 
diff --git a/packages/contracts-core/contracts/base/MessagingBase.sol b/packages/contracts-core/contracts/base/MessagingBase.sol
index a5f9dee76a..b0785c1075 100644
--- a/packages/contracts-core/contracts/base/MessagingBase.sol
+++ b/packages/contracts-core/contracts/base/MessagingBase.sol
@@ -5,7 +5,7 @@ pragma solidity 0.8.17;
 import {MultiCallable} from "./MultiCallable.sol";
 import {Versioned} from "./Version.sol";
 // ═════════════════════════════ EXTERNAL IMPORTS ══════════════════════════════
-import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
+import {Ownable2StepUpgradeable} from "@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol";
 
 /**
  * @notice Base contract for all messaging contracts.
@@ -13,7 +13,7 @@ import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/Own
  * - Provides ownership functionality.
  * - Will be providing pausing functionality when it is implemented.
  */
-abstract contract MessagingBase is MultiCallable, Versioned, OwnableUpgradeable {
+abstract contract MessagingBase is MultiCallable, Versioned, Ownable2StepUpgradeable {
     // ════════════════════════════════════════════════ IMMUTABLES ═════════════════════════════════════════════════════
 
     /// @notice Domain of the local chain, set once upon contract creation
diff --git a/packages/contracts-core/contracts/inbox/StatementInbox.sol b/packages/contracts-core/contracts/inbox/StatementInbox.sol
index 3a1cc18af1..776c64d567 100644
--- a/packages/contracts-core/contracts/inbox/StatementInbox.sol
+++ b/packages/contracts-core/contracts/inbox/StatementInbox.sol
@@ -71,7 +71,7 @@ abstract contract StatementInbox is MessagingBase, StatementInboxEvents, IStatem
         agentManager = agentManager_;
         origin = origin_;
         destination = destination_;
-        __Ownable_init();
+        __Ownable2Step_init();
     }
 
     // ══════════════════════════════════════════ SUBMIT AGENT STATEMENTS ══════════════════════════════════════════════
diff --git a/packages/contracts-core/contracts/manager/BondingManager.sol b/packages/contracts-core/contracts/manager/BondingManager.sol
index dbf9655989..15b0b90339 100644
--- a/packages/contracts-core/contracts/manager/BondingManager.sol
+++ b/packages/contracts-core/contracts/manager/BondingManager.sol
@@ -66,7 +66,7 @@ contract BondingManager is AgentManager, InterfaceBondingManager {
     function initialize(address origin_, address destination_, address inbox_, address summit_) external initializer {
         __AgentManager_init(origin_, destination_, inbox_);
         summit = summit_;
-        __Ownable_init();
+        __Ownable2Step_init();
         // Insert a zero address to make indexes for Agents start from 1.
         // Zeroed index is supposed to be used as a sentinel value meaning "no agent".
         _agents.push(address(0));
diff --git a/packages/contracts-core/contracts/manager/LightManager.sol b/packages/contracts-core/contracts/manager/LightManager.sol
index cf3d36a8bf..2bb20a6fd9 100644
--- a/packages/contracts-core/contracts/manager/LightManager.sol
+++ b/packages/contracts-core/contracts/manager/LightManager.sol
@@ -50,7 +50,7 @@ contract LightManager is AgentManager, InterfaceLightManager {
 
     function initialize(address origin_, address destination_, address inbox_) external initializer {
         __AgentManager_init(origin_, destination_, inbox_);
-        __Ownable_init();
+        __Ownable2Step_init();
     }
 
     // ═══════════════════════════════════════════════ AGENTS LOGIC ════════════════════════════════════════════════════