diff --git a/src/test/resources/fixtures/kube_objects/kube_object_scylla_cluster.json b/src/test/resources/fixtures/kube_objects/kube_object_scylla_cluster.json
index 0d2479db..38aaa399 100644
--- a/src/test/resources/fixtures/kube_objects/kube_object_scylla_cluster.json
+++ b/src/test/resources/fixtures/kube_objects/kube_object_scylla_cluster.json
@@ -152,134 +152,11 @@
         },
         "apiVersion": "v1",
         "data": {
-          "scyllaRoleCreationScript.cql": "Q1JFQVRFIFJPTEUgSUYgTk9UIEVYSVNUUyBtYW5hZ2VtZW50IHdpdGggUEFTU1dPUkQgPSAnc2N5bGxhX3Bhc3N3b3JkJyBBTkQgTE9HSU4gPSB0cnVlIEFORCBTVVBFUlVTRVIgPSB0cnVlOwpDUkVBVEUgVVNFUiBJRiBOT1QgRVhJU1RTICdzY3lsbGFfdXNlcicgV0lUSCBQQVNTV09SRCAnc2N5bGxhX3Bhc3N3b3JkJzsKR1JBTlQgQ1JFQVRFIE9OIEFMTCBLRVlTUEFDRVMgVE8gYXBwbGljYXRpb25fdXNlcjsKR1JBTlQgTU9ESUZZIE9OIEFMTCBLRVlTUEFDRVMgVE8gYXBwbGljYXRpb25fdXNlcjsKR1JBTlQgU0VMRUNUIE9OIEFMTCBLRVlTUEFDRVMgVE8gYXBwbGljYXRpb25fdXNlcjsKR1JBTlQgQUxURVIgT04gQUxMIEtFWVNQQUNFUyBUTyBhcHBsaWNhdGlvbl91c2VyOwpDUkVBVEUgVVNFUiBJRiBOT1QgRVhJU1RTIHJlYWRfaWFtIFdJVEggUEFTU1dPUkQgJ3NjeWxsYV9wYXNzd29yZCc7CkdSQU5UIFNFTEVDVCBPTiBBTEwgS0VZU1BBQ0VTIFRPIHJlYWRfaWFtOwpDUkVBVEUgVVNFUiBJRiBOT1QgRVhJU1RTIHdyaXRlX2lhbSBXSVRIIFBBU1NXT1JEICdzY3lsbGFfcGFzc3dvcmQnOwpHUkFOVCBDUkVBVEUgT04gQUxMIEtFWVNQQUNFUyBUTyB3cml0ZV9pYW07CkdSQU5UIFNFTEVDVCBPTiBBTEwgS0VZU1BBQ0VTIFRPIHdyaXRlX2lhbTsKR1JBTlQgTU9ESUZZIE9OIEFMTCBLRVlTUEFDRVMgVE8gd3JpdGVfaWFtOwpDUkVBVEUgVVNFUiBJRiBOT1QgRVhJU1RTIHNjeWxsYW1hbmFnZXIgV0lUSCBQQVNTV09SRCAnc2N5bGxhX3Bhc3N3b3JkJzsKR1JBTlQgU0VMRUNUIE9OIEFMTCBLRVlTUEFDRVMgVE8gc2N5bGxhbWFuYWdlcjsKR1JBTlQgQ1JFQVRFIE9OIEFMTCBLRVlTUEFDRVMgVE8gc2N5bGxhbWFuYWdlcjsKR1JBTlQgTU9ESUZZIG9uIGtleXNwYWNlIHNjeWxsYV9tYW5hZ2VyIHRvIHNjeWxsYW1hbmFnZXI7CgpMT0dJTiBtYW5hZ2VtZW50ICdzY3lsbGFfcGFzc3dvcmQnOwpEUk9QIFJPTEUgY2Fzc2FuZHJhOwo="
+          "scyllaRoleCreationScript.cql": "Q1JFQVRFIFJPTEUgSUYgTk9UIEVYSVNUUyBtYW5hZ2VtZW50IHdpdGggUEFTU1dPUkQgPSAnc2N5bGxhX3Bhc3N3b3JkJyBBTkQgTE9HSU4gPSB0cnVlIEFORCBTVVBFUlVTRVIgPSB0cnVlOwpDUkVBVEUgVVNFUiBJRiBOT1QgRVhJU1RTIHNjeWxsYV91c2VyIFdJVEggUEFTU1dPUkQgJ3NjeWxsYV9wYXNzd29yZCc7CkdSQU5UIENSRUFURSBPTiBBTEwgS0VZU1BBQ0VTIFRPIHNjeWxsYV91c2VyOwpHUkFOVCBNT0RJRlkgT04gQUxMIEtFWVNQQUNFUyBUTyBzY3lsbGFfdXNlcjsKR1JBTlQgU0VMRUNUIE9OIEFMTCBLRVlTUEFDRVMgVE8gc2N5bGxhX3VzZXI7CkdSQU5UIEFMVEVSIE9OIEFMTCBLRVlTUEFDRVMgVE8gc2N5bGxhX3VzZXI7CkNSRUFURSBVU0VSIElGIE5PVCBFWElTVFMgcmVhZF9pYW0gV0lUSCBQQVNTV09SRCAnc2N5bGxhX3Bhc3N3b3JkJzsKR1JBTlQgU0VMRUNUIE9OIEFMTCBLRVlTUEFDRVMgVE8gcmVhZF9pYW07CkNSRUFURSBVU0VSIElGIE5PVCBFWElTVFMgd3JpdGVfaWFtIFdJVEggUEFTU1dPUkQgJ3NjeWxsYV9wYXNzd29yZCc7CkdSQU5UIENSRUFURSBPTiBBTEwgS0VZU1BBQ0VTIFRPIHdyaXRlX2lhbTsKR1JBTlQgU0VMRUNUIE9OIEFMTCBLRVlTUEFDRVMgVE8gd3JpdGVfaWFtOwpHUkFOVCBNT0RJRlkgT04gQUxMIEtFWVNQQUNFUyBUTyB3cml0ZV9pYW07CkNSRUFURSBVU0VSIElGIE5PVCBFWElTVFMgc2N5bGxhbWFuYWdlciBXSVRIIFBBU1NXT1JEICdzY3lsbGFfcGFzc3dvcmQnOwpHUkFOVCBTRUxFQ1QgT04gQUxMIEtFWVNQQUNFUyBUTyBzY3lsbGFtYW5hZ2VyOwpHUkFOVCBDUkVBVEUgT04gQUxMIEtFWVNQQUNFUyBUTyBzY3lsbGFtYW5hZ2VyOwpHUkFOVCBNT0RJRlkgb24ga2V5c3BhY2Ugc2N5bGxhX21hbmFnZXIgdG8gc2N5bGxhbWFuYWdlcjsKCkxPR0lOIG1hbmFnZW1lbnQgJ3NjeWxsYV9wYXNzd29yZCc7CkRST1AgUk9MRSBjYXNzYW5kcmE7Cg=="
         },
         "kind": "Secret",
         "type": "Opaque"
       },
