diff --git a/.github/workflows/android-linux.yml b/.github/workflows/android-linux.yml
index be85b07fd79..d4ba941e047 100644
--- a/.github/workflows/android-linux.yml
+++ b/.github/workflows/android-linux.yml
@@ -1,6 +1,7 @@
 name: Android-Linux
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - master
@@ -39,7 +40,7 @@ jobs:
       QT_ANDROID_KEYSTORE_ALIAS: QGCAndroidKeyStore
       QT_ANDROID_KEYSTORE_STORE_PASS: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
       QT_ANDROID_KEYSTORE_KEY_PASS: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
-      QT_ANDROID_ABIS: ${{ matrix.BuildType == 'Release' && 'armeabi-v7a;arm64-v8a' || 'arm64-v8a' }}
+      QT_ANDROID_ABIS: 'arm64-v8a'
 
     steps:
       - name: Free Disk Space (Ubuntu)
diff --git a/.github/workflows/android-windows.yml b/.github/workflows/android-windows.yml
index 4851c202559..fdd194f615e 100644
--- a/.github/workflows/android-windows.yml
+++ b/.github/workflows/android-windows.yml
@@ -1,23 +1,23 @@
 name: Android-Windows
 
-on:
-  push:
-    branches:
-      - master
-      - 'Stable*'
-    tags:
-      - 'v*'
-    paths-ignore:
-      - 'deploy/**'
-      - 'docs/**'
-  pull_request:
-    paths-ignore:
-      - 'deploy/**'
-      - 'docs/**'
-      - '.github/workflows/docs_deploy.yml'
-      - '.github/workflows/linux.yml'
-      - '.github/workflows/macos.yml'
-      - '.github/workflows/windows.yml'
+# on:
+#   push:
+#     branches:
+#       - master
+#       - 'Stable*'
+#     tags:
+#       - 'v*'
+#     paths-ignore:
+#       - 'deploy/**'
+#       - 'docs/**'
+#   pull_request:
+#     paths-ignore:
+#       - 'deploy/**'
+#       - 'docs/**'
+#       - '.github/workflows/docs_deploy.yml'
+#       - '.github/workflows/linux.yml'
+#       - '.github/workflows/macos.yml'
+#       - '.github/workflows/windows.yml'
 
 jobs:
   build:
diff --git a/.github/workflows/docker-linux.yml b/.github/workflows/docker-linux.yml
index 0ebabcacbff..e7b43570d32 100644
--- a/.github/workflows/docker-linux.yml
+++ b/.github/workflows/docker-linux.yml
@@ -1,25 +1,25 @@
 name: Docker-Linux
 
-on:
-  push:
-    branches:
-      - master
-      - 'Stable*'
-    tags:
-      - 'v*'
-    paths-ignore:
-      - 'android/**'
-      - 'deploy/**'
-      - 'docs/**'
-  pull_request:
-    paths-ignore:
-      - 'android/**'
-      - 'deploy/**'
-      - 'docs/**'
-      - '.github/workflows/docs_deploy.yml'
-      - '.github/workflows/android.yml'
-      - '.github/workflows/macos.yml'
-      - '.github/workflows/windows.yml'
+# on:
+#   push:
+#     branches:
+#       - master
+#       - 'Stable*'
+#     tags:
+#       - 'v*'
+#     paths-ignore:
+#       - 'android/**'
+#       - 'deploy/**'
+#       - 'docs/**'
+#   pull_request:
+#     paths-ignore:
+#       - 'android/**'
+#       - 'deploy/**'
+#       - 'docs/**'
+#       - '.github/workflows/docs_deploy.yml'
+#       - '.github/workflows/android.yml'
+#       - '.github/workflows/macos.yml'
+#       - '.github/workflows/windows.yml'
 
 jobs:
   build:
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index f10476ebb64..3b455f03470 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -1,6 +1,7 @@
 name: Linux
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - master
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 12155f1ad8e..09f441a0c35 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -1,25 +1,25 @@
 name: MacOS
 
