diff --git a/common/setup-phase/src/lib.rs b/common/setup-phase/src/lib.rs
index 3c038cf1..9d1dcbfa 100644
--- a/common/setup-phase/src/lib.rs
+++ b/common/setup-phase/src/lib.rs
@@ -4,14 +4,6 @@ multiversx_sc::imports!();
 
 #[multiversx_sc::module]
 pub trait SetupPhaseModule {
-    fn require_setup_complete(&self, caller_shard_id: u32) {
-        require!(
-            self.is_setup_phase_complete(),
-            "The setup is not completed in shard {}",
-            caller_shard_id
-        );
-    }
-
     fn require_caller_initiator(&self) {
         let caller = self.blockchain().get_caller();
         let initiator = self.initiator_address().get();
@@ -19,6 +11,11 @@ pub trait SetupPhaseModule {
         require!(caller == initiator, "Invalid caller");
     }
 
+    #[inline]
+    fn require_setup_complete(&self) {
+        require!(self.is_setup_phase_complete(), "The setup is not completed");
+    }
+
     #[inline]
     fn is_setup_phase_complete(&self) -> bool {
         self.setup_phase_complete().get()
diff --git a/sovereign-forge/src/phases.rs b/sovereign-forge/src/phases.rs
index 2c3ef92e..7122985d 100644
--- a/sovereign-forge/src/phases.rs
+++ b/sovereign-forge/src/phases.rs
@@ -21,6 +21,7 @@ const NUMBER_OF_SHARDS: u32 = 3;
 pub trait PhasesModule:
     common::utils::UtilsModule + common::storage::StorageModule + setup_phase::SetupPhaseModule
 {
+    #[only_owner]
     #[endpoint(completeSetupPhase)]
     fn complete_setup_phase(&self) {
         if !self.is_setup_phase_complete() {
@@ -56,7 +57,7 @@ pub trait PhasesModule:
         let caller = blockchain_api.get_caller();
         let caller_shard_id = blockchain_api.get_shard_of_address(&caller);
 
-        self.require_setup_complete(caller_shard_id);
+        self.require_setup_complete();
 
         let call_value = self.call_value().egld_value();
         self.require_correct_deploy_cost(call_value.deref());