diff --git a/tdp_vars_defaults/hbase/hbase.yml b/tdp_vars_defaults/hbase/hbase.yml
index 435492ed..eb0070d3 100644
--- a/tdp_vars_defaults/hbase/hbase.yml
+++ b/tdp_vars_defaults/hbase/hbase.yml
@@ -189,6 +189,9 @@ phoenix_queryserver_hbase_site:
   phoenix.queryserver.tls.keystore.password: "{{ hbase_keystore_password }}"
   phoenix.queryserver.tls.truststore: "{{ hbase_truststore_location }}"
   phoenix.queryserver.tls.truststore.password: "{{ hbase_truststore_password }}"
+  phoenix.queryserver.withRemoteUserExtractor: "true"
+  #This parameter below must not be changed
+  phoenix.queryserver.remoteUserExtractor.param: "doAs"
 
 phoenix_queryserver_properties: "{{ hbase_site | combine(phoenix_queryserver_hbase_site) }}"
 
diff --git a/tdp_vars_defaults/knox/knox.yml b/tdp_vars_defaults/knox/knox.yml
index fc3560fa..290fd7b0 100644
--- a/tdp_vars_defaults/knox/knox.yml
+++ b/tdp_vars_defaults/knox/knox.yml
@@ -181,6 +181,9 @@ tdpldap_services:
   LIVYSERVER3:
     hosts: "{% if groups['livy_spark3_server'] is defined %}{{ groups['livy_spark3_server'] | default([]) | map('tosit.tdp.access_fqdn', hostvars) | list }}{% else %}{% endif %}"
     port: "8999"
+  AVATICA:
+    hosts: "{% if groups['phoenix_queryserver_daemon'] is defined %}{{ groups['phoenix_queryserver_daemon'] | default([]) | map('tosit.tdp.access_fqdn', hostvars) | list }}{% else %}{% endif %}"
+    port: "{{ phoenix_queryserver_http_port }}"
 
 # Service start on boot policies
 knox_start_on_boot: no