diff --git a/charts/login-service/charts/config/templates/load-init-config.yml b/charts/login-service/charts/config/templates/load-init-config.yml
index 144d49e..81ae42d 100644
--- a/charts/login-service/charts/config/templates/load-init-config.yml
+++ b/charts/login-service/charts/config/templates/load-init-config.yml
@@ -21,7 +21,7 @@ spec:
             name: {{ include "config.fullname" . }}-tls-script
       containers:
       - name: {{ template "login-service.name" . }}-load
-        image: gluufederation/config-init:4.1.1_02
+        image: {{ .Values.image }}
         resources:
           requests:
             memory: {{ .Values.requests.memory }}
diff --git a/charts/login-service/charts/config/values.yaml b/charts/login-service/charts/config/values.yaml
index 6eb4caf..83d6728 100644
--- a/charts/login-service/charts/config/values.yaml
+++ b/charts/login-service/charts/config/values.yaml
@@ -1,3 +1,4 @@
+enabled: true
 # Required environment variables for generating Gluu server initial config
 #values for environment variables
  # domain name where the Gluu Server resides
@@ -25,6 +26,8 @@ fullNameOverride: ""
 volumeClaim:
   name: um-login-service-config-pvc
 
+image: gluufederation/config-init:4.1.1_02
+
 limits:
   memory: 600Mi
 requests:
diff --git a/charts/login-service/charts/opendj/values.yaml b/charts/login-service/charts/opendj/values.yaml
index 8f8e847..59f7e1b 100644
--- a/charts/login-service/charts/opendj/values.yaml
+++ b/charts/login-service/charts/opendj/values.yaml
@@ -1,3 +1,4 @@
+enabled: true
 # opendj Environament Variables
 # common ConfigMap values
 gluuLdapInit: true
diff --git a/charts/login-service/charts/oxauth/values.yaml b/charts/login-service/charts/oxauth/values.yaml
index 4ae9cae..6480f07 100755
--- a/charts/login-service/charts/oxauth/values.yaml
+++ b/charts/login-service/charts/oxauth/values.yaml
@@ -1,4 +1,5 @@
 # Declare variables to be passed into your templates.
+enabled: true
 
 replicaCount: 1
 dynamicStorage: true
@@ -30,9 +31,6 @@ persistence:
   type: DirectoryOrCreate
   dbStorageSize: 5Gi
   statefulSetReplicas: 1
-  imagePullPolicy: Always
-  restartPolicy: Never
-  image: eoepca/um-login-persistence:v1.0-RC
   configAdapter: GLUU_CONFIG_ADAPTER
   adapter: "kubernetes"
   secretAdapter: GLUU_SECRET_ADAPTER
diff --git a/charts/login-service/charts/oxpassport/values.yaml b/charts/login-service/charts/oxpassport/values.yaml
index 0571765..a3769a8 100755
--- a/charts/login-service/charts/oxpassport/values.yaml
+++ b/charts/login-service/charts/oxpassport/values.yaml
@@ -1,6 +1,7 @@
 # Default values for oxpassport.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
+enabled: true  
 
 replicaCount: 1
 
diff --git a/charts/login-service/values.yaml b/charts/login-service/values.yaml
index 0f9faae..2636182 100644
--- a/charts/login-service/values.yaml
+++ b/charts/login-service/values.yaml
@@ -24,15 +24,13 @@ persistence:
   type: DirectoryOrCreate
 
 config:
+  # Required environment variables for generating Gluu server initial config
   enabled: true
-  # email address of the administrator usually. Used for certificate creation
-  # adminPass is administrator password for oxTrust and LDAP
+  # ldapType only OpenDJ is supported
+  ldapType: opendj
   # domain name where the Gluu Server resides
   domain: demoexample.gluu.org
   # organisation location details
-
-  # ldapType only OpenDJ is supported
-  ldapType: opendj
   countryCode: ES
   state: Madrid
   city: Tres Cantos
@@ -43,48 +41,89 @@ config:
   gluuConfAdapter: kubernetes
   ldapType: opendj
   redisPass: aaaa