-      {
-        "metadata": {
-          "name": "dev-scylla-test",
-          "namespace": "dev-datastores",
-          "annotations": {},
-          "labels": {
-            "app": "navi-service",
-            "Owner": "medici",
-            "release": "dev-scylla-test",
-            "Environment": "dev",
-            "Product": "lending",
-            "Team": "Infra",
-            "heritage": "NaviDeploymentManifest",
-            "chart": "navi-service-0.0.1",
-            "Name": "dev-scylla-test"
-          }
-        },
-        "apiVersion": "scylla.scylladb.com\/v1",
-        "kind": "ScyllaCluster",
-        "spec": {
-          "agentRepository": "193044292705.dkr.ecr.ap-south-1.amazonaws.com\/common\/scylla-manager-agent",
-          "developerMode": false,
-          "agentVersion": "3.3.0",
-          "datacenter": {
-            "name": "aps1",
-            "racks": [
-              {
-                "members": 3,
-                "agentVolumeMounts": [
-                  {
-                    "mountPath": "\/meta\/aws-iam",
-                    "name": "dev-scylla-test-awsiam-role",
-                    "readOnly": true
-                  }
-                ],
-                "name": "r1",
-                "volumes": [
-                  {
-                    "name": "dev-scylla-test-local-serving-ca",
-                    "secret": {
-                      "secretName": "dev-scylla-test-local-serving-ca"
-                    }
-                  },
-                  {
-                    "name": "dev-scylla-test-user-configuration",
-                    "secret": {
-                      "secretName": "dev-scylla-test-user-configuration"
-                    }
-                  },
-                  {
-                    "name": "dev-scylla-test-awsiam-role",
-                    "secret": {
-                      "secretName": "dev-scylla-test-awsiam-role"
-                    }
-                  }
-                ],
-                "resources": {
-                  "requests": {
-                    "memory": "1Gi",
-                    "cpu": 1
-                  },
-                  "limits": {
-                    "memory": "1Gi",
-                    "cpu": 1
-                  }
-                },
-                "scyllaConfig": "dev-scylla-test-config",
-                "storage": {
-                  "capacity": "1Gi"
-                },
-                "volumeMounts": [
-                  {
-                    "mountPath": "\/etc\/scylla\/ssl\/",
-                    "name": "dev-scylla-test-local-serving-ca",
-                    "readOnly": true
-                  },
-                  {
-                    "mountPath": "\/opt\/role-creation\/",
-                    "name": "dev-scylla-test-user-configuration",
-                    "readOnly": true
-                  }
-                ]
-              }
-            ]
-          },
-          "repository": "193044292705.dkr.ecr.ap-south-1.amazonaws.com\/common\/scylla",
-          "version": "5.2.15",
-          "backups": [
-            {
-              "numRetries": 3,
-              "interval": " 1d",
-              "location": [
-                "s3:navi-scylla-nonprod-backup"
-              ],
-              "retention": 7,
-              "startDate": "now"
-            }
-          ],
-          "sysctls": [
-            "fs.aio-max-nr=2097152"
-          ]
-        }
-      },
-      {
-        "metadata": {
-          "name": "dev-scylla-test-member",
-          "namespace": "dev-datastores",
-          "annotations": {},
-          "labels": {
-            "app": "navi-service",
-            "Owner": "medici",
-            "release": "dev-scylla-test",
-            "Environment": "dev",
-            "Product": "lending",
-            "Team": "Infra",
-            "heritage": "NaviDeploymentManifest",
-            "chart": "navi-service-0.0.1",
-            "Name": "dev-scylla-test"
-          }
-        },
-        "apiVersion": "v1",
-        "kind": "ServiceAccount"
-      },
       {
         "metadata": {
           "name": "dev-scylla-test-manageragent-kyverno-policy",
@@ -355,6 +232,129 @@
           "roleReference": "arn:aws:iam::571315076762:role\/scylla-backup-role"
         }
       },
