diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8b7cd0056a94b9b4c7c8d49070f7bfeed7a721f8..e5c11cd2d0bf5160452fa0d5ab0686274d0749c1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,9 +31,6 @@ before_script:
   - docker network prune -f || true
   - docker image prune -a -f || true
   - docker builder prune -f || true
-  - apt-get clean
-  - rm -rf /var/lib/apt/lists/*
-  - rm -rf /root/.cache/pip
 
 after_script:
   - docker system prune -a -f --volumes || true
@@ -44,11 +41,13 @@ after_script:
 
 build:
   stage: build
-  image: docker:latest
+  image: ubuntu:latest
   services:
     - name: docker:dind
       command: ["--host=tcp://0.0.0.0:2375", "--tls=false", "--storage-driver=overlay2", "--mtu=1500", "--data-root=/mnt/volume"]
   script:
+    - apt-get update
+    - apt-get install -y docker.io
     - docker buildx create --use
     - docker build --cache-from=22baar1mst/asyst-nlp-grader --no-cache --progress=plain -t 22baar1mst/asyst-nlp-grader:latest -f flask_ml_api/Dockerfile .
     - docker push 22baar1mst/asyst-nlp-grader:latest
@@ -57,11 +56,13 @@ build:
 
 deploy:
   stage: deploy
-  image: docker:latest
+  image: ubuntu:latest
   services:
     - name: docker:dind
       command: ["--tls=false", "--storage-driver=overlay2", "--mtu=1500", "--data-root=/mnt/volume"]
   script:
+    - apt-get update
+    - apt-get install -y docker.io
     - docker pull 22baar1mst/asyst-nlp-grader:latest
     - docker run -d 22baar1mst/asyst-nlp-grader:latest
   only:
diff --git a/flask_ml_api/Dockerfile b/flask_ml_api/Dockerfile
index 16458274b99500a265ee5947a8127179109a1ee0..11de0b2993a9b91211287442019ace85866d73de 100755
--- a/flask_ml_api/Dockerfile
+++ b/flask_ml_api/Dockerfile
@@ -9,6 +9,9 @@ ENV PATH="$PATH:/root/.cargo/bin"
 
 RUN /root/.cargo/bin/rustup toolchain install stable --profile minimal --no-self-update
 
+RUN /root/.cargo/bin/rustup --version
+RUN /root/.cargo/bin/cargo --version
+
 RUN apt-get update && apt-get install -y --no-install-recommends \
     build-essential python3-venv && \
     apt-get clean && \