diff --git a/basicswap/__init__.py b/basicswap/__init__.py
index a9aed3a..3e17ae5 100644
--- a/basicswap/__init__.py
+++ b/basicswap/__init__.py
@@ -1,3 +1,3 @@
 name = "basicswap"
 
-__version__ = "0.0.36"
+__version__ = "0.11.36"
diff --git a/basicswap/config.py b/basicswap/config.py
index 464634d..c16d18f 100644
--- a/basicswap/config.py
+++ b/basicswap/config.py
@@ -37,7 +37,7 @@ XMR_BINDIR = os.path.expanduser(os.getenv('XMR_BINDIR', os.path.join(DEFAULT_TES
 XMRD = os.getenv('XMRD', 'monerod' + bin_suffix)
 XMR_WALLET_RPC = os.getenv('XMR_WALLET_RPC', 'monero-wallet-rpc' + bin_suffix)
 
-PIVX_BINDIR = os.path.expanduser(os.getenv('PIVX_BINDIR', os.path.join(DEFAULT_TEST_BINDIR, 'namecoin')))
+PIVX_BINDIR = os.path.expanduser(os.getenv('PIVX_BINDIR', os.path.join(DEFAULT_TEST_BINDIR, 'pivx')))
 PIVXD = os.getenv('PIVXD', 'pivxd' + bin_suffix)
 PIVX_CLI = os.getenv('PIVX_CLI', 'pivx-cli' + bin_suffix)
 PIVX_TX = os.getenv('PIVX_TX', 'pivx-tx' + bin_suffix)
diff --git a/bin/basicswap_prepare.py b/bin/basicswap_prepare.py
index 32e872e..44b7f1c 100755
--- a/bin/basicswap_prepare.py
+++ b/bin/basicswap_prepare.py
@@ -46,8 +46,8 @@ MONERO_VERSION = os.getenv('MONERO_VERSION', '0.18.0.0')
 MONERO_VERSION_TAG = os.getenv('MONERO_VERSION_TAG', '')
 XMR_SITE_COMMIT = 'f093c0da2219d94e6bef5f3948ac61b4ecdcb95b'  # Lock hashes.txt to monero version
 
-PIVX_VERSION = os.getenv('PIVX_VERSION', '5.4.0')
-PIVX_VERSION_TAG = os.getenv('PIVX_VERSION_TAG', '')
+PIVX_VERSION = os.getenv('PIVX_VERSION', '5.4.99')
+PIVX_VERSION_TAG = os.getenv('PIVX_VERSION_TAG', '_scantxoutset')
 
 # version, version tag eg. "rc1", signers
 known_coins = {
@@ -56,7 +56,7 @@ known_coins = {
     'bitcoin': (BITCOIN_VERSION, BITCOIN_VERSION_TAG, ('laanwj',)),
     'namecoin': ('0.18.0', '', ('JeremyRand',)),
     'monero': (MONERO_VERSION, MONERO_VERSION_TAG, ('binaryfate',)),
-    'pivx': (PIVX_VERSION, PIVX_VERSION_TAG, ('fuzzbawls',)),
+    'pivx': (PIVX_VERSION, PIVX_VERSION_TAG, ('tecnovert',)),
 }
 
 expected_key_ids = {
@@ -315,7 +315,13 @@ def extractCore(coin, version_data, settings, bin_dir, release_path, extra_opts=
             for b in bins:
                 out_path = os.path.join(bin_dir, b)
                 if not os.path.exists(out_path) or extract_core_overwrite:
-                    with open(out_path, 'wb') as fout, ft.extractfile('{}-{}/bin/{}'.format(coin, version + version_tag, b)) as fi:
+
+                    if coin == 'pivx':
+                        filename = '{}-{}/bin/{}'.format(coin, version, b)
+                    else:
+                        filename = '{}-{}/bin/{}'.format(coin, version + version_tag, b)
+
+                    with open(out_path, 'wb') as fout, ft.extractfile(filename) as fi:
                         fout.write(fi.read())
                     try:
                         os.chmod(out_path, stat.S_IRWXU | stat.S_IXGRP | stat.S_IXOTH)
@@ -384,9 +390,10 @@ def prepareCore(coin, version_data, settings, data_dir, extra_opts={}):
             assert_filename = '{}-{}-{}-build.assert'.format(coin, os_name, version.rsplit('.', 1)[0])
             assert_url = 'https://raw.githubusercontent.com/namecoin/gitian.sigs/master/%s-%s/%s/%s' % (version, os_dir_name, signing_key_name, assert_filename)
         elif coin == 'pivx':
-            release_url = 'https://github.com/PIVX-Project/PIVX/releases/download/v{}/{}'.format(version + version_tag, release_filename)
-            assert_filename = '{}-{}-{}-build.assert'.format(coin, os_name, '.'.join(version.split('.')[:2]))
-            assert_url = 'https://raw.githubusercontent.com/PIVX-Project/gitian.sigs/master/%s-%s/%s/%s' % (version + version_tag, os_dir_name, signing_key_name.capitalize(), assert_filename)
+            release_filename = '{}-{}-{}{}.{}'.format(coin, version, BIN_ARCH, filename_extra, FILE_EXT)
+            release_url = 'https://github.com/tecnovert/particl-core/releases/download/v{}/{}'.format(version + version_tag, release_filename)
+            assert_filename = 'pivx-linux-6.0-build.assert'
+            assert_url = 'https://raw.githubusercontent.com/tecnovert/gitian.sigs/pivx/5.4.99_scantxoutset-linux/tecnovert/{}'.format(assert_filename)
         else:
             raise ValueError('Unknown coin')
 
@@ -457,7 +464,10 @@ def prepareCore(coin, version_data, settings, data_dir, extra_opts={}):
         if not isValidSignature(verified) and verified.username is None:
             logger.warning('Signature made by unknown key.')
 
-            filename = '{}_{}.pgp'.format(coin, signing_key_name)
+            if coin == 'pivx':
+                filename = '{}_{}.pgp'.format('particl', signing_key_name)
+            else:
+                filename = '{}_{}.pgp'.format(coin, signing_key_name)
             pubkeyurls = (
                 'https://raw.githubusercontent.com/tecnovert/basicswap/master/pgp/keys/' + filename,
                 'https://gitlab.com/particl/basicswap/-/raw/master/pgp/keys/' + filename,