diff --git a/.drone.jsonnet b/.drone.jsonnet
index c526171cf6..7bbc0f8d05 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -1,14 +1,5 @@
 local docker_base = 'registry.oxen.rocks/lokinet-ci-';
 
-// 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',
@@ -31,8 +22,8 @@ local ci_dep_mirror(want_mirror) = (if want_mirror then ' -DLOCAL_MIRROR=https:/
       clone_submodules,
       {
         name: 'Run Unit Tests',
+        image: 'registry.oxen.rocks/lokinet-ci-android',
         pull: 'always',
-        image: docker_base + 'android',
         commands: [
           './gradlew testPlayDebugUnitTestCoverageReport'
         ],
@@ -49,8 +40,8 @@ local ci_dep_mirror(want_mirror) = (if want_mirror then ' -DLOCAL_MIRROR=https:/
     steps: [
       {
         name: 'Poll for build artifact existence',
+        image: 'registry.oxen.rocks/lokinet-ci-android',
         pull: 'always',
-        image: docker_base + 'android',
         commands: [
           './Scripts/drone-upload-exists.sh'
         ]
@@ -68,20 +59,13 @@ local ci_dep_mirror(want_mirror) = (if want_mirror then ' -DLOCAL_MIRROR=https:/
       clone_submodules,
       {
         name: 'Build',
+        image: 'registry.oxen.rocks/lokinet-ci-android',
         pull: 'always',
-        image: docker_base + 'android',
-        commands: [
-          './gradlew assemblePlayDebug'
-        ],
-      },
-      {
-        name: 'Upload artifacts',
-        pull: 'always',
-        image: docker_base + 'android',
         environment: { SSH_KEY: { from_secret: 'SSH_KEY' } },
         commands: [
+          './gradlew assemblePlayDebug',
           './Scripts/drone-static-upload.sh'
-        ]
+        ],
       },
     ],
   }