diff --git a/spec/workload/compatibility_spec.cr b/spec/workload/compatibility_spec.cr
index 563c43864..91a7bccc7 100644
--- a/spec/workload/compatibility_spec.cr
+++ b/spec/workload/compatibility_spec.cr
@@ -25,7 +25,8 @@ describe "Compatibility" do
         retries = retries + 1
       end
       Log.info { "Status:  #{result[:output]}" }
-      (/(PASSED).*(CNF compatible with both Calico and Cilium)/ =~ result[:output]).should_not be_nil
+      (/(SKIPPED)).*(cni_compatible test was temporarily disabled due to needed redesign for cnf_to_new_cluster)/ =~ result[:output]).should_not be_nil
+      #(/(PASSED).*(CNF compatible with both Calico and Cilium)/ =~ result[:output]).should_not be_nil
     ensure
       result = ShellCmd.run_testsuite("cnf_cleanup cnf-config=sample-cnfs/sample-coredns-cnf/cnf-testsuite.yml")
       result[:status].success?.should be_true
diff --git a/src/tasks/workload/compatibility.cr b/src/tasks/workload/compatibility.cr
index 849c6492a..ed50a60da 100644
--- a/src/tasks/workload/compatibility.cr
+++ b/src/tasks/workload/compatibility.cr
@@ -526,6 +526,8 @@ end
 desc "CNFs should work with any Certified Kubernetes product and any CNI-compatible network that meet their functionality requirements."
 task "cni_compatible" do |t, args|
   CNFManager::Task.task_runner(args, task: t) do |args, config|
+     # TODO (kosstennbl) adapt cnf_to_new_cluster metod to new installation process. Until then - test is disabled. More info: #2153
+    next CNFManager::TestcaseResult.new(CNFManager::ResultStatus::Skipped, "cni_compatible test was temporarily disabled, check #2153")
     docker_version = DockerClient.version_info()
     if docker_version.installed?
       ensure_kubeconfig!
diff --git a/src/tasks/workload/configuration.cr b/src/tasks/workload/configuration.cr
index 5d793181a..f896d5b44 100644
--- a/src/tasks/workload/configuration.cr
+++ b/src/tasks/workload/configuration.cr
@@ -606,14 +606,19 @@ task "alpha_k8s_apis" do |t, args|
       next CNFManager::TestcaseResult.new(CNFManager::ResultStatus::Skipped, "alpha_k8s_apis not in poc mode")
     end
 
-    ensure_kubeconfig!
+    cluster_name = "apisnooptest"
     kubeconfig_orig = ENV["KUBECONFIG"]
 
+    # TODO (kosstennbl) adapt cnf_to_new_cluster metod to new installation process. Until then - test is disabled. More info: #2153
+    result = CNFManager::TestcaseResult.new(CNFManager::ResultStatus::Skipped, "alpha_k8s_apis test was temporarily disabled, check #2153")
+    next result
+
+    ensure_kubeconfig!
+
     # Get kubernetes version of the current server.
     # This is used to setup kind with same k8s image version.
     k8s_server_version = KubectlClient.server_version
 
-    cluster_name = "apisnooptest"
     # Ensure any old cluster is deleted
     KindManager.new.delete_cluster(cluster_name)
     apisnoop = ApiSnoop.new()
diff --git a/src/tasks/workload/microservice.cr b/src/tasks/workload/microservice.cr
index 5d7086b5f..8df33f8fb 100644
--- a/src/tasks/workload/microservice.cr
+++ b/src/tasks/workload/microservice.cr
@@ -631,8 +631,7 @@ task "service_discovery" do |t, args|
   CNFManager::Task.task_runner(args, task: t) do |args,config|
     # Get all resources for the CNF
     resource_ymls = CNFManager.cnf_workload_resources(args, config) { |resource| resource }
-    deployment_namespace = CNFManager.get_deployment_namespace(config)
-    resources = Helm.workload_resource_kind_names(resource_ymls, default_namespace: deployment_namespace)
+    resources = Helm.workload_resource_kind_names(resource_ymls)
 
     # Collect service names from the CNF resource list
     cnf_service_names = [] of String