diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e8146b805..939ce1a40 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -67,9 +67,6 @@ jobs:
         - target: riscv64gc-unknown-linux-gnu
           os: ubuntu-latest
           rust: nightly-2024-11-01
-        - target: sbf-solana-solana
-          os: ubuntu-latest
-          rust: nightly-2024-11-01
         - target: sbpf-solana-solana
           os: ubuntu-latest
           rust: nightly-2024-11-01
@@ -127,7 +124,7 @@ jobs:
       run: rustup update ${{ matrix.rust }} --no-self-update && rustup default ${{ matrix.rust }}
       shell: bash
     - run: rustup target add ${{ matrix.target }}
-      if: ${{ !startsWith(matrix.target, 'sbf') && !startsWith(matrix.target, 'sbpf') }}
+      if: ${{ !startsWith(matrix.target, 'sbpf') }}
     - run: rustup component add llvm-tools-preview
     - uses: Swatinem/rust-cache@v2
       with:
diff --git a/ci/docker/sbf-solana-solana/Dockerfile b/ci/docker/sbf-solana-solana/Dockerfile
deleted file mode 100644
index 13c838ba8..000000000
--- a/ci/docker/sbf-solana-solana/Dockerfile
+++ /dev/null
@@ -1,25 +0,0 @@
-FROM ubuntu:22.04
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-    curl \
-    gcc libc6-dev ca-certificates bzip2 \
-    libssl-dev pkg-config
-
-ENV RUSTUP_INIT_SKIP_PATH_CHECK="yes"
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y -v --no-modify-path
-RUN cp ${HOME}/.cargo/bin/* /usr/local/bin/
-
-RUN cargo install --git https://github.com/anza-xyz/cargo-run-solana-tests.git \
-    --rev c5df324a62a5e03d2ff5f9efbdbf5a4e4182325e \
-    --bin cargo-run-solana-tests --root /usr/local
-
-RUN mkdir -p /tmp/.cache/solana/v1.47/platform-tools
-RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/anza-xyz/platform-tools/releases/download/v1.47/platform-tools-linux-x86_64.tar.bz2
-RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.47/platform-tools
-RUN rustup toolchain link solana /tmp/.cache/solana/v1.47/platform-tools/rust
-RUN cp -R ${HOME}/.rustup /tmp/
-
-ENV CARGO_TARGET_SBF_SOLANA_SOLANA_RUNNER="cargo-run-solana-tests --heap-size 104857600"
-ENV LLVM_HOME="/tmp/.cache/solana/v1.47/platform-tools/llvm"
-ENV CC="/tmp/.cache/solana/v1.47/platform-tools/llvm/bin/clang"
-ENV RUSTUP_TOOLCHAIN="solana"
diff --git a/ci/docker/sbpf-solana-solana/Dockerfile b/ci/docker/sbpf-solana-solana/Dockerfile
index 8ed3f6f45..e1e2bf607 100644
--- a/ci/docker/sbpf-solana-solana/Dockerfile
+++ b/ci/docker/sbpf-solana-solana/Dockerfile
@@ -10,16 +10,16 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y -v -
 RUN cp ${HOME}/.cargo/bin/* /usr/local/bin/
 
 RUN cargo install --git https://github.com/anza-xyz/cargo-run-solana-tests.git \
-    --rev c5df324a62a5e03d2ff5f9efbdbf5a4e4182325e \
+    --rev 2ff58e81919c5c6580620f4b1f0e37777ef6787f \
     --bin cargo-run-solana-tests --root /usr/local
 
-RUN mkdir -p /tmp/.cache/solana/v1.47/platform-tools
-RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/anza-xyz/platform-tools/releases/download/v1.47/platform-tools-linux-x86_64.tar.bz2
-RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.47/platform-tools
-RUN rustup toolchain link solana /tmp/.cache/solana/v1.47/platform-tools/rust
+RUN mkdir -p /tmp/.cache/solana/v1.50/platform-tools
+RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/anza-xyz/platform-tools/releases/download/v1.50/platform-tools-linux-x86_64.tar.bz2
+RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.50/platform-tools
+RUN rustup toolchain link solana /tmp/.cache/solana/v1.50/platform-tools/rust
 RUN cp -R ${HOME}/.rustup /tmp/
 
 ENV CARGO_TARGET_SBPF_SOLANA_SOLANA_RUNNER="cargo-run-solana-tests --heap-size 104857600"
-ENV LLVM_HOME="/tmp/.cache/solana/v1.47/platform-tools/llvm"
-ENV CC="/tmp/.cache/solana/v1.47/platform-tools/llvm/bin/clang"
+ENV LLVM_HOME="/tmp/.cache/solana/v1.50/platform-tools/llvm"
+ENV CC="/tmp/.cache/solana/v1.50/platform-tools/llvm/bin/clang"
 ENV RUSTUP_TOOLCHAIN="solana"
diff --git a/ci/docker/sbpfv1-solana-solana/Dockerfile b/ci/docker/sbpfv1-solana-solana/Dockerfile
index 08243c1b5..4937bd0bd 100644
--- a/ci/docker/sbpfv1-solana-solana/Dockerfile
+++ b/ci/docker/sbpfv1-solana-solana/Dockerfile
@@ -10,16 +10,16 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y -v -
 RUN cp ${HOME}/.cargo/bin/* /usr/local/bin/
 
 RUN cargo install --git https://github.com/anza-xyz/cargo-run-solana-tests.git \
-    --rev c5df324a62a5e03d2ff5f9efbdbf5a4e4182325e \
+    --rev 2ff58e81919c5c6580620f4b1f0e37777ef6787f \
     --bin cargo-run-solana-tests --root /usr/local
 
-RUN mkdir -p /tmp/.cache/solana/v1.47/platform-tools
-RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/anza-xyz/platform-tools/releases/download/v1.47/platform-tools-linux-x86_64.tar.bz2
-RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.47/platform-tools
-RUN rustup toolchain link solana /tmp/.cache/solana/v1.47/platform-tools/rust
+RUN mkdir -p /tmp/.cache/solana/v1.50/platform-tools
+RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/anza-xyz/platform-tools/releases/download/v1.50/platform-tools-linux-x86_64.tar.bz2
+RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.50/platform-tools
+RUN rustup toolchain link solana /tmp/.cache/solana/v1.50/platform-tools/rust
 RUN cp -R ${HOME}/.rustup /tmp/
 
 ENV CARGO_TARGET_SBPFV1_SOLANA_SOLANA_RUNNER="cargo-run-solana-tests --heap-size 104857600"
-ENV LLVM_HOME="/tmp/.cache/solana/v1.47/platform-tools/llvm"
-ENV CC="/tmp/.cache/solana/v1.47/platform-tools/llvm/bin/clang"
+ENV LLVM_HOME="/tmp/.cache/solana/v1.50/platform-tools/llvm"
+ENV CC="/tmp/.cache/solana/v1.50/platform-tools/llvm/bin/clang"
 ENV RUSTUP_TOOLCHAIN="solana"
diff --git a/ci/docker/sbpfv2-solana-solana/Dockerfile b/ci/docker/sbpfv2-solana-solana/Dockerfile
index b2d6b8eea..04c2e4520 100644
--- a/ci/docker/sbpfv2-solana-solana/Dockerfile
+++ b/ci/docker/sbpfv2-solana-solana/Dockerfile
@@ -10,16 +10,16 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y -v -
 RUN cp ${HOME}/.cargo/bin/* /usr/local/bin/
 
 RUN cargo install --git https://github.com/anza-xyz/cargo-run-solana-tests.git \
-    --rev c5df324a62a5e03d2ff5f9efbdbf5a4e4182325e \
+    --rev 2ff58e81919c5c6580620f4b1f0e37777ef6787f \
     --bin cargo-run-solana-tests --root /usr/local
 
-RUN mkdir -p /tmp/.cache/solana/v1.47/platform-tools
-RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/anza-xyz/platform-tools/releases/download/v1.47/platform-tools-linux-x86_64.tar.bz2
-RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.47/platform-tools
-RUN rustup toolchain link solana /tmp/.cache/solana/v1.47/platform-tools/rust
+RUN mkdir -p /tmp/.cache/solana/v1.50/platform-tools
+RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/anza-xyz/platform-tools/releases/download/v1.50/platform-tools-linux-x86_64.tar.bz2
+RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.50/platform-tools
+RUN rustup toolchain link solana /tmp/.cache/solana/v1.50/platform-tools/rust
 RUN cp -R ${HOME}/.rustup /tmp/
 
 ENV CARGO_TARGET_SBPFV2_SOLANA_SOLANA_RUNNER="cargo-run-solana-tests --heap-size 104857600"
-ENV LLVM_HOME="/tmp/.cache/solana/v1.47/platform-tools/llvm"
-ENV CC="/tmp/.cache/solana/v1.47/platform-tools/llvm/bin/clang"
+ENV LLVM_HOME="/tmp/.cache/solana/v1.50/platform-tools/llvm"
+ENV CC="/tmp/.cache/solana/v1.50/platform-tools/llvm/bin/clang"
 ENV RUSTUP_TOOLCHAIN="solana"
diff --git a/ci/docker/sbpfv3-solana-solana/Dockerfile b/ci/docker/sbpfv3-solana-solana/Dockerfile
index bdab73ee5..7f5ee1fb5 100644
--- a/ci/docker/sbpfv3-solana-solana/Dockerfile
+++ b/ci/docker/sbpfv3-solana-solana/Dockerfile
@@ -10,16 +10,16 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y -v -
 RUN cp ${HOME}/.cargo/bin/* /usr/local/bin/
 
 RUN cargo install --git https://github.com/anza-xyz/cargo-run-solana-tests.git \
-    --rev c5df324a62a5e03d2ff5f9efbdbf5a4e4182325e \
+    --rev 2ff58e81919c5c6580620f4b1f0e37777ef6787f \
     --bin cargo-run-solana-tests --root /usr/local
 
-RUN mkdir -p /tmp/.cache/solana/v1.47/platform-tools
-RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/anza-xyz/platform-tools/releases/download/v1.47/platform-tools-linux-x86_64.tar.bz2
-RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.47/platform-tools
-RUN rustup toolchain link solana /tmp/.cache/solana/v1.47/platform-tools/rust
+RUN mkdir -p /tmp/.cache/solana/v1.50/platform-tools
+RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/anza-xyz/platform-tools/releases/download/v1.50/platform-tools-linux-x86_64.tar.bz2
+RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.50/platform-tools
+RUN rustup toolchain link solana /tmp/.cache/solana/v1.50/platform-tools/rust
 RUN cp -R ${HOME}/.rustup /tmp/
 
 ENV CARGO_TARGET_SBPFV3_SOLANA_SOLANA_RUNNER="cargo-run-solana-tests --heap-size 104857600"
-ENV LLVM_HOME="/tmp/.cache/solana/v1.47/platform-tools/llvm"
-ENV CC="/tmp/.cache/solana/v1.47/platform-tools/llvm/bin/clang"
+ENV LLVM_HOME="/tmp/.cache/solana/v1.50/platform-tools/llvm"
+ENV CC="/tmp/.cache/solana/v1.50/platform-tools/llvm/bin/clang"
 ENV RUSTUP_TOOLCHAIN="solana"
diff --git a/ci/run.sh b/ci/run.sh
index 9767a5a6d..2f4d1999d 100755
--- a/ci/run.sh
+++ b/ci/run.sh
@@ -25,7 +25,7 @@ if [ "${NO_STD:-}" = "1" ]; then
 else
     run="cargo test --manifest-path testcrate/Cargo.toml --no-fail-fast --target $target"
 
-    if [[ ! "$target" =~ ^sbf && ! "$target" =~ ^sbpf- && ! "$target" =~ ^sbpfv3- ]]; then
+    if [[ ! "$target" =~ ^sbf && ! "$target" =~ ^sbpf- ]]; then
       # Not using release mode causes a stack overflow in SBPFv0
       # There is a bug in SBPFv3 whereby we were not adding returns to -O0 code
       $run