+      {
+        "metadata": {
+          "name": "dev-scylla-test",
+          "namespace": "dev-datastores",
+          "annotations": {},
+          "labels": {
+            "app": "navi-service",
+            "Owner": "medici",
+            "release": "dev-scylla-test",
+            "Environment": "dev",
+            "Product": "lending",
+            "Team": "Infra",
+            "heritage": "NaviDeploymentManifest",
+            "chart": "navi-service-0.0.1",
+            "Name": "dev-scylla-test"
+          }
+        },
+        "apiVersion": "scylla.scylladb.com\/v1",
+        "kind": "ScyllaCluster",
+        "spec": {
+          "agentRepository": "193044292705.dkr.ecr.ap-south-1.amazonaws.com\/common\/scylla-manager-agent",
+          "developerMode": true,
+          "agentVersion": "3.3.0",
+          "datacenter": {
+            "name": "aps1",
+            "racks": [
+              {
+                "members": 3,
+                "agentVolumeMounts": [
+                  {
+                    "mountPath": "\/meta\/aws-iam",
+                    "name": "dev-scylla-test-awsiam-role",
+                    "readOnly": true
+                  }
+                ],
+                "name": "r1",
+                "volumes": [
+                  {
+                    "name": "dev-scylla-test-local-serving-ca",
+                    "secret": {
+                      "secretName": "dev-scylla-test-local-serving-ca"
+                    }
+                  },
+                  {
+                    "name": "dev-scylla-test-user-configuration",
+                    "secret": {
+                      "secretName": "dev-scylla-test-user-configuration"
+                    }
+                  },
+                  {
+                    "name": "dev-scylla-test-awsiam-role",
+                    "secret": {
+                      "secretName": "dev-scylla-test-awsiam-role"
+                    }
+                  }
+                ],
+                "resources": {
+                  "requests": {
+                    "memory": "1Gi",
+                    "cpu": 1
+                  },
+                  "limits": {
+                    "memory": "1Gi",
+                    "cpu": 1
+                  }
+                },
+                "scyllaConfig": "dev-scylla-test-config",
+                "storage": {
+                  "capacity": "1Gi"
+                },
+                "volumeMounts": [
+                  {
+                    "mountPath": "\/etc\/scylla\/ssl\/",
+                    "name": "dev-scylla-test-local-serving-ca",
+                    "readOnly": true
+                  },
+                  {
+                    "mountPath": "\/opt\/role-creation\/",
+                    "name": "dev-scylla-test-user-configuration",
+                    "readOnly": true
+                  }
+                ]
+              }
+            ]
+          },
+          "repository": "193044292705.dkr.ecr.ap-south-1.amazonaws.com\/common\/scylla",
+          "version": "5.2.15",
+          "backups": [
+            {
+              "numRetries": 3,
+              "interval": "1d",
+              "location": [
+                "s3:navi-scylla-nonprod-backup"
+              ],
+              "retention": 7,
+              "startDate": "now"
+            }
+          ],
+          "sysctls": [
+            "fs.aio-max-nr=2097152"
+          ]
+        }
+      },
+      {
+        "metadata": {
+          "name": "dev-scylla-test-member",
+          "namespace": "dev-datastores",
+          "annotations": {},
+          "labels": {
+            "app": "navi-service",
+            "Owner": "medici",
+            "release": "dev-scylla-test",
+            "Environment": "dev",
+            "Product": "lending",
+            "Team": "Infra",
+            "heritage": "NaviDeploymentManifest",
+            "chart": "navi-service-0.0.1",
+            "Name": "dev-scylla-test"
+          }
+        },
+        "apiVersion": "v1",
+        "kind": "ServiceAccount"
+      },
       {
         "metadata": {
           "name": "dev-scylla-test-monitor",
@@ -415,6 +415,26 @@
           }
         }
       },
