diff --git a/contrib/docker/chaosnet.Dockerfile b/contrib/docker/chaosnet.Dockerfile
index 349823ec7..036b97f00 100644
--- a/contrib/docker/chaosnet.Dockerfile
+++ b/contrib/docker/chaosnet.Dockerfile
@@ -23,6 +23,7 @@ RUN apk --no-cache add \
 COPY --from=builder /nibiru/build/nibid /usr/local/bin/nibid
 
 COPY ./contrib/scripts/chaosnet.sh ./
+COPY ./contrib/scripts/feat-perp.sh ./
 RUN chmod +x ./chaosnet.sh
 ARG MNEMONIC
 ARG CHAIN_ID
diff --git a/contrib/scripts/chaosnet.sh b/contrib/scripts/chaosnet.sh
index 0dda670af..32ba318ff 100755
--- a/contrib/scripts/chaosnet.sh
+++ b/contrib/scripts/chaosnet.sh
@@ -44,7 +44,7 @@ add_genesis_param() {
   mv $HOME/.nibid/config/tmp_genesis.json $HOME/.nibid/config/genesis.json
 }
 
-curr_dir="$(dirname "$0")"
+curr_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 source "$curr_dir/feat-perp.sh"
 add_genesis_perp_markets_offline
 
diff --git a/contrib/scripts/e2e/localnet.sh b/contrib/scripts/e2e/localnet.sh
deleted file mode 100644
index 0fdb8ead0..000000000
--- a/contrib/scripts/e2e/localnet.sh
+++ /dev/null
@@ -1,240 +0,0 @@
-#!/bin/bash
-set -e
-
-# Console log text colour
-console_log_text_color() {
-  red=$(tput setaf 9)
-  green=$(tput setaf 10)
-  blue=$(tput setaf 12)
-  reset=$(tput sgr0)
-}
-
-if [ console_log_text_color ]; then
-  echo "successfully toggled console coloring"
-else
-  # For Ubuntu and Debian. MacOS has tput by default.
-  apt-get install libncurses5-dbg -y
-fi
-
-echo_info() {
-  echo "${blue}"
-  echo "$1"
-  echo "${reset}"
-}
-
-echo_error() {
-  echo "${red}"
-  echo "$1"
-  echo "${reset}"
-  exit 1
-}
-
-echo_success() {
-  echo "${green}"
-  echo "$1"
-  echo "${reset}"
-}
-
-# Set localnet settings
-BINARY="./nibid"
-CHAIN_ID="nibiru-localnet-0"
-RPC_PORT="26657"
-GRPC_PORT="9090"
-MNEMONIC="guard cream sadness conduct invite crumble clock pudding hole grit liar hotel maid produce squeeze return argue turtle know drive eight casino maze host"
-GENESIS_COINS="1000000000unibi,10000000000000unusd"
-CHAIN_DIR="$HOME/.nibid"
-
-# Stop nibid if it is already running
-if pgrep -x "$BINARY" >/dev/null; then
-  echo_error "Terminating $BINARY..."
-  killall nibid
-fi
-
-# Remove previous data
-echo_info "Removing previous chain data from $CHAIN_DIR..."
-rm -rf $CHAIN_DIR
-
-# Add directory for chain, exit if error
-if ! mkdir -p $CHAIN_DIR 2>/dev/null; then
-  echo_error "Failed to create chain folder. Aborting..."
-  exit 1
-fi
-
-# Initialize nibid with "localnet" chain id
-echo_info "Initializing $CHAIN_ID..."
-if $BINARY init nibiru-localnet-0 --chain-id $CHAIN_ID --overwrite; then
-  echo_success "Successfully initialized $CHAIN_ID"
-else
-  echo_error "Failed to initialize $CHAIN_ID"
-fi
-
-# Configure keyring-backend to "test"
-echo_info "Configuring keyring-backend..."
-if $BINARY config keyring-backend test; then
-  echo_success "Successfully configured keyring-backend"
-else
-  echo_error "Failed to configure keyring-backend"
-fi
-
-# Configure chain-id
-echo_info "Configuring chain-id..."
-if $BINARY config chain-id $CHAIN_ID; then
-  echo_success "Successfully configured chain-id"
-else
-  echo_error "Failed to configure chain-id"
-fi
-
-# Configure broadcast mode
-echo_info "Configuring broadcast mode..."
-if $BINARY config broadcast-mode block; then
-  echo_success "Successfully configured broadcast-mode"
-else
-  echo_error "Failed to configure broadcast mode"
-fi
-
-# Configure output mode
-echo_info "Configuring output mode..."
-if $BINARY config output json; then
-  echo_success "Successfully configured output mode"
-else
-  echo_error "Failed to configure output mode"
-fi
-
-# Enable API Server
-echo_info "Enabling API server"
-if sed -i $SEDOPTION '/\[api\]/,+3 s/enable = false/enable = true/' $CHAIN_DIR/config/app.toml; then
-  echo_success "Successfully enabled API server"
-else
-  echo_error "Failed to enable API server"
-fi
-
-# Enable Swagger Docs
-echo_info "Enabling Swagger Docs"
-if sed -i $SEDOPTION 's/swagger = false/swagger = true/' $CHAIN_DIR/config/app.toml; then
-  echo_success "Successfully enabled Swagger Docs"
-else
-  echo_error "Failed to enable Swagger Docs"
-fi
-
-# Enable CORS for localnet
-echo_info "Enabling CORS"
-if sed -i $SEDOPTION 's/enabled-unsafe-cors = false/enabled-unsafe-cors = true/' $CHAIN_DIR/config/app.toml; then
-  echo_success "Successfully enabled CORS"
-else
-  echo_error "Failed to enable CORS"
-fi
-
-echo_info "Adding genesis accounts..."
-echo "$MNEMONIC" | $BINARY keys add validator --recover
-if $BINARY add-genesis-account $($BINARY keys show validator -a) $GENESIS_COINS; then
-  echo_success "Successfully added genesis accounts"
-else
-  echo_error "Failed to add genesis accounts"
-fi
-
-echo_info "Adding gentx validator..."
-if $BINARY genesis gentx validator 900000000unibi --chain-id $CHAIN_ID; then
-  echo_success "Successfully added gentx"
-else
-  echo_error "Failed to add gentx"
-fi
-
-echo_info "Collecting gentx..."
-if $BINARY genesis collect-gentxs; then
-  echo_success "Successfully collected genesis txs into genesis.json"
-else
-  echo_error "Failed to collect genesis txs"
-fi
-
-# ------------------------------------------------------------------------
-# Configure genesis params
-# ------------------------------------------------------------------------
-
-# add_genesis_params runs a jq command to edit fields of the genesis.json .
-#
-# Args:
-#   $1 : the jq input that gets mapped to the json.
-add_genesis_param() {
-  echo "jq input $1"
-  # copy param ($1) to tmp_genesis.json
-  cat $CHAIN_DIR/config/genesis.json | jq "$1" >$CHAIN_DIR/config/tmp_genesis.json
-  # rewrite genesis.json with the contents of tmp_genesis.json
-  mv $CHAIN_DIR/config/tmp_genesis.json $CHAIN_DIR/config/genesis.json
-}
-
-echo_info "Configuring genesis params"
-
-add_genesis_perp_markets_with_coingecko_prices() {
-  local temp_json_fname="tmp_market_prices.json"
-  curl -X 'GET' \
-    'https://api.coingecko.com/api/v3/simple/price?ids=bitcoin%2Cethereum&vs_currencies=usd' \
-    -H 'accept: application/json' \
-    >$temp_json_fname
-
-  local M=1000000
-
-  local num_users=24000
-  local faucet_nusd_amt=100
-  local quote_amt=$(($num_users * $faucet_nusd_amt * $M))
-
-  price_btc=$(cat tmp_market_prices.json | jq -r '.bitcoin.usd')
-  price_btc=${price_btc%.*}
-  base_amt_btc=$(($quote_amt / $price_btc))
-
-  price_eth=$(cat tmp_market_prices.json | jq -r '.ethereum.usd')
-  price_eth=${price_eth%.*}
-  base_amt_eth=$(($quote_amt / $price_eth))
-
-  nibid add-genesis-perp-market --pair=ubtc:unusd --base-amt=$base_amt_btc --quote-amt=$quote_amt --max-leverage=12
-  nibid add-genesis-perp-market --pair=ueth:unusd --base-amt=$base_amt_eth --quote-amt=$quote_amt --max-leverage=20 --mmr=0.04
-
-  echo 'tmp_market_prices: '
-  cat $temp_json_fname | jq .
-  rm -f $temp_json_fname
-}
-
-add_genesis_perp_markets_default() {
-  # nibid add-genesis-perp-market [pair] [base-asset-reserve] [quote-asset-reserve] [trade-limit-ratio] [fluctuation-limit-ratio] [maxOracle-spread-ratio] [maintenance-margin-ratio] [max-leverage]
-  local KILO="000"
-  local MEGA="000000"
-  local quote_amt=10$KILO$MEGA
-  local base_amt_btc=$(($quote_amt / 16500))
-  local base_amt_eth=$(($quote_amt / 1200))
-  nibid add-genesis-perp-market --pair=ubtc:unusd --base-amt=$base_amt_btc --quote-amt=$quote_amt --max-leverage=12
-  nibid add-genesis-perp-market --pair=ueth:unusd --base-amt=$base_amt_eth --quote-amt=$quote_amt --max-leverage=20 --mmr=0.04
-}
-
-# x/perp/amm
-if add_genesis_perp_markets_with_coingecko_prices; then
-  echo_success "set perp markets with coingecko prices"
-elif add_genesis_perp_markets_default; then
-  echo_success "set perp markets with defaults"
-else
-  echo_error "failed to set genesis perp markets"
-fi
-
-# x/perp
-add_genesis_param '.app_state.perp.params.stopped = false'
-add_genesis_param '.app_state.perp.params.fee_pool_fee_ratio = "0.001"'
-add_genesis_param '.app_state.perp.params.ecosystem_fund_fee_ratio = "0.001"'
-add_genesis_param '.app_state.perp.params.liquidation_fee_ratio = "0.025"'
-add_genesis_param '.app_state.perp.params.partial_liquidation_ratio = "0.25"'
-add_genesis_param '.app_state.perp.params.funding_rate_interval = "30 min"'
-add_genesis_param '.app_state.perp.params.twap_lookback_window = "900s"'
-add_genesis_param '.app_state.perp.params.whitelisted_liquidators = ["nibi1zaavvzxez0elundtn32qnk9lkm8kmcsz44g7xl"]'
-add_genesis_param '.app_state.perp.pair_metadata[0].pair = "ubtc:unusd"'
-add_genesis_param '.app_state.perp.pair_metadata[0].latest_cumulative_premium_fraction = "0"'
-add_genesis_param '.app_state.perp.pair_metadata[1].pair = "ueth:unusd"'
-add_genesis_param '.app_state.perp.pair_metadata[1].latest_cumulative_premium_fraction = "0"'
-
-add_genesis_param '.app_state.oracle.params.twap_lookback_window = "900s"'
-add_genesis_param '.app_state.oracle.params.vote_period = "10"'
-add_genesis_param '.app_state.oracle.params.min_voters = "1"'
-add_genesis_param '.app_state.oracle.exchange_rates[0].pair = "ubtc:unusd"'
-add_genesis_param '.app_state.oracle.exchange_rates[0].exchange_rate = "20000"'
-add_genesis_param '.app_state.oracle.exchange_rates[1].pair = "ueth:unusd"'
-add_genesis_param '.app_state.oracle.exchange_rates[1].exchange_rate = "2000"'
-
-# Start the network
-echo_info "Starting $CHAIN_ID in $CHAIN_DIR..."
-$BINARY start &
diff --git a/contrib/scripts/localnet.sh b/contrib/scripts/localnet.sh
index 8c72c6de6..21ff0443f 100755
--- a/contrib/scripts/localnet.sh
+++ b/contrib/scripts/localnet.sh
@@ -74,9 +74,6 @@ build_from_source() {
   fi
 }
 
-# Initialize an associative array for feature flags with default values
-declare -A features=( ["perp"]=0 ["spot"]=0 )
-
 # enable_feature_flag: Enables feature flags variables if present
 enable_feature_flag() {
   case $1 in
@@ -197,7 +194,7 @@ add_genesis_param() {
 echo_info "Configuring genesis params"
 
 if $FLAG_PERP; then
-  local curr_dir="$(dirname "$0")"
+  curr_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
   source "$curr_dir/feat-perp.sh"
 
   if add_genesis_perp_markets_with_coingecko_prices; then
diff --git a/justfile b/justfile
index f48140d06..9c4a02662 100644
--- a/justfile
+++ b/justfile
@@ -61,6 +61,10 @@ test-chaosnet:
   which_ok nibid
   bash contrib/scripts/chaosnet.sh 
 
+# Stops any `nibid` processes, even if they're running in the background.
+stop: 
+  kill $(pgrep -x nibid) || true
+
 # Runs golang formatter (gofumpt)
 fmt:
   gofumpt -w x app