diff --git a/controllers/btpoperator_controller.go b/controllers/btpoperator_controller.go
index 9679a8d94..eb0b34844 100644
--- a/controllers/btpoperator_controller.go
+++ b/controllers/btpoperator_controller.go
@@ -2078,7 +2078,7 @@ func (r *BtpOperatorReconciler) handleSapBtpManagerChange(ctx context.Context, l
 	clusterIdUnstructured, err := runtime.DefaultUnstructuredConverter.ToUnstructured(clusterIdSecret)
 	clusterIdUnstructuredObj := &unstructured.Unstructured{Object: clusterIdUnstructured}
 	if err != nil {
-		return fmt.Errorf("failed to secret: %s in %s to unstructred : %s \n", sapBtpSecret.GetName(), sapBtpSecret.GetNamespace(), err.Error())
+		return fmt.Errorf("failed to secret: %s in %s to unstructred : %s \n", clusterIdSecret.GetName(), clusterIdSecret.GetNamespace(), err.Error())
 	}
 
 	synced, err := r.getDependedResourcesForSecretChange(ctx, clusterIdUnstructuredObj, sapBtpSecret, configMap, logger)
@@ -2100,6 +2100,7 @@ func (r *BtpOperatorReconciler) handleSapBtpManagerChange(ctx context.Context, l
 	if err != nil {
 		return err
 	}
+	logger.Info("deployment restarted")
 
 	synced, err = r.getDependedResourcesForSecretChange(ctx, clusterIdUnstructuredObj, sapBtpSecret, configMap, logger)
 	if err != nil {
@@ -2132,7 +2133,7 @@ func (r *BtpOperatorReconciler) getDependedResourcesForSecretChange(ctx context.
 		return false, fmt.Errorf("failed to get secret %s in %s : %s \n", sapBtpSecret.GetName(), sapBtpSecret.GetNamespace(), err.Error())
 	}
 
-	err = r.Get(context.Background(), client.ObjectKey{Name: btpServiceOperatorConfigMap, Namespace: ChartNamespace}, configMap)
+	err = r.Get(ctx, client.ObjectKey{Name: btpServiceOperatorConfigMap, Namespace: ChartNamespace}, configMap)
 	if err != nil {
 		return false, fmt.Errorf("failed to get configmap %s in %s : %s \n", configMap.GetName(), configMap.GetNamespace(), err.Error())
 	}
diff --git a/controllers/suite_test.go b/controllers/suite_test.go
index da2c3c799..838811df8 100644
--- a/controllers/suite_test.go
+++ b/controllers/suite_test.go
@@ -19,6 +19,7 @@ package controllers
 import (
 	"context"
 	"fmt"
+	"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
 	"os"
 	"path/filepath"
 	"testing"
@@ -72,6 +73,7 @@ var (
 	cfg                        *rest.Config
 	k8sClient                  client.Client
 	k8sClientFromManager       client.Client
+	k8sClientSet               *clientset.Clientset
 	k8sManager                 manager.Manager
 	testEnv                    *envtest.Environment
 	ctx                        context.Context
@@ -156,6 +158,10 @@ var _ = SynchronizedBeforeSuite(func() {
 	Expect(err).NotTo(HaveOccurred())
 	Expect(k8sClient).NotTo(BeNil())
 
+	k8sClientSet, err = clientset.NewForConfig(cfg)
+	Expect(err).NotTo(HaveOccurred())
+	Expect(k8sClientSet).NotTo(BeNil())
+
 	k8sManager, err = ctrl.NewManager(cfg, ctrl.Options{
 		Scheme:                 scheme.Scheme,
 		Metrics:                server.Options{BindAddress: "0"},