diff --git a/contracts/feature-tests/abi-tester/src/abi_proxy.rs b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
index 2011970429..77604821e3 100644
--- a/contracts/feature-tests/abi-tester/src/abi_proxy.rs
+++ b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
@@ -397,33 +397,6 @@ where
             .raw_call("payable_any_token")
             .original_result()
     }
-
-    pub fn external_view(
-        self,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("external_view")
-            .original_result()
-    }
-
-    pub fn label_a(
-        self,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("label_a")
-            .original_result()
-    }
-
-    pub fn label_b(
-        self,
-    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_call("label_b")
-            .original_result()
-    }
 }
 
 #[type_abi]
diff --git a/contracts/feature-tests/composability/forwarder/src/forwarder_main.rs b/contracts/feature-tests/composability/forwarder/src/forwarder_main.rs
index cd2254587c..c6e9dcb443 100644
--- a/contracts/feature-tests/composability/forwarder/src/forwarder_main.rs
+++ b/contracts/feature-tests/composability/forwarder/src/forwarder_main.rs
@@ -14,6 +14,7 @@ pub mod fwd_sft;
 pub mod fwd_storage;
 pub mod fwd_upgrade;
 pub mod vault_proxy;
+pub mod vault_upgrade_proxy;
 
 multiversx_sc::imports!();
 
diff --git a/contracts/feature-tests/composability/forwarder/src/fwd_upgrade.rs b/contracts/feature-tests/composability/forwarder/src/fwd_upgrade.rs
index f4782821e0..11ef0b1a39 100644
--- a/contracts/feature-tests/composability/forwarder/src/fwd_upgrade.rs
+++ b/contracts/feature-tests/composability/forwarder/src/fwd_upgrade.rs
@@ -1,4 +1,4 @@
-use crate::vault_proxy;
+use crate::vault_upgrade_proxy;
 
 multiversx_sc::imports!();
 
@@ -13,7 +13,7 @@ pub trait UpgradeContractModule {
     ) {
         self.tx()
             .to(child_sc_address)
-            .typed(vault_proxy::VaultProxy)
+            .typed(vault_upgrade_proxy::VaultProxy)
             .upgrade(opt_arg)
             .code(new_code)
             .code_metadata(CodeMetadata::UPGRADEABLE)
@@ -29,7 +29,7 @@ pub trait UpgradeContractModule {
     ) {
         self.tx()
             .to(child_sc_address)
-            .typed(vault_proxy::VaultProxy)
+            .typed(vault_upgrade_proxy::VaultProxy)
             .upgrade(opt_arg)
             .code_metadata(CodeMetadata::UPGRADEABLE)
             .from_source(source_address)
diff --git a/contracts/feature-tests/composability/forwarder/src/vault_proxy.rs b/contracts/feature-tests/composability/forwarder/src/vault_proxy.rs
index 24e6f12e69..7f653bfa45 100644
--- a/contracts/feature-tests/composability/forwarder/src/vault_proxy.rs
+++ b/contracts/feature-tests/composability/forwarder/src/vault_proxy.rs
@@ -57,29 +57,6 @@ where
     }
 }
 
-#[rustfmt::skip]
-impl<Env, From, To, Gas> VaultProxyMethods<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-    pub fn upgrade<
-        Arg0: ProxyArg<OptionalValue<ManagedBuffer<Env::Api>>>,
-    >(
-        self,
-        opt_arg_to_echo: Arg0,
-    ) -> TxTypedUpgrade<Env, From, To, NotPayable, Gas, MultiValue2<&'static str, OptionalValue<ManagedBuffer<Env::Api>>>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_upgrade()
-            .argument(&opt_arg_to_echo)
-            .original_result()
-    }
-}
-
 #[rustfmt::skip]
 impl<Env, From, To, Gas> VaultProxyMethods<Env, From, To, Gas>
 where
@@ -174,21 +151,6 @@ where
             .original_result()
     }
 
-    pub fn retrieve_funds_promises<
-        Arg0: ProxyArg<OptionalValue<u64>>,
-        Arg1: ProxyArg<OptionalValue<BigUint<Env::Api>>>,
-    >(
-        self,
-        back_transfers: Arg0,
-        back_transfer_value: Arg1,
-    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
-        self.wrapped_tx
-            .raw_call("retrieve_funds_promises")
-            .argument(&back_transfers)
-            .argument(&back_transfer_value)
-            .original_result()
-    }
-
     pub fn retrieve_funds<
         Arg0: ProxyArg<EgldOrEsdtTokenIdentifier<Env::Api>>,
         Arg1: ProxyArg<u64>,
