diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index f39a274..189cbad 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -26,8 +26,14 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install dependencies
-        run: sudo apt install -y pkg-config libudev-dev
+      - name: Update apt indexes
+        run: |
+          sudo apt-get update -o Acquire::Retries=3
+
+      - name: Install build deps
+        run: |
+          sudo DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+            pkg-config libudev-dev
 
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
diff --git a/docker/v1.18.24.Dockerfile b/docker/v1.18.24.Dockerfile
index 3b5a996..bb9c575 100644
--- a/docker/v1.18.24.Dockerfile
+++ b/docker/v1.18.24.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:b7b25312e49dfbe6cab04c89d5a8ed5df2df9714
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v1.18.24/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v1.18.25.Dockerfile b/docker/v1.18.25.Dockerfile
index 14e3526..1198c93 100644
--- a/docker/v1.18.25.Dockerfile
+++ b/docker/v1.18.25.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:b7b25312e49dfbe6cab04c89d5a8ed5df2df9714
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v1.18.25/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v1.18.26.Dockerfile b/docker/v1.18.26.Dockerfile
index b922024..e647aaf 100644
--- a/docker/v1.18.26.Dockerfile
+++ b/docker/v1.18.26.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:b7b25312e49dfbe6cab04c89d5a8ed5df2df9714
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v1.18.26/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.0.0.Dockerfile b/docker/v2.0.0.Dockerfile
index 409dcb3..075ec64 100644
--- a/docker/v2.0.0.Dockerfile
+++ b/docker/v2.0.0.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:653bd24b9a8f9800c67df55fea5637a97152153f
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.0.0/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.0.1.Dockerfile b/docker/v2.0.1.Dockerfile
index 2b3ff36..2bbc020 100644
--- a/docker/v2.0.1.Dockerfile
+++ b/docker/v2.0.1.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:653bd24b9a8f9800c67df55fea5637a97152153f
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.0.1/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.0.10.Dockerfile b/docker/v2.0.10.Dockerfile
index 3a5163c..394cf93 100644
--- a/docker/v2.0.10.Dockerfile
+++ b/docker/v2.0.10.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:653bd24b9a8f9800c67df55fea5637a97152153f
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.0.10/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.0.11.Dockerfile b/docker/v2.0.11.Dockerfile
index 896a1d7..3ac156f 100644
--- a/docker/v2.0.11.Dockerfile
+++ b/docker/v2.0.11.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:653bd24b9a8f9800c67df55fea5637a97152153f
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.0.11/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.0.12.Dockerfile b/docker/v2.0.12.Dockerfile
index 02ec14a..6ea85e0 100644
--- a/docker/v2.0.12.Dockerfile
+++ b/docker/v2.0.12.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:653bd24b9a8f9800c67df55fea5637a97152153f
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.0.12/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.0.13.Dockerfile b/docker/v2.0.13.Dockerfile
index 2881b63..8a951bf 100644
--- a/docker/v2.0.13.Dockerfile
+++ b/docker/v2.0.13.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:653bd24b9a8f9800c67df55fea5637a97152153f
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.0.13/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.0.14.Dockerfile b/docker/v2.0.14.Dockerfile
index 591cbde..246bd01 100644
--- a/docker/v2.0.14.Dockerfile
+++ b/docker/v2.0.14.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:653bd24b9a8f9800c67df55fea5637a97152153f
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.0.14/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.0.15.Dockerfile b/docker/v2.0.15.Dockerfile
index 03d9f2e..14a8f4a 100644
--- a/docker/v2.0.15.Dockerfile
+++ b/docker/v2.0.15.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:653bd24b9a8f9800c67df55fea5637a97152153f
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.0.15/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.0.16.Dockerfile b/docker/v2.0.16.Dockerfile
index d0a5016..d2d8e90 100644
--- a/docker/v2.0.16.Dockerfile
+++ b/docker/v2.0.16.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:653bd24b9a8f9800c67df55fea5637a97152153f
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.0.16/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.0.17.Dockerfile b/docker/v2.0.17.Dockerfile
index e61e8d4..ff0c916 100644
--- a/docker/v2.0.17.Dockerfile
+++ b/docker/v2.0.17.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:653bd24b9a8f9800c67df55fea5637a97152153f
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.0.17/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.0.18.Dockerfile b/docker/v2.0.18.Dockerfile
index 2846e3d..e1c5d3f 100644
--- a/docker/v2.0.18.Dockerfile
+++ b/docker/v2.0.18.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:653bd24b9a8f9800c67df55fea5637a97152153f
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.0.18/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.0.19.Dockerfile b/docker/v2.0.19.Dockerfile
index 790c871..58c7d19 100644
--- a/docker/v2.0.19.Dockerfile
+++ b/docker/v2.0.19.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:653bd24b9a8f9800c67df55fea5637a97152153f
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.0.19/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.0.2.Dockerfile b/docker/v2.0.2.Dockerfile
index 812b02b..ff6ba84 100644
--- a/docker/v2.0.2.Dockerfile
+++ b/docker/v2.0.2.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:653bd24b9a8f9800c67df55fea5637a97152153f
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.0.2/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.0.20.Dockerfile b/docker/v2.0.20.Dockerfile
index a746e32..8bd086c 100644
--- a/docker/v2.0.20.Dockerfile
+++ b/docker/v2.0.20.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:653bd24b9a8f9800c67df55fea5637a97152153f
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.0.20/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.0.21.Dockerfile b/docker/v2.0.21.Dockerfile
index e9a82c8..72ac7b5 100644
--- a/docker/v2.0.21.Dockerfile
+++ b/docker/v2.0.21.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:653bd24b9a8f9800c67df55fea5637a97152153f
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.0.21/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.0.22.Dockerfile b/docker/v2.0.22.Dockerfile
index 52bd2a8..f23cb50 100644
--- a/docker/v2.0.22.Dockerfile
+++ b/docker/v2.0.22.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:653bd24b9a8f9800c67df55fea5637a97152153f
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.0.22/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.0.23.Dockerfile b/docker/v2.0.23.Dockerfile
index a0f2447..90e1392 100644
--- a/docker/v2.0.23.Dockerfile
+++ b/docker/v2.0.23.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:653bd24b9a8f9800c67df55fea5637a97152153f
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.0.23/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.0.24.Dockerfile b/docker/v2.0.24.Dockerfile
index 481226d..35615aa 100644
--- a/docker/v2.0.24.Dockerfile
+++ b/docker/v2.0.24.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:653bd24b9a8f9800c67df55fea5637a97152153f
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.0.24/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.0.25.Dockerfile b/docker/v2.0.25.Dockerfile
index 989f9ab..b02edb4 100644
--- a/docker/v2.0.25.Dockerfile
+++ b/docker/v2.0.25.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:653bd24b9a8f9800c67df55fea5637a97152153f
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.0.25/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.0.3.Dockerfile b/docker/v2.0.3.Dockerfile
index a1a6d6e..d321263 100644
--- a/docker/v2.0.3.Dockerfile
+++ b/docker/v2.0.3.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:653bd24b9a8f9800c67df55fea5637a97152153f
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.0.3/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.0.4.Dockerfile b/docker/v2.0.4.Dockerfile
index f6062b2..0486aeb 100644
--- a/docker/v2.0.4.Dockerfile
+++ b/docker/v2.0.4.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:653bd24b9a8f9800c67df55fea5637a97152153f
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.0.4/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.0.5.Dockerfile b/docker/v2.0.5.Dockerfile
index 619c02a..aa200a6 100644
--- a/docker/v2.0.5.Dockerfile
+++ b/docker/v2.0.5.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:653bd24b9a8f9800c67df55fea5637a97152153f
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.0.5/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.0.6.Dockerfile b/docker/v2.0.6.Dockerfile
index aed224d..b4159ad 100644
--- a/docker/v2.0.6.Dockerfile
+++ b/docker/v2.0.6.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:653bd24b9a8f9800c67df55fea5637a97152153f
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.0.6/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.0.7.Dockerfile b/docker/v2.0.7.Dockerfile
deleted file mode 100644
index 2d48ba6..0000000
--- a/docker/v2.0.7.Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM --platform=linux/amd64 rust@sha256:653bd24b9a8f9800c67df55fea5637a97152153fd744a4ef78dd41f7ddc40144
-
-RUN apt-get update && apt-get install -qy git gnutls-bin
-RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.0.7/install)"
-ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
-WORKDIR /build
-
-CMD /bin/bash
diff --git a/docker/v2.0.8.Dockerfile b/docker/v2.0.8.Dockerfile
index 91ee898..5fbb5a2 100644
--- a/docker/v2.0.8.Dockerfile
+++ b/docker/v2.0.8.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:653bd24b9a8f9800c67df55fea5637a97152153f
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.0.8/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.0.9.Dockerfile b/docker/v2.0.9.Dockerfile
index cc992b7..d02b17c 100644
--- a/docker/v2.0.9.Dockerfile
+++ b/docker/v2.0.9.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:653bd24b9a8f9800c67df55fea5637a97152153f
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.0.9/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.1.0.Dockerfile b/docker/v2.1.0.Dockerfile
index 6458771..2c2308e 100644
--- a/docker/v2.1.0.Dockerfile
+++ b/docker/v2.1.0.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:62afc139057dc9d3eda02e490677911b55a208ba
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.1.0/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.1.1.Dockerfile b/docker/v2.1.1.Dockerfile
index 80659e0..dde51ba 100644
--- a/docker/v2.1.1.Dockerfile
+++ b/docker/v2.1.1.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:62afc139057dc9d3eda02e490677911b55a208ba
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.1.1/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.1.10.Dockerfile b/docker/v2.1.10.Dockerfile
index 5103b6f..91636e8 100644
--- a/docker/v2.1.10.Dockerfile
+++ b/docker/v2.1.10.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:62afc139057dc9d3eda02e490677911b55a208ba
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.1.10/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.1.11.Dockerfile b/docker/v2.1.11.Dockerfile
index b8a3f1b..ef54916 100644
--- a/docker/v2.1.11.Dockerfile
+++ b/docker/v2.1.11.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:62afc139057dc9d3eda02e490677911b55a208ba
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.1.11/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.1.12.Dockerfile b/docker/v2.1.12.Dockerfile
index 7a07b46..c157790 100644
--- a/docker/v2.1.12.Dockerfile
+++ b/docker/v2.1.12.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:62afc139057dc9d3eda02e490677911b55a208ba
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.1.12/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.1.13.Dockerfile b/docker/v2.1.13.Dockerfile
index 206cc73..d9ec90a 100644
--- a/docker/v2.1.13.Dockerfile
+++ b/docker/v2.1.13.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:62afc139057dc9d3eda02e490677911b55a208ba
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.1.13/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.1.14.Dockerfile b/docker/v2.1.14.Dockerfile
index 3f7da9b..1f7cdb1 100644
--- a/docker/v2.1.14.Dockerfile
+++ b/docker/v2.1.14.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:62afc139057dc9d3eda02e490677911b55a208ba
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.1.14/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.1.15.Dockerfile b/docker/v2.1.15.Dockerfile
index 4d164bf..5d52aa1 100644
--- a/docker/v2.1.15.Dockerfile
+++ b/docker/v2.1.15.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:62afc139057dc9d3eda02e490677911b55a208ba
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.1.15/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.1.16.Dockerfile b/docker/v2.1.16.Dockerfile
index 46f5320..6c19e2b 100644
--- a/docker/v2.1.16.Dockerfile
+++ b/docker/v2.1.16.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:62afc139057dc9d3eda02e490677911b55a208ba
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.1.16/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.1.17.Dockerfile b/docker/v2.1.17.Dockerfile
index 3a7f38a..b6c8d88 100644
--- a/docker/v2.1.17.Dockerfile
+++ b/docker/v2.1.17.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:62afc139057dc9d3eda02e490677911b55a208ba
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.1.17/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.1.18.Dockerfile b/docker/v2.1.18.Dockerfile
index 7fa4d4f..1129cba 100644
--- a/docker/v2.1.18.Dockerfile
+++ b/docker/v2.1.18.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:62afc139057dc9d3eda02e490677911b55a208ba
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.1.18/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.1.19.Dockerfile b/docker/v2.1.19.Dockerfile
index 4efed09..83961bf 100644
--- a/docker/v2.1.19.Dockerfile
+++ b/docker/v2.1.19.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:62afc139057dc9d3eda02e490677911b55a208ba
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.1.19/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.1.2.Dockerfile b/docker/v2.1.2.Dockerfile
index ff28612..33351d6 100644
--- a/docker/v2.1.2.Dockerfile
+++ b/docker/v2.1.2.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:62afc139057dc9d3eda02e490677911b55a208ba
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.1.2/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.1.20.Dockerfile b/docker/v2.1.20.Dockerfile
index 7c98520..fee76b1 100644
--- a/docker/v2.1.20.Dockerfile
+++ b/docker/v2.1.20.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:62afc139057dc9d3eda02e490677911b55a208ba
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.1.20/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.1.21.Dockerfile b/docker/v2.1.21.Dockerfile
index 3a6b619..8b188b1 100644
--- a/docker/v2.1.21.Dockerfile
+++ b/docker/v2.1.21.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:62afc139057dc9d3eda02e490677911b55a208ba
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.1.21/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.1.3.Dockerfile b/docker/v2.1.3.Dockerfile
index bc7c1db..2d3bba5 100644
--- a/docker/v2.1.3.Dockerfile
+++ b/docker/v2.1.3.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:62afc139057dc9d3eda02e490677911b55a208ba
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.1.3/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.1.4.Dockerfile b/docker/v2.1.4.Dockerfile
index 81c9086..6039675 100644
--- a/docker/v2.1.4.Dockerfile
+++ b/docker/v2.1.4.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:62afc139057dc9d3eda02e490677911b55a208ba
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.1.4/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.1.5.Dockerfile b/docker/v2.1.5.Dockerfile
index d4e304a..4681344 100644
--- a/docker/v2.1.5.Dockerfile
+++ b/docker/v2.1.5.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:62afc139057dc9d3eda02e490677911b55a208ba
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.1.5/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.1.6.Dockerfile b/docker/v2.1.6.Dockerfile
index d846d43..db5a49d 100644
--- a/docker/v2.1.6.Dockerfile
+++ b/docker/v2.1.6.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:62afc139057dc9d3eda02e490677911b55a208ba
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.1.6/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.1.7.Dockerfile b/docker/v2.1.7.Dockerfile
index c782a5e..ee8e343 100644
--- a/docker/v2.1.7.Dockerfile
+++ b/docker/v2.1.7.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:62afc139057dc9d3eda02e490677911b55a208ba
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.1.7/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.1.8.Dockerfile b/docker/v2.1.8.Dockerfile
index 5d28005..f2f2e17 100644
--- a/docker/v2.1.8.Dockerfile
+++ b/docker/v2.1.8.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:62afc139057dc9d3eda02e490677911b55a208ba
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.1.8/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.1.9.Dockerfile b/docker/v2.1.9.Dockerfile
index 271a898..b042910 100644
--- a/docker/v2.1.9.Dockerfile
+++ b/docker/v2.1.9.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:62afc139057dc9d3eda02e490677911b55a208ba
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.1.9/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.2.0.Dockerfile b/docker/v2.2.0.Dockerfile
index 5ab49b9..8fbeb43 100644
--- a/docker/v2.2.0.Dockerfile
+++ b/docker/v2.2.0.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:479476fa1dec14dfa9ed2dbcaa94cda5ab945e12
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.2.0/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.2.1.Dockerfile b/docker/v2.2.1.Dockerfile
index 4df63b3..01bd352 100644
--- a/docker/v2.2.1.Dockerfile
+++ b/docker/v2.2.1.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:479476fa1dec14dfa9ed2dbcaa94cda5ab945e12
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.2.1/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.2.10.Dockerfile b/docker/v2.2.10.Dockerfile
index 8a265cc..1790578 100644
--- a/docker/v2.2.10.Dockerfile
+++ b/docker/v2.2.10.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:479476fa1dec14dfa9ed2dbcaa94cda5ab945e12
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.2.10/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.2.11.Dockerfile b/docker/v2.2.11.Dockerfile
index 1c8f328..f4094b7 100644
--- a/docker/v2.2.11.Dockerfile
+++ b/docker/v2.2.11.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:479476fa1dec14dfa9ed2dbcaa94cda5ab945e12
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.2.11/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.2.12.Dockerfile b/docker/v2.2.12.Dockerfile
index 5a17cbd..a816297 100644
--- a/docker/v2.2.12.Dockerfile
+++ b/docker/v2.2.12.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:479476fa1dec14dfa9ed2dbcaa94cda5ab945e12
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.2.12/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.2.13.Dockerfile b/docker/v2.2.13.Dockerfile
index 56749fa..091ddb0 100644
--- a/docker/v2.2.13.Dockerfile
+++ b/docker/v2.2.13.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:479476fa1dec14dfa9ed2dbcaa94cda5ab945e12
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.2.13/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.2.14.Dockerfile b/docker/v2.2.14.Dockerfile
index d904715..a2a7dd5 100644
--- a/docker/v2.2.14.Dockerfile
+++ b/docker/v2.2.14.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:479476fa1dec14dfa9ed2dbcaa94cda5ab945e12
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.2.14/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.2.15.Dockerfile b/docker/v2.2.15.Dockerfile
index 2ed0f7e..de8757a 100644
--- a/docker/v2.2.15.Dockerfile
+++ b/docker/v2.2.15.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:479476fa1dec14dfa9ed2dbcaa94cda5ab945e12
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.2.15/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.2.16.Dockerfile b/docker/v2.2.16.Dockerfile
index 8a45b53..c8502b0 100644
--- a/docker/v2.2.16.Dockerfile
+++ b/docker/v2.2.16.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:479476fa1dec14dfa9ed2dbcaa94cda5ab945e12
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.2.16/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.2.17.Dockerfile b/docker/v2.2.17.Dockerfile
index ad6bad4..8a8deaa 100644
--- a/docker/v2.2.17.Dockerfile
+++ b/docker/v2.2.17.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:479476fa1dec14dfa9ed2dbcaa94cda5ab945e12
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.2.17/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.2.18.Dockerfile b/docker/v2.2.18.Dockerfile
index 1f6defc..8b821fc 100644
--- a/docker/v2.2.18.Dockerfile
+++ b/docker/v2.2.18.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:479476fa1dec14dfa9ed2dbcaa94cda5ab945e12
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.2.18/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.2.19.Dockerfile b/docker/v2.2.19.Dockerfile
index 2b2b357..8d8785e 100644
--- a/docker/v2.2.19.Dockerfile
+++ b/docker/v2.2.19.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:479476fa1dec14dfa9ed2dbcaa94cda5ab945e12
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.2.19/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.2.2.Dockerfile b/docker/v2.2.2.Dockerfile
index 1c0a023..2ea4d40 100644
--- a/docker/v2.2.2.Dockerfile
+++ b/docker/v2.2.2.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:479476fa1dec14dfa9ed2dbcaa94cda5ab945e12
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.2.2/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.2.20.Dockerfile b/docker/v2.2.20.Dockerfile
index 743ad24..3177f0c 100644
--- a/docker/v2.2.20.Dockerfile
+++ b/docker/v2.2.20.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:479476fa1dec14dfa9ed2dbcaa94cda5ab945e12
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.2.20/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.2.3.Dockerfile b/docker/v2.2.3.Dockerfile
index cb54ed4..6f3cf2a 100644
--- a/docker/v2.2.3.Dockerfile
+++ b/docker/v2.2.3.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:479476fa1dec14dfa9ed2dbcaa94cda5ab945e12
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.2.3/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.2.4.Dockerfile b/docker/v2.2.4.Dockerfile
index c11c52a..47ec6e1 100644
--- a/docker/v2.2.4.Dockerfile
+++ b/docker/v2.2.4.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:479476fa1dec14dfa9ed2dbcaa94cda5ab945e12
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.2.4/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.2.5.Dockerfile b/docker/v2.2.5.Dockerfile
index 6b44c44..32221e6 100644
--- a/docker/v2.2.5.Dockerfile
+++ b/docker/v2.2.5.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:479476fa1dec14dfa9ed2dbcaa94cda5ab945e12
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.2.5/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.2.6.Dockerfile b/docker/v2.2.6.Dockerfile
index d6e46d9..fc9d08f 100644
--- a/docker/v2.2.6.Dockerfile
+++ b/docker/v2.2.6.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:479476fa1dec14dfa9ed2dbcaa94cda5ab945e12
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.2.6/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.2.7.Dockerfile b/docker/v2.2.7.Dockerfile
index a0304fd..32c15eb 100644
--- a/docker/v2.2.7.Dockerfile
+++ b/docker/v2.2.7.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:479476fa1dec14dfa9ed2dbcaa94cda5ab945e12
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.2.7/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.2.8.Dockerfile b/docker/v2.2.8.Dockerfile
index 0c0ad56..011ff57 100644
--- a/docker/v2.2.8.Dockerfile
+++ b/docker/v2.2.8.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:479476fa1dec14dfa9ed2dbcaa94cda5ab945e12
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.2.8/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.2.9.Dockerfile b/docker/v2.2.9.Dockerfile
index 37c6db2..2a80a7f 100644
--- a/docker/v2.2.9.Dockerfile
+++ b/docker/v2.2.9.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:479476fa1dec14dfa9ed2dbcaa94cda5ab945e12
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.2.9/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.3.0.Dockerfile b/docker/v2.3.0.Dockerfile
index ca34015..666756f 100644
--- a/docker/v2.3.0.Dockerfile
+++ b/docker/v2.3.0.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:878ca0e8df1305dcbbfffac5bb908cce6a4bc5f6
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.3.0/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.3.1.Dockerfile b/docker/v2.3.1.Dockerfile
index 07ae6ad..3fa158a 100644
--- a/docker/v2.3.1.Dockerfile
+++ b/docker/v2.3.1.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:878ca0e8df1305dcbbfffac5bb908cce6a4bc5f6
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.3.1/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.3.10.Dockerfile b/docker/v2.3.10.Dockerfile
new file mode 100644
index 0000000..8f37f65
--- /dev/null
+++ b/docker/v2.3.10.Dockerfile
@@ -0,0 +1,13 @@
+FROM --platform=linux/amd64 rust@sha256:878ca0e8df1305dcbbfffac5bb908cce6a4bc5f6b629c518e7112645ee8851d4
+
+RUN apt-get update && apt-get install -qy git gnutls-bin
+RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.3.10/install)"
+ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
+WORKDIR /build
+
+CMD /bin/bash
diff --git a/docker/v2.3.11.Dockerfile b/docker/v2.3.11.Dockerfile
new file mode 100644
index 0000000..11ad033
--- /dev/null
+++ b/docker/v2.3.11.Dockerfile
@@ -0,0 +1,13 @@
+FROM --platform=linux/amd64 rust@sha256:878ca0e8df1305dcbbfffac5bb908cce6a4bc5f6b629c518e7112645ee8851d4
+
+RUN apt-get update && apt-get install -qy git gnutls-bin
+RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.3.11/install)"
+ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
+WORKDIR /build
+
+CMD /bin/bash
diff --git a/docker/v2.3.2.Dockerfile b/docker/v2.3.2.Dockerfile
index 3103f44..664252a 100644
--- a/docker/v2.3.2.Dockerfile
+++ b/docker/v2.3.2.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:878ca0e8df1305dcbbfffac5bb908cce6a4bc5f6
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.3.2/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.3.3.Dockerfile b/docker/v2.3.3.Dockerfile
index def642f..47d7392 100644
--- a/docker/v2.3.3.Dockerfile
+++ b/docker/v2.3.3.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:878ca0e8df1305dcbbfffac5bb908cce6a4bc5f6
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.3.3/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.3.4.Dockerfile b/docker/v2.3.4.Dockerfile
index 686e4e7..57b9d20 100644
--- a/docker/v2.3.4.Dockerfile
+++ b/docker/v2.3.4.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:878ca0e8df1305dcbbfffac5bb908cce6a4bc5f6
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.3.4/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.3.5.Dockerfile b/docker/v2.3.5.Dockerfile
index 14ce2eb..e392bec 100644
--- a/docker/v2.3.5.Dockerfile
+++ b/docker/v2.3.5.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:878ca0e8df1305dcbbfffac5bb908cce6a4bc5f6
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.3.5/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.3.6.Dockerfile b/docker/v2.3.6.Dockerfile
index 3fff732..9524ac2 100644
--- a/docker/v2.3.6.Dockerfile
+++ b/docker/v2.3.6.Dockerfile
@@ -3,6 +3,11 @@ FROM --platform=linux/amd64 rust@sha256:878ca0e8df1305dcbbfffac5bb908cce6a4bc5f6
 RUN apt-get update && apt-get install -qy git gnutls-bin
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.3.6/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
 WORKDIR /build
 
 CMD /bin/bash
