diff --git a/DockerfileBase b/DockerfileBase
index df7211af..f06ceb02 100644
--- a/DockerfileBase
+++ b/DockerfileBase
@@ -1,35 +1,38 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 RUN apt-get update && apt-get install software-properties-common -y && \
     add-apt-repository ppa:ubuntu-toolchain-r/test && \
     apt-get update && apt-get install -y \
-    autoconf \
-    automake \
     build-essential \
-    cmake \
-    curl \
-    debhelper \
-    git \
-    libcurl4-openssl-dev \
-    libprotobuf-dev \
-    libssl-dev \
-    libtool \
-    lsb-release \
     ocaml \
     ocamlbuild \
-    protobuf-compiler \
-    python-is-python3 \
+    automake \
+    autoconf \
+    libtool \
     wget \
-    libcurl4 \
-    make \
-    unzip \
+    python-is-python3 \
+    libssl-dev \
+    git \
+    cmake \
     perl \
-    pkgconf
+    libcurl4-openssl-dev \
+    protobuf-compiler \
+    libprotobuf-dev \
+    debhelper \
+    reprepro \
+    unzip \
+    pkgconf \
+    libboost-dev \
+    libboost-system-dev \
+    libboost-thread-dev \
+    lsb-release \
+    libsystemd0
+
 
 # RUN wget http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_amd64.deb && \
 #     dpkg -i libssl1.1_1.1.1f-1ubuntu2_amd64.deb
 
-RUN git clone -b sgx_2.19 --depth 1 https://github.com/intel/linux-sgx
+RUN git clone -b sgx_2.25 --depth 1 https://github.com/intel/linux-sgx
 
 RUN cd linux-sgx && make preparation
 
@@ -54,12 +57,10 @@ WORKDIR /usr/src/sdk
 
 RUN apt update && \
     apt install -yq apt-utils && \
-    apt install -yq --no-install-recommends vim telnet git ca-certificates perl \
-        reprepro libboost-all-dev alien uuid-dev libxml2-dev ccache \
-        yasm flex bison libprocps-dev ccache texinfo \
-        graphviz doxygen libgnutls28-dev libgcrypt20-dev \
-        libboost-dev libboost-system-dev libboost-thread-dev lsb-release libsystemd0 && \
-        # glibc-tools
+    apt install -yq --no-install-recommends vim telnet ca-certificates perl \
+        alien uuid-dev libxml2-dev ccache \
+        yasm flex bison libprocps-dev texinfo \
+        graphviz doxygen libgnutls28-dev libgcrypt20-dev && \
     ln -s /usr/bin/ccache /usr/local/bin/clang && \
     ln -s /usr/bin/ccache /usr/local/bin/clang++ && \
     ln -s /usr/bin/ccache /usr/local/bin/gcc && \