+      {
+        "metadata": {
+          "name": "dev-scylla-test-controller",
+          "namespace": "dev-datastores",
+          "annotations": {},
+          "labels": {
+            "app": "navi-service",
+            "Owner": "medici",
+            "release": "dev-scylla-test",
+            "Environment": "dev",
+            "Product": "lending",
+            "Team": "Infra",
+            "heritage": "NaviDeploymentManifest",
+            "chart": "navi-service-0.0.1",
+            "Name": "dev-scylla-test"
+          }
+        },
+        "apiVersion": "v1",
+        "kind": "ServiceAccount"
+      },
       {
         "metadata": {
           "name": "dev-scylla-test-controller",
@@ -458,7 +478,7 @@
                     "--loglevel=7",
                     "--scylla-name=dev-scylla-test"
                   ],
-                  "image": "193044292705.dkr.ecr.ap-south-1.amazonaws.com\/common\/scylla-controller-image:latest",
+                  "image": "193044292705.dkr.ecr.ap-south-1.amazonaws.com\/common\/scylla-controller-image:vdd2d16a4bd231c31ff8e5b52e91c8b91e5f7192a",
                   "imagePullPolicy": "IfNotPresent",
                   "name": "scylla-manager-controller",
                   "resources": {
@@ -508,26 +528,6 @@
           }
         }
       },
-      {
-        "metadata": {
-          "name": "dev-scylla-test-controller",
-          "namespace": "dev-datastores",
-          "annotations": {},
-          "labels": {
-            "app": "navi-service",
-            "Owner": "medici",
-            "release": "dev-scylla-test",
-            "Environment": "dev",
-            "Product": "lending",
-            "Team": "Infra",
-            "heritage": "NaviDeploymentManifest",
-            "chart": "navi-service-0.0.1",
-            "Name": "dev-scylla-test"
-          }
-        },
-        "apiVersion": "v1",
-        "kind": "ServiceAccount"
-      },
       {
         "metadata": {
           "name": "dev-scylla-test-controller",
@@ -673,7 +673,7 @@
       },
       {
         "metadata": {
-          "name": "dev-scylla-testmanager",
+          "name": "dev-scylla-test-manager",
           "namespace": "dev-datastores",
           "annotations": {},
           "labels": {
@@ -842,6 +842,8 @@
           "template": {
             "metadata": {
               "annotations": {
+                "instrumentation.opentelemetry.io\/container-names": "scylla-test-navi-service",
+                "instrumentation.opentelemetry.io\/inject-java": "apm\/instrumentation",
                 "traffic.sidecar.istio.io\/excludeInboundPorts": "4001,8080",
                 "traffic.sidecar.istio.io\/includeInboundPorts": "*"
               },
@@ -1143,7 +1145,9 @@
         "metadata": {
           "name": "scylla-test-navi-service",
           "namespace": "dev",
-          "annotations": {},
+          "annotations": {
+            "status": "active"
+          },
           "labels": {
             "app": "navi-service",
             "Owner": "medici",