diff --git a/docker/Dockerfile b/docker/Dockerfile
index 72f8c60..8500058 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -5,13 +5,18 @@ MAINTAINER Sparklyballs <sparklyballs@linuxserver.io>
 # set some environment variables
 ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8
 
-ADD defaults/ /defaults/
 
-# Set the locale
+ADD pre_build/ /prebuilds/
+ADD versions.list /prebuilds/
+
+# Set the locale & mk prebuilds folder
 RUN locale-gen en_US.UTF-8
 
-RUN mv /defaults/excludes /etc/dpkg/dpkg.cfg.d/excludes && \ 
-. /defaults/build_apps.list && \
+RUN . /prebuilds/versions.list && \
+kodi_ver="${kodi_version%.*}" && \
+. prebuilds/build_lists/"$kodi_ver"/build_apps.list && \
+
+mv /prebuilds/excludes /etc/dpkg/dpkg.cfg.d/excludes && \
 apt-get update && \ 
 apt-get install $INPUT_APTLIST -qy && \
 rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
diff --git a/docker/init/40_check_the_patch.sh b/docker/init/40_check_the_patch.sh
index bb8352e..3ccf2ce 100644
--- a/docker/init/40_check_the_patch.sh
+++ b/docker/init/40_check_the_patch.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. /defaults/variables.list
+. /prebuilds/versions.list
 
 kodi_ver="${kodi_version%.*}"
 
diff --git a/docker/defaults/build_apps.list b/docker/pre_build/build_lists/15/build_apps.list
similarity index 100%
rename from docker/defaults/build_apps.list
rename to docker/pre_build/build_lists/15/build_apps.list
diff --git a/docker/defaults/excludes b/docker/pre_build/excludes
similarity index 100%
rename from docker/defaults/excludes
rename to docker/pre_build/excludes
diff --git a/docker/defaults/variables.list b/docker/versions.list
similarity index 100%
rename from docker/defaults/variables.list
rename to docker/versions.list