diff --git a/roles/kibana/tasks/kibana-keystore.yml b/roles/kibana/tasks/kibana-keystore.yml
index 04d0a47..7e76ab9 100644
--- a/roles/kibana/tasks/kibana-keystore.yml
+++ b/roles/kibana/tasks/kibana-keystore.yml
@@ -108,7 +108,7 @@
     - kibana_security | bool
     - >-
       _kibana_ks_es_password.stdout is undefined or
-      kibana_password.stdout != _kibana_ks_es_password.stdout
+      kibana_password.stdout != (_kibana_ks_es_password.stdout_lines[-1] | default(''))
   notify:
     - Restart Kibana
 
@@ -156,7 +156,7 @@
       _kibana_ks_ssl_password.stdout is undefined or
       (kibana_tls_certificate_passphrase
        if kibana_cert_source == 'external' and _kibana_cert_format | default('') == 'p12'
-       else kibana_tls_key_passphrase) != _kibana_ks_ssl_password.stdout
+       else kibana_tls_key_passphrase) != (_kibana_ks_ssl_password.stdout_lines[-1] | default(''))
   notify:
     - Restart Kibana
 
@@ -199,7 +199,7 @@
     - kibana_security | bool
     - >-
       _kibana_ks_encryption_key.stdout is undefined or
-      (kibana_encryption_key.content | b64decode | trim) != _kibana_ks_encryption_key.stdout
+      (kibana_encryption_key.content | b64decode | trim) != (_kibana_ks_encryption_key.stdout_lines[-1] | default(''))
   notify:
     - Restart Kibana
 
@@ -229,7 +229,7 @@
     - kibana_security | bool
     - >-
       _kibana_ks_saved_objects_key.stdout is undefined or
-      (kibana_savedobjects_encryption_key.content | b64decode | trim) != _kibana_ks_saved_objects_key.stdout
+      (kibana_savedobjects_encryption_key.content | b64decode | trim) != (_kibana_ks_saved_objects_key.stdout_lines[-1] | default(''))
   notify:
     - Restart Kibana