diff --git a/ansible/roles/mn_createprotx/tasks/createprovidertx.yml b/ansible/roles/mn_createprotx/tasks/createprovidertx.yml
index bcb9f89c..880b2a6e 100644
--- a/ansible/roles/mn_createprotx/tasks/createprovidertx.yml
+++ b/ansible/roles/mn_createprotx/tasks/createprovidertx.yml
@@ -4,11 +4,11 @@
 
 - name: Verify fee balance is ready to spend
   ansible.builtin.command: >
-    dash-cli getaddressbalance '{"addresses": ["{{ masternode.collateral.address }}"]}'
+    dash-cli getaddressbalance '{"addresses": ["{{ fee_address.stdout }}"]}'
   retries: 10
   delay: 1
   register: result
-  until: result.stdout | from_json | json_query('balance_spendable') | int > 100000000000
+  until: result.stdout | from_json | json_query('balance_spendable') | int >= 100000000
   changed_when: result.stdout | length > 0
 
 - name: Create ProTx for {{ masternode_name ~ '/' ~ masternode.owner.address }}
@@ -21,6 +21,6 @@
             {{ masternode.owner.address }}
             0
             {{ miner_payment_address }}
-            {{ masternode.collateral.address }}"
+            {{ fee_address.stdout }}"
   register: protx
   changed_when: protx.stdout | length == 64
diff --git a/ansible/roles/mn_createprotx/tasks/main.yml b/ansible/roles/mn_createprotx/tasks/main.yml
index f0f1817a..45fbffe2 100644
--- a/ansible/roles/mn_createprotx/tasks/main.yml
+++ b/ansible/roles/mn_createprotx/tasks/main.yml
@@ -15,33 +15,17 @@
 
 # fund fee
 
-- name: Populate fee payment targets
-  ansible.builtin.set_fact:
-    fee_target_addresses: "{{ fee_target_addresses | default([]) + [masternodes[item].collateral.address] }}"
-  with_items:
-    - "{{ masternode_names }}"
-
-- name: Check if address contains a suitable fee utxo
-  ansible.builtin.command: >
-    dash-cli -rpcwallet={{ wallet_rpc_wallet_mno }} listunspent 1 99999999 '{{ fee_target_addresses | to_json }}' false '{{ maxamount | to_json }}'
-  register: funded_addresses
-  changed_when: funded_addresses.stdout | from_json | length > 0
-  vars:
-    maxamount:
-      maximumAmount: 1
+- name: Get new fee address
+  ansible.builtin.command: 'dash-cli -rpcwallet={{ wallet_rpc_wallet_mno }} getnewaddress'
+  register: fee_address
+  changed_when: fee_address.stdout | length == 34
 
-- name: Figure out which addresses need fee funding
-  ansible.builtin.set_fact:
-    fee_missing_addresses: "{{ fee_target_addresses | difference(funded_addresses.stdout) }}"
-
-- name: Fund 1 coin for ProTx fee
-  ansible.builtin.include_tasks: ./roles/mn_fund_collateral/tasks/fund_collateral.yml
-  vars:
-    amount: 1
-    payment_targets: '{{ fee_target_addresses }}'
-  when: fee_target_addresses|length > 0
+- name: Fund fee address
+  ansible.builtin.command: 'dash-cli -rpcwallet={{ wallet_rpc_wallet_faucet }} sendtoaddress {{ fee_address.stdout }} 10'
+  register: fund_result
+  changed_when: fund_result.stdout | length == 64
 
-- name: Generate at least one block to confirm fee funding transactions
+- name: Generate at least one block to confirm fee funding transaction
   ansible.builtin.include_role:
     name: generate_blocks
   vars:
diff --git a/ansible/roles/mn_evo_services/templates/tendermint/config.toml.j2 b/ansible/roles/mn_evo_services/templates/tendermint/config.toml.j2
index 9e93167e..e71f8cb5 100644
--- a/ansible/roles/mn_evo_services/templates/tendermint/config.toml.j2
+++ b/ansible/roles/mn_evo_services/templates/tendermint/config.toml.j2
@@ -386,7 +386,7 @@ peer-gossip-sleep-duration = "100ms"
 peer-query-maj23-sleep-duration = "2s"
 
 # How many blocks are inspected in order to determine if we need to create additional proof block.
-create-proof-block-range = 0
+create-proof-block-range = 1
 
 #######################################################
 ###   Transaction Indexer Configuration Options     ###
