diff --git a/roles/nifi/templates/flow.xml.j2 b/roles/nifi/templates/flow.xml.j2
index c0ff58c80085774679e97aac416f41506b8d12e0..dcc40b5d326015c961a4815e88fbd589dbd93eea 100644
--- a/roles/nifi/templates/flow.xml.j2
+++ b/roles/nifi/templates/flow.xml.j2
@@ -9577,7 +9577,7 @@
             </property>
             <property>
               <name>el-cs-password</name>
-              <value>enc{18f431a8121ccd08597b03628773453455e445222fe72b279f9f67a3f2775b5275c6752eb316a1521d7748b314b06932}</value>
+              <value>${elastic_password}</value>
             </property>
             <property>
               <name>el-cs-ssl-context-service</name>
@@ -11977,7 +11977,7 @@
       </property>
       <property>
         <name>Truststore Password</name>
-        <value>enc{b061a02ce6812799b478388abce887518f82325e7db568bd814dc716b1ffb35e}</value>
+        <value>${truststore_password}</value>
       </property>
       <property>
         <name>Truststore Type</name>
@@ -12612,6 +12612,7 @@
         <value>append-to-previous-message</value>
       </property>
     </controllerService>
+    <variable name="truststore_password" value="{{lookup('password', '{{playbook_dir}}/secrets/passwords/truststore')}}" />
     <variable name="misp_token" value="{{lookup('file','{{playbook_dir}}/secrets/tokens/misp')}}" />
     <variable name="maxmind_key" value="{{ maxmind_key }}" />
     <variable name="misp_first_interval" value="60d" />
@@ -12622,4 +12623,4 @@
   </rootGroup>
   <controllerServices />
   <reportingTasks />
-</flowController>
+</flowController>
\ No newline at end of file