diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml
index 5599aba0..d91686de 100644
--- a/.github/workflows/docker-build-push.yml
+++ b/.github/workflows/docker-build-push.yml
@@ -9,6 +9,10 @@ jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
+      - name: Free Disk Space (Ubuntu)
+        uses: jlumbroso/free-disk-space@main
+        with:
+          docker-images: false
       - name: Checkout
         uses: actions/checkout@v3
       - name: Set up QEMU
diff --git a/Dockerfile b/Dockerfile
index bb9d7907..202273d3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -48,7 +48,9 @@ RUN apt-get install --no-install-recommends -y \
     nano \
     cmake \
     tar \
-    vim
+    vim \
+    && rm -rf /var/lib/apt/lists/* \
+    && apt-get clean
 
 # Make some useful symlinks that are expected to exist
 RUN ln -sfn /usr/bin/python${PYTHON_VERSION} /usr/bin/python3  & \
@@ -70,11 +72,7 @@ RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2
 
 # Install dependencies from poetry
 COPY --from=builder /src/requirements.txt .
-RUN mkdir tmp
-RUN export TMPDIR=/root/tmp
 RUN pip install --no-cache-dir -r requirements.txt && rm requirements.txt
-RUN unset TMPDIR
-RUN rm -rf tmp
 
 # Install silnlp
 COPY --from=builder /src/dist/*.whl .