diff --git a/internal/controller/cloud-control/iprange_aws_test.go b/internal/controller/cloud-control/iprange_aws_test.go
index 27de780a1..60377435e 100644
--- a/internal/controller/cloud-control/iprange_aws_test.go
+++ b/internal/controller/cloud-control/iprange_aws_test.go
@@ -65,7 +65,7 @@ var _ = Describe("Feature: KCP IpRange", func() {
 			Eventually(CreateKcpIpRange).
 				WithArguments(infra.Ctx(), infra.KCP().Client(), iprange,
 					WithName(iprangeName),
-					WithKcpIpRangeRemoteRef("skr-namespace", "skr-aws-ip-range"),
+					WithKcpIpRangeRemoteRef("skr-aws-ip-range"),
 					WithKcpIpRangeSpecScope(kymaName),
 					WithKcpIpRangeSpecCidr(iprangeCidr),
 				).
@@ -190,7 +190,7 @@ var _ = Describe("Feature: KCP IpRange", func() {
 			Eventually(CreateKcpIpRange).
 				WithArguments(infra.Ctx(), infra.KCP().Client(), iprange,
 					WithName(iprangeName),
-					WithKcpIpRangeRemoteRef("skr-namespace", "skr-aws-ip-range"),
+					WithKcpIpRangeRemoteRef("skr-aws-ip-range"),
 					WithKcpIpRangeSpecScope(kymaName),
 					WithKcpIpRangeSpecCidr(iprangeCidr),
 				).
@@ -300,7 +300,7 @@ var _ = Describe("Feature: KCP IpRange", func() {
 			Eventually(CreateKcpIpRange).
 				WithArguments(infra.Ctx(), infra.KCP().Client(), iprange,
 					WithName(iprangeName),
-					WithKcpIpRangeRemoteRef("skr-namespace", iprangeName),
+					WithKcpIpRangeRemoteRef(iprangeName),
 					WithKcpIpRangeSpecScope(kymaName),
 				).
 				Should(Succeed())
diff --git a/internal/controller/cloud-control/iprange_gcp_test.go b/internal/controller/cloud-control/iprange_gcp_test.go
index c9d43bdbc..ad1bb6c64 100644
--- a/internal/controller/cloud-control/iprange_gcp_test.go
+++ b/internal/controller/cloud-control/iprange_gcp_test.go
@@ -120,7 +120,7 @@ var _ = Describe("Feature: KCP IpRange for GCP", func() {
 				infra.Ctx(), infra.KCP().Client(), iprange,
 				WithName("gcp-ip-range"),
 				WithNamespace(infra.KCP().Namespace()),
-				WithKcpIpRangeRemoteRef("skr-namespace", "skr-ip-range"),
+				WithKcpIpRangeRemoteRef("skr-ip-range"),
 				WithKcpIpRangeSpecScope(kymaName),
 				WithKcpIpRangeSpecCidr("10.20.30.0/24"),
 			).
diff --git a/pkg/common/actions/focal/loadScopeFromRef.go b/pkg/common/actions/focal/loadScopeFromRef.go
index 5f5bd2b23..3fa8c0753 100644
--- a/pkg/common/actions/focal/loadScopeFromRef.go
+++ b/pkg/common/actions/focal/loadScopeFromRef.go
@@ -19,7 +19,12 @@ func loadScopeFromRef(ctx context.Context, st composed.State) (error, context.Co
 		"scopeNamespace", state.ObjAsCommonObj().GetNamespace(),
 	)
 	ctx = composed.LoggerIntoCtx(ctx, logger)
-	logger.Info("Loading Scope from reference")
+	logger.
+		WithValues(
+			"scopeName", state.ObjAsCommonObj().ScopeRef().Name,
+			"scopeNamespace", state.ObjAsCommonObj().GetNamespace(),
+		).
+		Info("Loading Scope from reference")
 
 	scope := &cloudcontrolv1beta1.Scope{}
 	err := state.Cluster().K8sClient().Get(ctx, types.NamespacedName{
diff --git a/pkg/testinfra/dsl/awsIpRange.go b/pkg/testinfra/dsl/awsIpRange.go
index 4040e4aca..53a821227 100644
--- a/pkg/testinfra/dsl/awsIpRange.go
+++ b/pkg/testinfra/dsl/awsIpRange.go
@@ -23,7 +23,7 @@ func CreateAwsIpRangeWithSubnets(ctx context.Context, infra testinfra.Infra, ipr
 
 	err := CreateKcpIpRange(ctx, infra.KCP().Client(), iprange,
 		WithName(name),
-		WithKcpIpRangeRemoteRef(name, name),
+		WithKcpIpRangeRemoteRef(name),
 		WithKcpIpRangeSpecScope(name),
 		WithKcpIpRangeSpecCidr(iprangeCidr),
 	)
diff --git a/pkg/testinfra/dsl/kcpIpRange.go b/pkg/testinfra/dsl/kcpIpRange.go
index ed394ea3a..5899988ec 100644
--- a/pkg/testinfra/dsl/kcpIpRange.go
+++ b/pkg/testinfra/dsl/kcpIpRange.go
@@ -115,13 +115,10 @@ func WithKcpIpRangeSpecScope(scopeName string) ObjAction {
 	}
 }
 
-func WithKcpIpRangeRemoteRef(ns, name string) ObjAction {
+func WithKcpIpRangeRemoteRef(name string) ObjAction {
 	return &objAction{
 		f: func(obj client.Object) {
 			x := obj.(*cloudcontrolv1beta1.IpRange)
-			if x.Spec.RemoteRef.Namespace == "" {
-				x.Spec.RemoteRef.Namespace = ns
-			}
 			if x.Spec.RemoteRef.Name == "" {
 				x.Spec.RemoteRef.Name = name
 			}
diff --git a/tools/scripts/kcp/listSkrs.mjs b/tools/scripts/kcp/listSkrs.mjs
index 2aebbe6d4..cb73509e2 100755
--- a/tools/scripts/kcp/listSkrs.mjs
+++ b/tools/scripts/kcp/listSkrs.mjs
@@ -1,6 +1,6 @@
 #!/usr/bin/env zx
 
-const argv = minimist(process.argv.slice(2), {
+const argv = minimist(process.argv.slice(3), {
     alias: {
         a: "all",
         o: "output",
diff --git a/tools/scripts/taskrun/moduleDisable.mjs b/tools/scripts/taskrun/moduleDisable.mjs
new file mode 100755
index 000000000..603191c03
--- /dev/null
+++ b/tools/scripts/taskrun/moduleDisable.mjs
@@ -0,0 +1,14 @@
+#!/usr/bin/env zx
+
+let out
+
+
+out = await $`kubectl get -n kyma-system kyma default -o json | jq '.spec.modules | map(.name == "cloud-manager") | index(true)'`
+const idx = `${out.stdout}`.trim()
+
+console.log("CM Index: ", idx);
+
+
+out = await $`kubectl patch -n kyma-system kyma default --type=json -p="[{'op': 'remove', 'path': '/spec/modules/${idx}'}]"`
+console.log(out.stdout);
+