diff --git a/charts/sigi/v0.2.3/templates/deployment.yaml b/charts/sigi/v0.2.3/templates/deployment.yaml
index de8b129..cedb5a5 100644
--- a/charts/sigi/v0.2.3/templates/deployment.yaml
+++ b/charts/sigi/v0.2.3/templates/deployment.yaml
@@ -63,7 +63,7 @@ spec:
               valueFrom:
                 # Secret Key
                 secretKeyRef:
-                  name: {{ include "sigi.name" . }}-auth-ldap-key
+                  name: {{ include "sigi.fullname" . }}-auth-ldap-key
                   key: AUTH_LDAP_BIND_PASSWORD
             - name: AUTH_LDAP_USER_SEARCH_STRING
               value: "{{ .Values.sigi.auth.ldap.userSearchString }}"
@@ -93,7 +93,7 @@ spec:
               valueFrom: 
                 # Secret Key
                 secretKeyRef: 
-                  name: {{ include "sigi.name" . }}-saberes-tkn
+                  name: {{ include "sigi.fullname" . }}-saberes-tkn
                   key: MOODLE_API_TOKEN
           volumeMounts:
 #            - mountPath: /var/interlegis/sigi/data
diff --git a/charts/sigi/v0.2.3/templates/sigi-ldap-secret.yaml b/charts/sigi/v0.2.3/templates/sigi-ldap-secret.yaml
index d45c979..2f88242 100644
--- a/charts/sigi/v0.2.3/templates/sigi-ldap-secret.yaml
+++ b/charts/sigi/v0.2.3/templates/sigi-ldap-secret.yaml
@@ -1,13 +1,10 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "sigi.name" . }}-auth-ldap-key
+  name: {{ include "sigi.fullname" . }}-auth-ldap-key
   labels:
     {{- include "sigi.labels" . | nindent 4 }}
 type: Opaque
 data:
-{{- if .Release.IsUpgrade }}
-  AUTH_LDAP_BIND_PASSWORD:  {{ index (lookup "v1" "Secret" .Release.Namespace (printf "%s-auth-ldap-key" (include "sigi.name" .))).data "AUTH_LDAP_BIND_PASSWORD" }}
-{{ else }} # install operation
   AUTH_LDAP_BIND_PASSWORD: {{ .Values.sigi.auth.ldap.bindPwd  | b64enc }}
-{{ end }}
+
diff --git a/charts/sigi/v0.2.3/templates/sigi-saberes-token.yaml b/charts/sigi/v0.2.3/templates/sigi-saberes-token.yaml
index f616438..009d224 100644
--- a/charts/sigi/v0.2.3/templates/sigi-saberes-token.yaml
+++ b/charts/sigi/v0.2.3/templates/sigi-saberes-token.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "sigi.name" . }}-saberes-tkn
+  name: {{ include "sigi.fullname" . }}-saberes-tkn
   labels:
     {{- include "sigi.labels" . | nindent 4 }}
 type: Opaque