diff --git a/net/net.sh b/net/net.sh
index 7005866cfb..9983901d92 100755
--- a/net/net.sh
+++ b/net/net.sh
@@ -106,6 +106,8 @@ Operate a configured testnet
                                       - Override the number of slots in an epoch
    --warp-slot WARP_SLOT
                                       - Boot from a snapshot that has warped ahead to WARP_SLOT rather than a slot 0 genesis.
+   --full-rpc
+                                      - Support full RPC services on all nodes
  sanity/start-specific options:
    -F                   - Discard validator nodes that didn't bootup successfully
    -o noInstallCheck    - Skip solana-install sanity
@@ -312,6 +314,7 @@ startBootstrapLeader() {
          \"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority $maybeAllowPrivateAddr $maybeAccountsDbSkipShrink $maybeSkipRequireTower\" \
          \"$gpuMode\" \
          \"$maybeWarpSlot\" \
+         \"$maybeFullRpc\" \
          \"$waitForNodeInit\" \
          \"$extraPrimordialStakes\" \
          \"$TMPFS_ACCOUNTS\" \
@@ -384,6 +387,7 @@ startNode() {
          \"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority $maybeAllowPrivateAddr $maybeAccountsDbSkipShrink $maybeSkipRequireTower\" \
          \"$gpuMode\" \
          \"$maybeWarpSlot\" \
+         \"$maybeFullRpc\" \
          \"$waitForNodeInit\" \
          \"$extraPrimordialStakes\" \
          \"$TMPFS_ACCOUNTS\" \
@@ -795,6 +799,7 @@ netemCommand="add"
 clientDelayStart=0
 netLogDir=
 maybeWarpSlot=
+maybeFullRpc=false
 waitForNodeInit=true
 extraPrimordialStakes=0
 
@@ -903,6 +908,9 @@ while [[ -n $1 ]]; do
     elif [[ $1 == --warp-slot ]]; then
       maybeWarpSlot="$1 $2"
       shift 2
+    elif [[ $1 == --full-rpc ]]; then
+      maybeFullRpc=true
+      shift 1
     elif [[ $1 == --async-node-init ]]; then
       waitForNodeInit=false
       shift 1
diff --git a/net/remote/remote-node.sh b/net/remote/remote-node.sh
index 6670977fb8..5cd4fb97b2 100755
--- a/net/remote/remote-node.sh
+++ b/net/remote/remote-node.sh
@@ -26,9 +26,10 @@ genesisOptions="${17}"
 extraNodeArgs="${18}"
 gpuMode="${19:-auto}"
 maybeWarpSlot="${20}"
-waitForNodeInit="${21}"
-extraPrimordialStakes="${22:=0}"
-tmpfsAccounts="${23:false}"
+maybeFullRpc="${21}"
+waitForNodeInit="${22}"
+extraPrimordialStakes="${23:=0}"
+tmpfsAccounts="${24:false}"
 set +x
 
 missing() {
@@ -286,6 +287,11 @@ EOF
       args+=(--accounts /mnt/solana-accounts)
     fi
 
+    if $maybeFullRpc; then
+      args+=(--enable-rpc-transaction-history)
+      args+=(--enable-cpi-and-log-storage)
+    fi
+
     if [[ $airdropsEnabled = true ]]; then
 cat >> ~/solana/on-reboot <<EOF
       ./multinode-demo/faucet.sh > faucet.log 2>&1 &
@@ -409,6 +415,11 @@ EOF
       args+=(--accounts /mnt/solana-accounts)
     fi
 
+    if $maybeFullRpc; then
+      args+=(--enable-rpc-transaction-history)
+      args+=(--enable-cpi-and-log-storage)
+    fi
+
 cat >> ~/solana/on-reboot <<EOF
     $maybeSkipAccountsCreation
     nohup multinode-demo/validator.sh ${args[@]} > validator.log.\$now 2>&1 &