diff --git a/contracts/feature-tests/composability/forwarder/src/vault_upgrade_proxy.rs b/contracts/feature-tests/composability/forwarder/src/vault_upgrade_proxy.rs
new file mode 100644
index 0000000000..ee2a10a78f
--- /dev/null
+++ b/contracts/feature-tests/composability/forwarder/src/vault_upgrade_proxy.rs
@@ -0,0 +1,59 @@
+// Code generated by the multiversx-sc proxy generator. DO NOT EDIT.
+
+////////////////////////////////////////////////////
+////////////////// AUTO-GENERATED //////////////////
+////////////////////////////////////////////////////
+
+#![allow(dead_code)]
+#![allow(clippy::all)]
+
+use multiversx_sc::proxy_imports::*;
+
+pub struct VaultProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for VaultProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = VaultProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        VaultProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct VaultProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> VaultProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    pub fn upgrade<
+        Arg0: ProxyArg<OptionalValue<ManagedBuffer<Env::Api>>>,
+    >(
+        self,
+        opt_arg_to_echo: Arg0,
+    ) -> TxTypedUpgrade<Env, From, To, NotPayable, Gas, MultiValue2<&'static str, OptionalValue<ManagedBuffer<Env::Api>>>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_upgrade()
+            .argument(&opt_arg_to_echo)
+            .original_result()
+    }
+}
diff --git a/contracts/feature-tests/composability/interact/src/vault_proxy.rs b/contracts/feature-tests/composability/interact/src/vault_proxy.rs
index 24e6f12e69..7f653bfa45 100644
--- a/contracts/feature-tests/composability/interact/src/vault_proxy.rs
+++ b/contracts/feature-tests/composability/interact/src/vault_proxy.rs
@@ -57,29 +57,6 @@ where
     }
 }
 
-#[rustfmt::skip]
-impl<Env, From, To, Gas> VaultProxyMethods<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-    pub fn upgrade<
-        Arg0: ProxyArg<OptionalValue<ManagedBuffer<Env::Api>>>,
-    >(
-        self,
-        opt_arg_to_echo: Arg0,
-    ) -> TxTypedUpgrade<Env, From, To, NotPayable, Gas, MultiValue2<&'static str, OptionalValue<ManagedBuffer<Env::Api>>>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_upgrade()
-            .argument(&opt_arg_to_echo)
-            .original_result()
-    }
-}
-
 #[rustfmt::skip]
 impl<Env, From, To, Gas> VaultProxyMethods<Env, From, To, Gas>
 where
@@ -174,21 +151,6 @@ where
             .original_result()
     }
 
-    pub fn retrieve_funds_promises<
-        Arg0: ProxyArg<OptionalValue<u64>>,
-        Arg1: ProxyArg<OptionalValue<BigUint<Env::Api>>>,
-    >(
-        self,
-        back_transfers: Arg0,
-        back_transfer_value: Arg1,
-    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
-        self.wrapped_tx
-            .raw_call("retrieve_funds_promises")
-            .argument(&back_transfers)
-            .argument(&back_transfer_value)
-            .original_result()
-    }
-
     pub fn retrieve_funds<
         Arg0: ProxyArg<EgldOrEsdtTokenIdentifier<Env::Api>>,
         Arg1: ProxyArg<u64>,
diff --git a/contracts/feature-tests/composability/promises-features/src/vault_proxy.rs b/contracts/feature-tests/composability/promises-features/src/vault_proxy.rs
index 24e6f12e69..7f653bfa45 100644
--- a/contracts/feature-tests/composability/promises-features/src/vault_proxy.rs
+++ b/contracts/feature-tests/composability/promises-features/src/vault_proxy.rs
@@ -57,29 +57,6 @@ where
     }
 }
 
