diff --git a/src/servala/core/models/service.py b/src/servala/core/models/service.py
index 2f83d8d..20a843c 100644
--- a/src/servala/core/models/service.py
+++ b/src/servala/core/models/service.py
@@ -618,7 +618,7 @@ class ServiceInstance(ServalaModelMixin, models.Model):
         # Check if secrets are available based on conditions
         secrets_available = any(
             [
-                condition.get("type") == "Status" and condition.get("status") == "True"
+                condition.get("type") == "Ready" and condition.get("status") == "True"
                 for condition in self.status_conditions
             ]
         )
@@ -636,7 +636,7 @@ class ServiceInstance(ServalaModelMixin, models.Model):
                 self.context.control_plane.get_kubernetes_client()
             )
             secret = v1.read_namespaced_secret(
-                name=secret_name, namespace=secret_ref.get("namespace")
+                name=secret_name, namespace=self.organization.namespace
             )
 
             # Secret data is base64 encoded