diff --git a/.drone.jsonnet b/.drone.jsonnet
index a2c90b197..eaa616f7b 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -7,6 +7,15 @@ local clone_submodules = {
 // cmake options for static deps mirror
 local ci_dep_mirror(want_mirror) = (if want_mirror then ' -DLOCAL_MIRROR=https://oxen.rocks/deps ' else '');
 
+// Output some information about the built tools in case specific combinations break the build
+local machine_info = {
+  name: 'Machine info',
+  commands: [
+    'xcodebuild -version',
+    'LANG=en_US.UTF-8 pod --version'
+  ]
+};
+
 // Cocoapods
 // 
 // Unfortunately Cocoapods has a dumb restriction which requires you to use UTF-8 for the
@@ -71,22 +80,6 @@ local update_cocoapods_cache = {
 
 
 [
-  // Machine info
-  {
-    kind: 'pipeline',
-    type: 'exec',
-    name: 'Machine Info',
-    platform: { os: 'darwin', arch: 'amd64' },
-    steps: [
-      {
-        name: 'Print info',
-        commands: [
-          'xcodebuild -version',
-          'LANG=en_US.UTF-8 pod --version'
-        ]
-      }
-    ],
-  },
   // Unit tests
   {
     kind: 'pipeline',
@@ -94,6 +87,7 @@ local update_cocoapods_cache = {
     name: 'Unit Tests',
     platform: { os: 'darwin', arch: 'amd64' },
     steps: [
+      machine_info,
       clone_submodules,
       load_cocoapods_cache,
       install_cocoapods,
@@ -115,6 +109,7 @@ local update_cocoapods_cache = {
     platform: { os: 'darwin', arch: 'amd64' },
     trigger: { event: { exclude: [ 'pull_request' ] } },
     steps: [
+      machine_info,
       clone_submodules,
       load_cocoapods_cache,
       install_cocoapods,
@@ -143,6 +138,7 @@ local update_cocoapods_cache = {
     platform: { os: 'darwin', arch: 'amd64' },
     trigger: { event: { exclude: [ 'pull_request' ] } },
     steps: [
+      machine_info,
       clone_submodules,
       load_cocoapods_cache,
       install_cocoapods,