diff --git a/apis/kubedb/v1/elasticsearch_helpers.go b/apis/kubedb/v1/elasticsearch_helpers.go
index a8a4ac2915..82c6857275 100644
--- a/apis/kubedb/v1/elasticsearch_helpers.go
+++ b/apis/kubedb/v1/elasticsearch_helpers.go
@@ -859,7 +859,7 @@ func (e *Elasticsearch) setDefaultInternalUsersAndRoleMappings(esVersion *catalo
 				userSpec.SecretName = e.Spec.AuthSecret.Name
 			} else {
 				if userSpec.SecretName == "" {
-					userSpec.SecretName = e.DefaultUserCredSecretName(username)
+					userSpec.SecretName = e.GetAuthSecretName()
 				}
 				e.Spec.AuthSecret = &SecretReference{
 					LocalObjectReference: core.LocalObjectReference{
diff --git a/apis/kubedb/v1alpha2/openapi_generated.go b/apis/kubedb/v1alpha2/openapi_generated.go
index 61ae439cd7..5ebb12373c 100644
--- a/apis/kubedb/v1alpha2/openapi_generated.go
+++ b/apis/kubedb/v1alpha2/openapi_generated.go
@@ -34888,7 +34888,7 @@ func schema_apimachinery_apis_kubedb_v1alpha2_SolrSpec(ref common.ReferenceCallb
 					},
 					"authSecret": {
 						SchemaProps: spec.SchemaProps{
-							Ref: ref("k8s.io/api/core/v1.LocalObjectReference"),
+							Ref: ref("kubedb.dev/apimachinery/apis/kubedb/v1alpha2.SecretReference"),
 						},
 					},
 					"zookeeperDigestSecret": {
@@ -34952,7 +34952,7 @@ func schema_apimachinery_apis_kubedb_v1alpha2_SolrSpec(ref common.ReferenceCallb
 			},
 		},
 		Dependencies: []string{
-			"k8s.io/api/core/v1.LocalObjectReference", "k8s.io/api/core/v1.PersistentVolumeClaimSpec", "kmodules.xyz/client-go/api/v1.HealthCheckSpec", "kmodules.xyz/client-go/api/v1.ObjectReference", "kmodules.xyz/client-go/api/v1.TLSConfig", "kmodules.xyz/monitoring-agent-api/api/v1.AgentSpec", "kmodules.xyz/offshoot-api/api/v2.PodTemplateSpec", "kubedb.dev/apimachinery/apis/kubedb/v1alpha2.NamedServiceTemplateSpec", "kubedb.dev/apimachinery/apis/kubedb/v1alpha2.SolrClusterTopology"},
+			"k8s.io/api/core/v1.LocalObjectReference", "k8s.io/api/core/v1.PersistentVolumeClaimSpec", "kmodules.xyz/client-go/api/v1.HealthCheckSpec", "kmodules.xyz/client-go/api/v1.ObjectReference", "kmodules.xyz/client-go/api/v1.TLSConfig", "kmodules.xyz/monitoring-agent-api/api/v1.AgentSpec", "kmodules.xyz/offshoot-api/api/v2.PodTemplateSpec", "kubedb.dev/apimachinery/apis/kubedb/v1alpha2.NamedServiceTemplateSpec", "kubedb.dev/apimachinery/apis/kubedb/v1alpha2.SecretReference", "kubedb.dev/apimachinery/apis/kubedb/v1alpha2.SolrClusterTopology"},
 	}
 }
 
diff --git a/apis/kubedb/v1alpha2/solr_types.go b/apis/kubedb/v1alpha2/solr_types.go
index 25abe9352d..cb8cc875a2 100644
--- a/apis/kubedb/v1alpha2/solr_types.go
+++ b/apis/kubedb/v1alpha2/solr_types.go
@@ -102,7 +102,7 @@ type SolrSpec struct {
 	KeystoreSecret *core.LocalObjectReference `json:"keystoreSecret,omitempty"`
 
 	// +optional
-	AuthSecret *core.LocalObjectReference `json:"authSecret,omitempty"`
+	AuthSecret *SecretReference `json:"authSecret,omitempty"`
 
 	// +optional
 	ZookeeperDigestSecret *core.LocalObjectReference `json:"zookeeperDigestSecret,omitempty"`
diff --git a/apis/kubedb/v1alpha2/zz_generated.deepcopy.go b/apis/kubedb/v1alpha2/zz_generated.deepcopy.go
index c54452bc40..392318a88d 100644
--- a/apis/kubedb/v1alpha2/zz_generated.deepcopy.go
+++ b/apis/kubedb/v1alpha2/zz_generated.deepcopy.go
@@ -5597,8 +5597,8 @@ func (in *SolrSpec) DeepCopyInto(out *SolrSpec) {
 	}
 	if in.AuthSecret != nil {
 		in, out := &in.AuthSecret, &out.AuthSecret
-		*out = new(corev1.LocalObjectReference)
-		**out = **in
+		*out = new(SecretReference)
+		(*in).DeepCopyInto(*out)
 	}
 	if in.ZookeeperDigestSecret != nil {
 		in, out := &in.ZookeeperDigestSecret, &out.ZookeeperDigestSecret
diff --git a/crds/kubedb.com_solrs.yaml b/crds/kubedb.com_solrs.yaml
index 0fe5771416..38c0f4e1c4 100644
--- a/crds/kubedb.com_solrs.yaml
+++ b/crds/kubedb.com_solrs.yaml
@@ -55,9 +55,16 @@ spec:
                 x-kubernetes-map-type: atomic
               authSecret:
                 properties:
+                  activeFrom:
+                    format: date-time
+                    type: string
+                  externallyManaged:
+                    type: boolean
                   name:
                     default: ""
                     type: string
+                  rotateAfter:
+                    type: string
                 type: object
                 x-kubernetes-map-type: atomic
               clientAuthSSL: