diff --git a/.drone.jsonnet b/.drone.jsonnet
index a778a9d0a..7077a48dc 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -89,19 +89,7 @@ local update_cocoapods_cache = {
 local run_tests(testName, testBuildStepName) = {
   name: 'Run ' + testName,
   commands: [
-    |||
-    NSUnbufferedIO=YES set -o pipefail && xcodebuild test-without-building
-     -workspace Session.xcworkspace
-     -scheme Session
-     -derivedDataPath ./build/derivedData
-     -destination "platform=iOS Simulator,name=iPhone 14"
-     -test-timeouts-enabled YES
-     -maximum-test-execution-time-allowance 10
-     -only-testing $testName
-     -collect-test-diagnostics never
-     2>&1
-     | ./Pods/xcbeautify/xcbeautify --is-ci
-    |||,
+    'NSUnbufferedIO=YES set -o pipefail && xcodebuild test-without-building -workspace Session.xcworkspace -scheme Session -derivedDataPath ./build/derivedData -destination "platform=iOS Simulator,name=iPhone 14" -test-timeouts-enabled YES -maximum-test-execution-time-allowance 10 -only-testing $testName -collect-test-diagnostics never 2>&1 | ./Pods/xcbeautify/xcbeautify --is-ci',
   ],
   depends_on: [
     testBuildStepName
@@ -135,15 +123,7 @@ local run_tests(testName, testBuildStepName) = {
         name: 'Build For Testing',
         commands: [
           'mkdir build',
-          |||
-          xcodebuild build-for-testing
-           -workspace Session.xcworkspace
-           -scheme Session
-           -derivedDataPath ./build/derivedData
-           -parallelizeTargets
-           -destination "platform=iOS Simulator,name=iPhone 14"
-           | ./Pods/xcbeautify/xcbeautify --is-ci
-          |||,
+          'xcodebuild build-for-testing -workspace Session.xcworkspace -scheme Session -derivedDataPath ./build/derivedData -parallelizeTargets -destination "platform=iOS Simulator,name=iPhone 14" | ./Pods/xcbeautify/xcbeautify --is-ci',
         ],
         depends_on: [
           'Reset Simulators'
@@ -186,18 +166,7 @@ local run_tests(testName, testBuildStepName) = {
         name: 'Build',
         commands: [
           'mkdir build',
-          |||
-          xcodebuild archive
-           -workspace Session.xcworkspace
-           -scheme Session
-           -derivedDataPath ./build/derivedData
-           -parallelizeTargets
-           -configuration "App Store Release"
-           -sdk iphonesimulator
-           -archivePath ./build/Session_sim.xcarchive
-           -destination "generic/platform=iOS Simulator"
-           | ./Pods/xcbeautify/xcbeautify --is-ci
-          |||,
+          'xcodebuild archive -workspace Session.xcworkspace -scheme Session -derivedDataPath ./build/derivedData -parallelizeTargets -configuration "App Store Release" -sdk iphonesimulator -archivePath ./build/Session_sim.xcarchive -destination "generic/platform=iOS Simulator" | ./Pods/xcbeautify/xcbeautify --is-ci',
         ],
       },
       update_cocoapods_cache,
@@ -226,19 +195,7 @@ local run_tests(testName, testBuildStepName) = {
         name: 'Build',
         commands: [
           'mkdir build',
-          |||
-          xcodebuild archive
-           -workspace Session.xcworkspace
-           -scheme Session
-           -derivedDataPath ./build/derivedData
-           -parallelizeTargets
-           -configuration "App Store Release"
-           -sdk iphoneos
-           -archivePath ./build/Session.xcarchive
-           -destination "generic/platform=iOS"
-           -allowProvisioningUpdates CODE_SIGNING_ALLOWED=NO
-           | ./Pods/xcbeautify/xcbeautify --is-ci
-          |||,
+          'xcodebuild archive -workspace Session.xcworkspace -scheme Session -derivedDataPath ./build/derivedData -parallelizeTargets -configuration "App Store Release" -sdk iphoneos -archivePath ./build/Session.xcarchive -destination "generic/platform=iOS" -allowProvisioningUpdates CODE_SIGNING_ALLOWED=NO | ./Pods/xcbeautify/xcbeautify --is-ci',
         ],
       },
       update_cocoapods_cache,