-#[rustfmt::skip]
-impl<Env, From, To, Gas> VaultProxyMethods<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-    pub fn upgrade<
-        Arg0: ProxyArg<OptionalValue<ManagedBuffer<Env::Api>>>,
-    >(
-        self,
-        opt_arg_to_echo: Arg0,
-    ) -> TxTypedUpgrade<Env, From, To, NotPayable, Gas, MultiValue2<&'static str, OptionalValue<ManagedBuffer<Env::Api>>>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_upgrade()
-            .argument(&opt_arg_to_echo)
-            .original_result()
-    }
-}
-
 #[rustfmt::skip]
 impl<Env, From, To, Gas> VaultProxyMethods<Env, From, To, Gas>
 where
@@ -174,21 +151,6 @@ where
             .original_result()
     }
 
-    pub fn retrieve_funds_promises<
-        Arg0: ProxyArg<OptionalValue<u64>>,
-        Arg1: ProxyArg<OptionalValue<BigUint<Env::Api>>>,
-    >(
-        self,
-        back_transfers: Arg0,
-        back_transfer_value: Arg1,
-    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
-        self.wrapped_tx
-            .raw_call("retrieve_funds_promises")
-            .argument(&back_transfers)
-            .argument(&back_transfer_value)
-            .original_result()
-    }
-
     pub fn retrieve_funds<
         Arg0: ProxyArg<EgldOrEsdtTokenIdentifier<Env::Api>>,
         Arg1: ProxyArg<u64>,
diff --git a/contracts/feature-tests/composability/recursive-caller/src/vault_proxy.rs b/contracts/feature-tests/composability/recursive-caller/src/vault_proxy.rs
index 24e6f12e69..7f653bfa45 100644
--- a/contracts/feature-tests/composability/recursive-caller/src/vault_proxy.rs
+++ b/contracts/feature-tests/composability/recursive-caller/src/vault_proxy.rs
@@ -57,29 +57,6 @@ where
     }
 }
 
-#[rustfmt::skip]
-impl<Env, From, To, Gas> VaultProxyMethods<Env, From, To, Gas>
-where
-    Env: TxEnv,
-    Env::Api: VMApi,
-    From: TxFrom<Env>,
-    To: TxTo<Env>,
-    Gas: TxGas<Env>,
-{
-    pub fn upgrade<
-        Arg0: ProxyArg<OptionalValue<ManagedBuffer<Env::Api>>>,
-    >(
-        self,
-        opt_arg_to_echo: Arg0,
-    ) -> TxTypedUpgrade<Env, From, To, NotPayable, Gas, MultiValue2<&'static str, OptionalValue<ManagedBuffer<Env::Api>>>> {
-        self.wrapped_tx
-            .payment(NotPayable)
-            .raw_upgrade()
-            .argument(&opt_arg_to_echo)
-            .original_result()
-    }
-}
-
 #[rustfmt::skip]
 impl<Env, From, To, Gas> VaultProxyMethods<Env, From, To, Gas>
 where
@@ -174,21 +151,6 @@ where
             .original_result()
     }
 
-    pub fn retrieve_funds_promises<
-        Arg0: ProxyArg<OptionalValue<u64>>,
-        Arg1: ProxyArg<OptionalValue<BigUint<Env::Api>>>,
-    >(
-        self,
-        back_transfers: Arg0,
-        back_transfer_value: Arg1,
-    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
-        self.wrapped_tx
-            .raw_call("retrieve_funds_promises")
-            .argument(&back_transfers)
-            .argument(&back_transfer_value)
-            .original_result()
-    }
-
     pub fn retrieve_funds<
         Arg0: ProxyArg<EgldOrEsdtTokenIdentifier<Env::Api>>,
         Arg1: ProxyArg<u64>,
diff --git a/contracts/feature-tests/composability/vault/sc-config.toml b/contracts/feature-tests/composability/vault/sc-config.toml
index 5a76bc3096..51d609dbbd 100644
--- a/contracts/feature-tests/composability/vault/sc-config.toml
+++ b/contracts/feature-tests/composability/vault/sc-config.toml
@@ -19,6 +19,11 @@ add-labels = ["upgrade"]
 [[proxy]]
 path = "../forwarder/src/vault_proxy.rs"
 
+[[proxy]]
+path = "../forwarder/src/vault_upgrade_proxy.rs"
+add-unlabelled = false
+add-labels = ["upgrade"]
+
 [[proxy]]
 path = "../promises-features/src/vault_proxy.rs"