-  # <<<---------------------- SKIPPED THIS IN THE DOCUMENTATION -------->>>
-  # StorageClass values
-  # values used to define the StorageClass template
-  encrypted: true
-  reclaimPolicy: Retain
-  pool: default
-  description: gluu-config-init-volume
-  fsType: ext4
-  provisioner: k8s.io/minikube-hostpath
-  awsZones: us-west-2a
-  gcePdStorageType: pd-standard
-  azureStorageAccountType: Standard_LRS
-  azureStorageKind: Shared
+  pdpEp: /pdp
+  # VolumeClaim values
   volumeClaim:
     name: um-login-service-config-pvc
 
+  image: gluufederation/config-init:4.1.1_02
+
 opendj:
   enabled: true
   # options REDIS/NATIVE_PERSISTENCE
   gluuCacheType: NATIVE_PERSISTENCE
   # options true/false : must be enabled if cache type is REDIS
   gluuRedisEnabled: false
+  #opendj docker image and policy
+  imagePullPolicy: Always
+  image: gluufederation/wrends:4.1.1_01
+  persistence:
+    #persistence docker image and policy
+    imagePullPolicy: Always
+    image: eoepca/um-login-persistence:v0.9.0
+    #COIH Client ID and Secret for passport login
+    coihClientIDv: ""
+    coihClientSecretv: ""
+  # VolumeClaim values
   volumeClaim:
     name: um-login-service-opendj-pvc
+  readinessProbe:
+    initialDelaySeconds: 150
+    periodSeconds: 90
+  livenessProbe:
+    initialDelaySeconds: 150
+    periodSeconds: 90
 
 oxpassport:
-  enabled: true  
+  enabled: true
+  image:
+    repository: eoepca/um-login-passport
+    # repository: gluufederation/oxpassport
+    tag: v0.1.1
+    # tag: 4.0.1_03
+    pullPolicy: Always
 
 oxauth:
   enabled: true
   dynamicStorage: true
+  image:
+    # repository gluufederation/oxauth:4.1.1_03
+    repository: oxauth
+    tag: 4.1.1_03
+    pullPolicy: Always
   volumeClaim:
     name: um-login-service-oxauth-pvc
+  livenessProbe:
+    initialDelaySeconds: 100
+    periodSeconds: 60
+  readinessProbe:
+    initialDelaySeconds: 100
+    periodSeconds: 60
 
 oxtrust:
   enabled: true
+  #RAM fraction, defaults a 100%
+  gluuMaxRamFraction: 1
   dynamicStorage: true
+  image:
+    # repository gluufederation/oxtrust:4.1.1_02
+    repository: oxtrust
+    tag: 4.1.1_02
+    pullPolicy: Always
   volumeClaim:
     name: um-login-service-oxtrust-pvc
+  livenessProbe:
+    initialDelaySeconds: 100
+    periodSeconds: 60
+  readinessProbe:
+    initialDelaySeconds: 100
+    periodSeconds: 60
 
 nginx:
-  enabled: true
+  image:
+    repository: kungus/gluu-tls-initializer
+    tag: stable
+    pullPolicy: IfNotPresent
   ingress:
     enabled: true
     annotations: {}
@@ -98,24 +137,4 @@ nginx:
       hosts:
         - demoexample.gluu.org
   resources: {}
-    # We usually recommend not to specify default resources and to leave this as a conscious
-    # choice for the user. This also increases chances charts run on environments with little
-    # resources, such as Minikube. If you do want to specify resources, uncomment the following
-    # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-    # limits:
-    #   cpu: 100m
-    #   memory: 128Mi
-    # requests:
-    #   cpu: 100m
-    #   memory: 128Mi
-  autoscaling:
-    enabled: false
-    minReplicas: 1
-    maxReplicas: 100
-    targetCPUUtilizationPercentage: 80
-    # targetMemoryUtilizationPercentage: 80
-  nodeSelector: {}
-  tolerations: []
-  affinity: {}
-  tags:
-    redis: false
+