diff --git a/cosmwasm/enclaves/shared/crypto/Cargo.toml b/cosmwasm/enclaves/shared/crypto/Cargo.toml
index 0c5bf7a1b..e48dd9908 100644
--- a/cosmwasm/enclaves/shared/crypto/Cargo.toml
+++ b/cosmwasm/enclaves/shared/crypto/Cargo.toml
@@ -52,3 +52,6 @@ git = "https://github.com/mesalock-linux/rustls"
 rev = "95b5e79dc24b02f3ce424437eb9698509d0baf58"
 default-features = false
 features = ["dangerous_configuration", "mesalock_sgx"]
+
+[net]
+git-fetch-with-cli = true
\ No newline at end of file
diff --git a/deployment/dockerfiles/Dockerfile b/deployment/dockerfiles/Dockerfile
index a20d53bea..3679b46c0 100644
--- a/deployment/dockerfiles/Dockerfile
+++ b/deployment/dockerfiles/Dockerfile
@@ -7,8 +7,8 @@
 #   `--target build-deb-mainnet` - the image used to generate deb package for mainnet (will pull precompiled enclave)
 #   `--target compile-secretd` - image with compiled enclave and secretd
 
-ARG SCRT_BASE_IMAGE_ENCLAVE=ghcr.io/scrtlabs/sgx-rust:2004-1.1.6
-ARG SCRT_RELEASE_BASE_IMAGE=ghcr.io/scrtlabs/release-base:20.04-2.20-dcap
+ARG SCRT_BASE_IMAGE_ENCLAVE=ghcr.io/scrtlabs/sgx-rust:2204-1.1.6
+ARG SCRT_RELEASE_BASE_IMAGE=ghcr.io/scrtlabs/release-base:22.04-2.20-dcap
 
 # ***************** PREPARE COMPILE ENCLAVE ************** #
 
@@ -16,7 +16,7 @@ FROM $SCRT_BASE_IMAGE_ENCLAVE AS prepare-compile-enclave
 
 RUN apt-get update &&  \
     apt-get install -y --no-install-recommends \
-    clang-10 && \
+    clang-12 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV PATH="/root/.cargo/bin:$PATH"
@@ -155,7 +155,7 @@ RUN . /opt/sgxsdk/environment && env && VERSION=${VERSION} FEATURES=${FEATURES}
 FROM $SCRT_RELEASE_BASE_IMAGE as release-image
 
 # wasmi-sgx-test script requirements
-RUN add-apt-repository -r "deb https://download.01.org/intel-sgx/sgx_repo/ubuntu focal main" && \
+RUN add-apt-repository -r "deb https://download.01.org/intel-sgx/sgx_repo/ubuntu jammy main" && \
     apt-get update && \
     apt-get install -y --no-install-recommends \
     #### Base utilities ####