diff --git a/.buildbot/android/Dockerfile b/.buildbot/android/Dockerfile
index c649373a..2d722834 100755
--- a/.buildbot/android/Dockerfile
+++ b/.buildbot/android/Dockerfile
@@ -94,8 +94,8 @@ RUN useradd -m -U builder && mkdir /android
 
 WORKDIR /android
 
-RUN chown -R builder.builder /android "${ANDROID_SDK_HOME}/.android" \
-    && chmod -R go+w "${ANDROID_SDK_HOME}/.android"
+RUN chown -R builder.builder /android "${ANDROID_SDK_HOME}" \
+    && chmod -R go+w "${ANDROID_SDK_HOME}"
 
 USER builder
 
diff --git a/.buildbot/android/build.sh b/.buildbot/android/build.sh
index 31fa06b8..10176ef3 100755
--- a/.buildbot/android/build.sh
+++ b/.buildbot/android/build.sh
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 export LC_ALL=en_US.UTF-8
 export LANG=en_US.UTF-8
-cd packages/android
+pushd packages/android
 buildozer android debug || exit $?
-cd ../..
+popd
+
 mkdir -p ../out
-mv packages/android/bin/*.apk ../out
\ No newline at end of file
+cp packages/android/bin/*.apk ../out
diff --git a/.buildbot/android/test.sh b/.buildbot/android/test.sh
new file mode 100755
index 00000000..b61fac85
--- /dev/null
+++ b/.buildbot/android/test.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+unzip -p packages/android/bin/*.apk assets/private.tar \
+    | tar --list -z > package.list
+cat package.list
+cat package.list | grep '\.sql$' || exit 1
diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..77d72c64
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,7 @@
+bin
+build
+dist
+__pycache__
+.buildozer
+.tox
+mprofile_*
diff --git a/.gitignore b/.gitignore
index 72e5700f..fc331499 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ src/**/*.so
 src/**/a.out
 build/lib.*
 build/temp.*
+bin
 dist
 *.egg-info
 docs/_*/*
@@ -19,6 +20,8 @@ docs/autodoc/
 build
 pyan/
 **.coverage
+coverage.xml
 **htmlcov*
 **coverage.json
-
+.buildozer
+.tox
diff --git a/packages/android/buildozer.spec b/packages/android/buildozer.spec
index e560934f..c98717b4 100644
--- a/packages/android/buildozer.spec
+++ b/packages/android/buildozer.spec
@@ -13,7 +13,7 @@ package.domain = org.mock
 source.dir = ../../src
 
 # (list) Source files to include (let empty to include all the files)
-source.include_exts = py,png,jpg,kv,atlas,tflite
+source.include_exts = py,png,jpg,kv,atlas,tflite,sql
 
 # (list) List of inclusions using pattern matching
 #source.include_patterns = assets/*,images/*.png