diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 7a7b97c..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM rust:1.59
-
-ARG SOLANA_VERSION=v1.9.14
-ARG ANCHOR_VERSION=v0.23.0
-
-RUN apt-get update -y 
-RUN apt-get upgrade -y 
-RUN apt-get install -y pkg-config build-essential libudev-dev clang
-RUN rustup component add rustfmt clippy
-
-RUN sh -c "$(curl -sSfL https://release.solana.com/$SOLANA_VERSION/install)"
-ENV PATH=/root/.local/share/solana/install/active_release/bin:$PATH
-
-RUN cargo install --git https://github.com/project-serum/anchor --tag $ANCHOR_VERSION anchor-cli --locked
-
-RUN curl -fsSL https://deb.nodesource.com/setup_17.x | bash -
-RUN apt-get install -y nodejs
-
-COPY shell-exec.sh /bin/shell-exec
-RUN chmod +x /bin/shell-exec
-
-WORKDIR workspace/
\ No newline at end of file
diff --git a/anchor-30/Dockerfile b/anchor-30/Dockerfile
new file mode 100644
index 0000000..bf5ff2f
--- /dev/null
+++ b/anchor-30/Dockerfile
@@ -0,0 +1,27 @@
+FROM rust:1.82
+
+ARG SOLANA_VERSION=v2.0.20
+ARG ANCHOR_VERSION=v0.30.1
+
+RUN apt-get update -y 
+RUN apt-get upgrade -y 
+RUN apt-get install -y pkg-config build-essential libudev-dev clang
+RUN rustup component add rustfmt clippy
+
+RUN sh -c "$(curl -sSfL https://release.anza.xyz/$SOLANA_VERSION/install)"
+ENV PATH=/root/.local/share/solana/install/active_release/bin:$PATH
+
+RUN cargo install --git https://github.com/coral-xyz/anchor --tag $ANCHOR_VERSION anchor-cli --locked
+
+RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash -
+RUN apt-get install -y nodejs
+
+RUN npm install --global yarn
+
+COPY shell-exec.sh /bin/shell-exec
+RUN chmod +x /bin/shell-exec
+
+EXPOSE 8080
+EXPOSE 9000
+
+WORKDIR workspace/
diff --git a/genopets-solana/Dockerfile b/genopets-solana/Dockerfile
new file mode 100644
index 0000000..c3ecfc2
--- /dev/null
+++ b/genopets-solana/Dockerfile
@@ -0,0 +1,28 @@
+FROM rust:1.69
+
+ARG SOLANA_VERSION=v1.16.27
+ARG ANCHOR_VERSION=v0.28.0
+
+RUN apt-get update -y 
+RUN apt-get upgrade -y 
+RUN apt-get install -y pkg-config build-essential libudev-dev clang
+RUN rustup component add rustfmt clippy
+
+RUN sh -c "$(curl -sSfL https://release.solana.com/$SOLANA_VERSION/install)"
+ENV PATH=/root/.local/share/solana/install/active_release/bin:$PATH
+
+RUN cargo install --git https://github.com/coral-xyz/anchor --tag $ANCHOR_VERSION anchor-cli --locked
+# RUN cargo install --git https://github.com/skrrb/anchor --branch cli/run-test-subset anchor-cli --locked
+
+RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash -
+RUN apt-get install -y nodejs
+
+RUN npm install --global yarn
+
+COPY shell-exec.sh /bin/shell-exec
+RUN chmod +x /bin/shell-exec
+
+EXPOSE 8080
+EXPOSE 9000
+
+WORKDIR workspace/