diff --git a/.gitignore b/.gitignore
index d5aa4502c..55e3bad67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,10 +17,9 @@
 # ignore vscode settings
 .vscode
 
-**/__pycache__
-
 **/node_modules
 
 runtimes/spiritnet/src/xcm_tests/e2e/out
 
-*.db.sqlite*
+chopsticks/**/db.sqlite*
+chopsticks/**/extra.yaml
diff --git a/chopsticks/package.json b/chopsticks/package.json
index 755be5d56..ae3612ff3 100644
--- a/chopsticks/package.json
+++ b/chopsticks/package.json
@@ -20,7 +20,7 @@
     "internal:spiritnet:ah-setup": "yarn --silent yaml-merge runtimes/spiritnet/ah/config.yaml runtimes/spiritnet/ah/extra.yaml > runtimes/spiritnet/ah/.tmp.yaml",
     "internal:spiritnet:ah-teardown": "rm runtimes/spiritnet/ah/.tmp.yaml",
     "preperegrine:spawn": "yarn internal:peregrine:relay-setup && yarn internal:peregrine:kilt-setup && yarn internal:peregrine:ah-setup",
-    "peregrine:spawn": "trap 'yarn cleanup:peregrine' INT; yarn chopsticks xcm -r runtimes/peregrine/relay/.tmp.yaml -p runtimes/peregrine/kilt/.tmp.yaml -p runtimes/peregrine/ah/.tmp.yaml",
+    "peregrine:spawn": "trap 'yarn peregrine:cleanup' INT; yarn chopsticks xcm -r runtimes/peregrine/relay/.tmp.yaml -p runtimes/peregrine/kilt/.tmp.yaml -p runtimes/peregrine/ah/.tmp.yaml",
     "peregrine:cleanup": "yarn internal:peregrine:relay-teardown && yarn internal:peregrine:kilt-teardown && yarn internal:peregrine:ah-teardown",
     "prespiritnet:spawn": "yarn internal:spiritnet:relay-setup && yarn internal:spiritnet:kilt-setup && yarn internal:spiritnet:ah-setup",
     "spiritnet:spawn": "trap 'yarn cleanup:spiritnet' INT; yarn chopsticks xcm -r runtimes/spiritnet/relay/.tmp.yaml -p runtimes/spiritnet/kilt/.tmp.yaml -p runtimes/peregrine/ah/.tmp.yaml",
diff --git a/chopsticks/runtimes/spiritnet/ah/config.yaml b/chopsticks/runtimes/spiritnet/ah/config.yaml
index b5d101cb0..590b4b9f9 100644
--- a/chopsticks/runtimes/spiritnet/ah/config.yaml
+++ b/chopsticks/runtimes/spiritnet/ah/config.yaml
@@ -1,4 +1,4 @@
 endpoint:
-    - wss://sys.ibp.network/asset-hub-paseo
-    - wss://asset-hub-paseo.dotters.network
-db: db/peregrine/ah/db.sqlite
+    - wss://sys.ibp.network/asset-hub-polkadot
+    - wss://asset-hub-polkadot.dotters.network
+db: db/spiritnet/ah/db.sqlite
diff --git a/chopsticks/runtimes/spiritnet/kilt/config.yaml b/chopsticks/runtimes/spiritnet/kilt/config.yaml
index a95d39453..f58221ac6 100644
--- a/chopsticks/runtimes/spiritnet/kilt/config.yaml
+++ b/chopsticks/runtimes/spiritnet/kilt/config.yaml
@@ -1,3 +1,3 @@
 endpoint:
-    - wss://peregrine.kilt.io
-db: db/peregrine/kilt/db.sqlite
+    - wss://spiritnet.kilt.io
+db: db/spiritnet/kilt/db.sqlite
diff --git a/chopsticks/runtimes/spiritnet/relay/config.yaml b/chopsticks/runtimes/spiritnet/relay/config.yaml
index 4ff839c49..bba0d2a3a 100644
--- a/chopsticks/runtimes/spiritnet/relay/config.yaml
+++ b/chopsticks/runtimes/spiritnet/relay/config.yaml
@@ -1,4 +1,4 @@
 endpoint:
-    - wss://rpc.ibp.network/paseo
-    - wss://paseo.dotters.network
-db: db/peregrine/relay/db.sqlite
+    - wss://rpc.ibp.network/polkadot
+    - wss://polkadot.dotters.network
+db: db/spiritnet/relay/db.sqlite