diff --git a/.drone.jsonnet b/.drone.jsonnet
index 2a6c55f8f8..51e8dc9dd9 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -1,3 +1,12 @@
+// Log a bunch of version information to make it easier for debugging
+local version_info = {
+  name: 'Version Information',
+  commands: [
+    '/usr/lib/android-ndk --version',
+    '/usr/lib/android-sdk --version'
+  ]
+};
+
 // Intentionally doing a depth of 2 as libSession-util has it's own submodules (and libLokinet likely will as well)
 local clone_submodules = {
   name: 'Clone Submodules',
@@ -11,15 +20,17 @@ local ci_dep_mirror(want_mirror) = (if want_mirror then ' -DLOCAL_MIRROR=https:/
   // Unit tests (PRs only)
   {
     kind: 'pipeline',
-    type: 'exec',
+    type: 'docker',
     name: 'Unit Tests',
     platform: { arch: 'amd64' },
     trigger: { event: { exclude: [ 'push' ] } },
     steps: [
+      version_info,
       clone_submodules,
       {
         name: 'Run Unit Tests',
         image: 'registry.oxen.rocks/lokinet-ci-android',
+        environment: { ANDROID: 'android' },
         commands: [
           './gradlew testPlayDebugUnitTestCoverageReport'
         ],
@@ -29,7 +40,7 @@ local ci_dep_mirror(want_mirror) = (if want_mirror then ' -DLOCAL_MIRROR=https:/
   // Validate build artifact was created by the direct branch push (PRs only)
   {
     kind: 'pipeline',
-    type: 'exec',
+    type: 'docker',
     name: 'Check Build Artifact Existence',
     platform: { arch: 'amd64' },
     trigger: { event: { exclude: [ 'push' ] } },
@@ -45,15 +56,17 @@ local ci_dep_mirror(want_mirror) = (if want_mirror then ' -DLOCAL_MIRROR=https:/
   // Debug APK build (non-PRs only)
   {
     kind: 'pipeline',
-    type: 'exec',
+    type: 'docker',
     name: 'Debug APK Build',
     platform: { arch: 'amd64' },
     trigger: { event: { exclude: [ 'pull_request' ] } },
     steps: [
+      version_info,
       clone_submodules,
       {
         name: 'Build',
         image: 'registry.oxen.rocks/lokinet-ci-android',
+        environment: { ANDROID: 'android' },
         commands: [
           './gradlew assemblePlayDebug'
         ],