diff --git a/installer/data/template/.origintrail_noderc_one_click_mainnet.json b/installer/data/template/.origintrail_noderc_one_click_mainnet.json
index 8cc582b03..1745c32af 100644
--- a/installer/data/template/.origintrail_noderc_one_click_mainnet.json
+++ b/installer/data/template/.origintrail_noderc_one_click_mainnet.json
@@ -1,17 +1,30 @@
 {
   "modules":{
+    "network": {
+      "implementation": {
+        "libp2p-service": {
+          "config": {
+            "nat": {
+              "enabled": true,
+              "externalIp": "<node_static_ip_address>"
+            }
+          }
+        }
+      }
+    },
     "blockchain":{
       "implementation":{
         "otp:2043":{
           "enabled":true,
           "config":{
-            "sharesTokenSymbol":"<shares_token_symbol>",
-            "sharesTokenName":"<shares_token_name>",
-            "evmManagementWalletPublicKey":"<emv_management_key_public_key>",
+            "sharesTokenName":"<node_name>",
+            "sharesTokenSymbol":"<node_symbol>",
+            "operatorFee":"<operator_fee>",
+            "evmManagementWalletPublicKey":"<management_wallet_public_key>",
             "operationalWallets":[
               {
-                "evmAddress":"<evm_operational_key_public_key>",
-                "privateKey":"<evm_operational_key_private_key>"
+                "evmAddress":"<operational_wallet_public_key>",
+                "privateKey":"<operational_wallet_private_key>"
               }
             ]
           }
@@ -19,20 +32,38 @@
         "gnosis:100":{
           "enabled":true,
           "config":{
-            "operatorFee": <node_operator_fee>,
-            "sharesTokenSymbol":"<shares_token_symbol>",
-            "sharesTokenName":"<shares_token_name>",
+            "sharesTokenName":"<node_name>",
+            "sharesTokenSymbol":"<node_symbol>",
+            "operatorFee":"<operator_fee>",
             "rpcEndpoints":[
               "<gnosis_rpc_endpoint>"
             ],
-            "evmManagementWalletPublicKey":"<emv_management_key_public_key>",
+            "evmManagementWalletPublicKey":"<management_wallet_public_key>",
             "operationalWallets":[
               {
-                "evmAddress":"<evm_operational_key_public_key>",
-                "privateKey":"<evm_operational_key_private_key>"
+                "evmAddress":"<operational_wallet_public_key>",
+                "privateKey":"<operational_wallet_private_key>"
               }
             ]
           }
+        },
+        "base:8453":{
+          "enabled":true,
+          "config":{
+            "evmManagementWalletPublicKey":"<management_wallet_public_key>",
+            "operationalWallets":[
+              {
+                "evmAddress":"<operational_wallet_public_key>",
+                "privateKey":"<operational_wallet_private_key>"
+              }
+            ],
+            "sharesTokenName":"<node_name>",
+            "sharesTokenSymbol":"<node_symbol>",
+            "operatorFee":"<operator_fee>",
+            "rpcEndpoints":[
+              "<base_rpc_endpoint>"
+            ]
+          }
         }
       }
     },
diff --git a/installer/data/template/.origintrail_noderc_one_click_testnet.json b/installer/data/template/.origintrail_noderc_one_click_testnet.json
index b2f1bc855..d1abfdc4d 100644
--- a/installer/data/template/.origintrail_noderc_one_click_testnet.json
+++ b/installer/data/template/.origintrail_noderc_one_click_testnet.json
@@ -1,17 +1,30 @@
 {
   "modules":{
+    "network": {
+      "implementation": {
+        "libp2p-service": {
+          "config": {
+            "nat": {
+              "enabled": true,
+              "externalIp": "<node_static_ip_address>"
+            }
+          }
+        }
+      }
+    },
     "blockchain":{
       "implementation":{
         "otp:20430":{
           "enabled":true,
           "config":{
-            "sharesTokenSymbol":"<shares_token_symbol>",
-            "sharesTokenName":"<shares_token_name>",
-            "evmManagementWalletPublicKey":"<emv_management_key_public_key>",
+            "sharesTokenName":"<node_name>",
+            "sharesTokenSymbol":"<node_symbol>",
+            "operatorFee":"<operator_fee>",
+            "evmManagementWalletPublicKey":"<management_wallet_public_key>",
             "operationalWallets":[
               {
-                "evmAddress":"<evm_operational_key_public_key>",
-                "privateKey":"<evm_operational_key_private_key>"
+                "evmAddress":"<operational_wallet_public_key>",
+                "privateKey":"<operational_wallet_private_key>"
               }
             ]
           }
@@ -19,20 +32,38 @@
         "gnosis:10200":{
           "enabled":true,
           "config":{
-            "operatorFee": <node_operator_fee>,
-            "sharesTokenSymbol":"<shares_token_symbol>",
-            "sharesTokenName":"<shares_token_name>",
+            "sharesTokenName":"<node_name>",
+            "sharesTokenSymbol":"<node_symbol>",
+            "operatorFee":"<operator_fee>",
             "rpcEndpoints":[
               "<gnosis_rpc_endpoint>"
             ],
-            "evmManagementWalletPublicKey":"<emv_management_key_public_key>",
+            "evmManagementWalletPublicKey":"<management_wallet_public_key>",
             "operationalWallets":[
               {
-                "evmAddress":"<evm_operational_key_public_key>",
-                "privateKey":"<evm_operational_key_private_key>"
+                "evmAddress":"<operational_wallet_public_key>",
+                "privateKey":"<operational_wallet_private_key>"
               }
             ]
           }
+        },
+        "base:84532":{
+          "enabled":true,
+          "config":{
+            "evmManagementWalletPublicKey":"<management_wallet_public_key>",
+            "operationalWallets":[
+              {
+                "evmAddress":"<operational_wallet_public_key>",
+                "privateKey":"<operational_wallet_private_key>"
+              }
+            ],
+            "sharesTokenName":"<node_name>",
+            "sharesTokenSymbol":"<node_symbol>",
+            "operatorFee":"<operator_fee>",
+            "rpcEndpoints":[
+              "<base_rpc_endpoint>"
+            ]
+          }
         }
       }
     },
diff --git a/package-lock.json b/package-lock.json
index 4004d3ae0..4e48f8bd3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "origintrail_node",
-    "version": "6.5.1+hotfix.1",
+    "version": "6.5.1+hotfix.2",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "origintrail_node",
-            "version": "6.5.1+hotfix.1",
+            "version": "6.5.1+hotfix.2",
             "license": "ISC",
             "dependencies": {
                 "@comunica/query-sparql": "^2.4.3",
diff --git a/package.json b/package.json
index e72debf9c..4b5d7d5a6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "origintrail_node",
-    "version": "6.5.1+hotfix.1",
+    "version": "6.5.1+hotfix.2",
     "description": "OTNode V6",
     "main": "index.js",
     "type": "module",
diff --git a/src/constants/constants.js b/src/constants/constants.js
index e06bf467a..7c43e15e3 100644
--- a/src/constants/constants.js
+++ b/src/constants/constants.js
@@ -231,8 +231,11 @@ export const COMMAND_TX_GAS_INCREASE_FACTORS = {
 };
 
 export const CONTRACT_FUNCTION_GAS_LIMIT_INCREASE_FACTORS = {
-    'submitUpdateCommit((address,uint256,bytes,uint8,uint16,uint72,uint72,uint72))': 1.2,
-    'submitUpdateCommit((address,uint256,bytes,uint8,uint16))': 1.2,
+    sendProof: 2,
+    'submitCommit((address,uint256,bytes,uint8,uint16))': 2,
+    'submitCommit((address,uint256,bytes,uint8,uint16,uint72,uint72,uint72))': 2,
+    'submitUpdateCommit((address,uint256,bytes,uint8,uint16,uint72,uint72,uint72))': 2,
+    'submitUpdateCommit((address,uint256,bytes,uint8,uint16))': 2,
 };
 
 export const GNOSIS_DEFAULT_GAS_PRICE = {