diff --git a/configure.ac b/configure.ac
index 843e4c7d80..68f86e62c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.69])
-define(_CLIENT_VERSION_MAJOR, 8)
+define(_CLIENT_VERSION_MAJOR, 82)
 define(_CLIENT_VERSION_MINOR, 22)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_RC, 4)
diff --git a/test/functional/feature_taproot.py b/test/functional/feature_taproot.py
index af25744ade..bbab4de862 100755
--- a/test/functional/feature_taproot.py
+++ b/test/functional/feature_taproot.py
@@ -598,8 +598,8 @@ def byte_popper(expr):
 SINGLE_SIG = {"inputs": [getter("sign")]}
 SIG_ADD_ZERO = {"failure": {"sign": zero_appender(default_sign)}}
 
-DUST_LIMIT = 600
-MIN_FEE = 1300000
+DUST_LIMIT = 60000  # Updated dust relay fee of 30000 x 2
+MIN_FEE = 130000000  # Updated minimum fee
 
 # === Actual test cases ===
 
@@ -1462,7 +1462,7 @@ def test_spenders(self, node, spenders, input_counts):
     def run_test(self):
         # Post-taproot activation tests go first (pre-taproot tests' blocks are invalid post-taproot).
         self.log.info("Post-activation tests...")
-        self.generate(self.nodes[1], COINBASE_MATURITY + 1)
+        self.generate(self.nodes[1], COINBASE_MATURITY_2 + 1)
         self.test_spenders(self.nodes[1], spenders_taproot_active(), input_counts=[1, 2, 2, 2, 2, 3])
 
         # Re-connect nodes in case they have been disconnected
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py
index bef9351b74..66ab108a0d 100755
--- a/test/functional/test_runner.py
+++ b/test/functional/test_runner.py
@@ -112,8 +112,8 @@
     'wallet_dump.py --legacy-wallet',
     'wallet_listtransactions.py --legacy-wallet',
     'wallet_listtransactions.py --descriptors',
-    #'feature_taproot.py --previous_release', #Disable until path forward on taproot determined
-    #'feature_taproot.py', #Disable until path forward on taproot determined
+    'feature_taproot.py --previous_release',
+    'feature_taproot.py',
     'rpc_signer.py',
     'wallet_signer.py --descriptors',
     # vv Tests less than 60s vv
@@ -268,7 +268,7 @@
     'wallet_send.py --legacy-wallet',
     'wallet_send.py --descriptors',
     'wallet_create_tx.py --descriptors',
-    #'wallet_taproot.py', #Disable until path forward on taproot determined
+    'wallet_taproot.py',
     'p2p_fingerprint.py',
     'feature_uacomment.py',
     'wallet_coinbase_category.py --legacy-wallet',