diff --git a/.dockerignore b/.dockerignore
index eea6a21bd..965f4df2a 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,12 +1,3 @@
-# We don't need this folder because we map the hole folder
-buildroot/
-buildroot-external/
-buildroot-patches/
-
-# Output/Release directory gets created using build scripts
-output*/
-release/
-
-# Ignore hidden directories as well
-.git/
-.github/
+# Ignore everything except what we really need
+*
+!scripts/
diff --git a/Dockerfile b/Dockerfile
index abb148367..150605f20 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -28,27 +28,24 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         cpio \
         file \
         git \
+        graphviz \
+        jq \
         make \
         ncurses-dev \
+        openssh-client \
         patch \
         perl \
         python3 \
         python3-matplotlib \
         python-is-python3 \
-        graphviz \
+        qemu-utils \
         rsync \
+        skopeo \
         sudo \
         unzip \
-        zip \
-        wget \
-        qemu-utils \
-        openssh-client \
         vim \
-    && rm -rf /var/lib/apt/lists/*
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-	skopeo \
-	jq \
+        wget \
+        zip \
     && rm -rf /var/lib/apt/lists/*
 
 # Init entry