diff --git a/group_vars/all/main.yml b/group_vars/all/main.yml
index 3405aa99a37f3b76bf074406b3f7a4419751f478..7ca5b7cffaf3682a86f0536840f1242c2b6e502d 100644
--- a/group_vars/all/main.yml
+++ b/group_vars/all/main.yml
@@ -60,7 +60,7 @@ sysctlconfig:
 nifi_javamem: "1500m"
 odfe_javamem: "512m"
 
-nifi_version: 1.12.1
+nifi_version: 1.16.2
 nifi_repo: "https://archive.apache.org/dist"
 
 ca_cn: "SOCTOOLS-CA"
diff --git a/roles/nifi/tasks/init.yml b/roles/nifi/tasks/init.yml
index 7d28b1cbf16c43b1ad0c73c31b6c423dac148fb8..59a71e87b7012c1dbb174bf6a80f08342d3ccabd 100644
--- a/roles/nifi/tasks/init.yml
+++ b/roles/nifi/tasks/init.yml
@@ -185,6 +185,21 @@
     line: 'index,domain'
     insertbefore: BOF
 
+- name: configure zookeeper parameters
+  lineinfile:
+    path: "/opt/nifi/nifi-current/conf/state-management.xml"
+    regexp: '\<property name\=\"Connect String\"\>\<\/property\>'
+    line: '        <property name="Connect String">{{ zookeeper_name }}:2181</property>'
+    state: present
+    backrefs: yes
+
+- name: set nifi encryption key
+  remote_user: nifi
+  shell: export NIFI_BASE_DIR=/opt/nifi; export NIFI_HOME=${NIFI_BASE_DIR}/nifi-current; /opt/nifi/nifi-current/bin/nifi.sh set-sensitive-properties-key {{lookup('password', '{{playbook_dir}}/secrets/tokens/nifi_encryption_key')}}
+  args:
+    chdir: /opt/nifi/nifi-current/conf
+    executable: /bin/bash
+
 - name: Set Autostart for supervisord's services
   replace:
     path: /etc/supervisord.conf