-on:
-  push:
-    branches:
-      - master
-      - 'Stable*'
-    tags:
-      - 'v*'
-    paths-ignore:
-      - 'android/**'
-      - 'deploy/**'
-      - 'docs/**'
-  pull_request:
-    paths-ignore:
-      - 'android/**'
-      - 'deploy/**'
-      - 'docs/**'
-      - '.github/workflows/docs_deploy.yml'
-      - '.github/workflows/android.yml'
-      - '.github/workflows/linux.yml'
-      - '.github/workflows/windows.yml'
+# on:
+#   push:
+#     branches:
+#       - master
+#       - 'Stable*'
+#     tags:
+#       - 'v*'
+#     paths-ignore:
+#       - 'android/**'
+#       - 'deploy/**'
+#       - 'docs/**'
+#   pull_request:
+#     paths-ignore:
+#       - 'android/**'
+#       - 'deploy/**'
+#       - 'docs/**'
+#       - '.github/workflows/docs_deploy.yml'
+#       - '.github/workflows/android.yml'
+#       - '.github/workflows/linux.yml'
+#       - '.github/workflows/windows.yml'
 
 jobs:
   build:
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index c8eaa9331ef..680f18c611f 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -1,6 +1,7 @@
 name: Windows
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - master
diff --git a/custom/src/Drone/Drone.cc b/custom/src/Drone/Drone.cc
index 420353b774f..612d98386a4 100644
--- a/custom/src/Drone/Drone.cc
+++ b/custom/src/Drone/Drone.cc
@@ -36,7 +36,21 @@ void Drone::adjustLights(Vehicle *vehicle, uint8_t intensity)
 {
     if (!readyForAdjustLights(vehicle)) return;
 
-    uint8_t current = qBound(0U, _droneFactGroup->spotlightStatus()->rawValue().toUInt(), 100U);
+    const uint16_t pwm = 1000 + (intensity * 9);
+    uint8_t count = 1;
+    for (const uint8_t port: _droneFactGroup->spotlightValues().keys()) {
+        QTimer* const porttimer = new QTimer(this);
+        porttimer->setInterval(50 * count);
+        porttimer->setSingleShot(true);
+        (void) porttimer->callOnTimeout([this, vehicle, porttimer, pwm, port]() {
+            _setServo(vehicle, port, pwm);
+            porttimer->deleteLater();
+        });
+        porttimer->start();
+        count++;
+    }
+
+    /*uint8_t current = qBound(0U, _droneFactGroup->spotlightStatus()->rawValue().toUInt(), 100U);
     int8_t diff;
     do {
         diff = static_cast<int8_t>(current) - static_cast<int8_t>(intensity);
@@ -54,26 +68,27 @@ void Drone::adjustLights(Vehicle *vehicle, uint8_t intensity)
     } while (diff != 0);
 
     QTimer* const timer = new QTimer(this);
-    timer->setInterval(50);
+    timer->setInterval(100);
     timer->setSingleShot(true);
     (void) timer->callOnTimeout([this, vehicle, timer]() {
-        if (!_lightTargets.isEmpty()) {
+        // if (!_lightTargets.isEmpty()) {
             const uint16_t pwm = 1000 + (_lightTargets.takeFirst() * 9);
             for (const uint8_t port: _droneFactGroup->spotlightValues().keys()) {
                 QTimer* const porttimer = new QTimer(this);
-                porttimer->setInterval(25);
+                porttimer->setInterval(50);
                 porttimer->setSingleShot(true);
                 (void) porttimer->callOnTimeout([this, vehicle, porttimer, pwm, port]() {
                     _setServo(vehicle, port, pwm);
                     porttimer->deleteLater();
                 });
+                porttimer->start();
             }
             timer->start();
         } else {
             timer->deleteLater();
         }
     });
-    timer->start();
+    timer->start();*/
 }
 
 bool Drone::readyForToggleBeacon()