diff --git a/ansible/roles/mn_evo_services/templates/tendermint/genesis.json.j2 b/ansible/roles/mn_evo_services/templates/tendermint/genesis.json.j2
index ad7fc246..4c54ca76 100644
--- a/ansible/roles/mn_evo_services/templates/tendermint/genesis.json.j2
+++ b/ansible/roles/mn_evo_services/templates/tendermint/genesis.json.j2
@@ -1,9 +1,6 @@
 {
   "genesis_time": "{{ genesis_time }}",
   "chain_id": "dash-{{ ( 'devnet-' + dash_devnet_name if dash_network == 'devnet' else dash_network ) if tenderdash_chain_id is not defined else tenderdash_chain_id }}",
-  "initial_height": "0",
-  "initial_core_chain_locked_height": {{ platform_initial_core_chain_locked_height | int }},
-  "initial_proposal_core_chain_lock": null,
   "consensus_params": {
     "block": {
       "max_bytes": "22020096",
@@ -24,22 +21,5 @@
       "app_version": "1"
     }
   },
- "validators": [
-    {
-      "pub_key": {
-        "type": "tendermint/PubKeyBLS12381",
-        "value": "imxjukh5hRY91Mvm/sfhQp6iSnICyvKMMdhY5Sq6Ej0QJyB3vtN4UfYwvmxdzOVM"
-      },
-      "power": 100,
-      "name": "",
-      "pro_tx_hash": "F3D506822A24E7E4BE318A6ED7371CC1E1527880A594FE04629F50A1618DB8E7"
-    }
-  ],
-  "threshold_public_key": {
-    "type": "tendermint/PubKeyBLS12381",
-    "value": "imxjukh5hRY91Mvm/sfhQp6iSnICyvKMMdhY5Sq6Ej0QJyB3vtN4UfYwvmxdzOVM"
-  },
-  "quorum_type": {{ platform_drive_validator_set_llmq_type }},
-  "quorum_hash": "0000000000000000000000000000000000000000000000000000000000000000",
-  "app_hash": ""
+  "validator_quorum_type": {{ platform_drive_validator_set_llmq_type }}
 }
diff --git a/ansible/roles/mn_unban/tasks/createproupservtx.yml b/ansible/roles/mn_unban/tasks/createproupservtx.yml
index b8bc27d0..afd58a19 100644
--- a/ansible/roles/mn_unban/tasks/createproupservtx.yml
+++ b/ansible/roles/mn_unban/tasks/createproupservtx.yml
@@ -8,6 +8,6 @@
             {{ hostvars[masternode_name].public_ip }}:{{ dashd_port }}
             {{ masternode.operator.private_key }}
             ''
-            {{ masternode.collateral.address }}" # Should already be funded from registration protx
+            {{ fee_address.stdout }}" # Should already be funded from registration protx
   register: protx
   changed_when: protx.stdout | length == 64
diff --git a/ansible/roles/multifaucet/templates/docker-compose.yml.j2 b/ansible/roles/multifaucet/templates/docker-compose.yml.j2
index efa61042..6ed35a87 100644
--- a/ansible/roles/multifaucet/templates/docker-compose.yml.j2
+++ b/ansible/roles/multifaucet/templates/docker-compose.yml.j2
@@ -24,7 +24,7 @@ services:
       - MULTIFAUCET_PAYMENT_GW_RPC_USER={{ wallet_rpc_user }}
       - MULTIFAUCET_PAYMENT_GW_RPC_PASS={{ wallet_rpc_password }}
       - MULTIFAUCET_PAYMENT_GW_RPC_WALLET={{ wallet_rpc_wallet_faucet }}
-      - MULTIFAUCET_PAYMENT_GW_RPC_ENCR=""
+      - MULTIFAUCET_PAYMENT_GW_RPC_ENCR=
       - MULTIFAUCET_DB_HOST=db
       - MULTIFAUCET_DB_NAME=multifaucet
       - MULTIFAUCET_DB_USER=multifaucet
diff --git a/package-lock.json b/package-lock.json
index d21ce978..b53ccbb2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@dashevo/dash-network-deploy",
-  "version": "0.23.0-dev.3",
+  "version": "0.23.0-dev.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@dashevo/dash-network-deploy",
-      "version": "0.23.0-dev.3",
+      "version": "0.23.0-dev.4",
       "license": "MIT",
       "dependencies": {
         "@dashevo/dapi-client": "^0.22.0",
diff --git a/package.json b/package.json
index e6d02450..9737ee38 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/dash-network-deploy",
-  "version": "0.23.0-dev.3",
+  "version": "0.23.0-dev.4",
   "description": "Dash Network deployment tool",
   "directories": {
     "lib": "lib",