diff --git a/docker/v2.3.7.Dockerfile b/docker/v2.3.7.Dockerfile
new file mode 100644
index 0000000..4e6538f
--- /dev/null
+++ b/docker/v2.3.7.Dockerfile
@@ -0,0 +1,13 @@
+FROM --platform=linux/amd64 rust@sha256:878ca0e8df1305dcbbfffac5bb908cce6a4bc5f6b629c518e7112645ee8851d4
+
+RUN apt-get update && apt-get install -qy git gnutls-bin
+RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.3.7/install)"
+ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
+WORKDIR /build
+
+CMD /bin/bash
diff --git a/docker/v2.3.8.Dockerfile b/docker/v2.3.8.Dockerfile
new file mode 100644
index 0000000..240ce14
--- /dev/null
+++ b/docker/v2.3.8.Dockerfile
@@ -0,0 +1,13 @@
+FROM --platform=linux/amd64 rust@sha256:878ca0e8df1305dcbbfffac5bb908cce6a4bc5f6b629c518e7112645ee8851d4
+
+RUN apt-get update && apt-get install -qy git gnutls-bin
+RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.3.8/install)"
+ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
+WORKDIR /build
+
+CMD /bin/bash
diff --git a/docker/v2.3.9.Dockerfile b/docker/v2.3.9.Dockerfile
new file mode 100644
index 0000000..7a3aff5
--- /dev/null
+++ b/docker/v2.3.9.Dockerfile
@@ -0,0 +1,13 @@
+FROM --platform=linux/amd64 rust@sha256:878ca0e8df1305dcbbfffac5bb908cce6a4bc5f6b629c518e7112645ee8851d4
+
+RUN apt-get update && apt-get install -qy git gnutls-bin
+RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.3.9/install)"
+ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
+# Call cargo build-sbf to trigger installation of associated platform tools
+RUN cargo init temp --edition 2021 && \
+    cd temp && \
+    cargo build-sbf && \
+    rm -rf temp
+WORKDIR /build
+
+CMD /bin/bash
diff --git a/generate_dockerfiles.py b/generate_dockerfiles.py
index a82fc90..6d0ef37 100644
--- a/generate_dockerfiles.py
+++ b/generate_dockerfiles.py
@@ -58,7 +58,7 @@
 RUN sh -c "$(curl -sSfL https://release.anza.xyz/{AGAVE_VERSION_PLACEHOLDER}/install)"
 ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
 # Call cargo build-sbf to trigger installation of associated platform tools
-RUN cargo init temp && \\
+RUN cargo init temp --edition 2021 && \\
     cd temp && \\
     cargo build-sbf && \\
     rm -rf temp