diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml
new file mode 100644
index 0000000..9523766
--- /dev/null
+++ b/.github/workflows/gradle_build.yml
@@ -0,0 +1,51 @@
+name: Build APK
+
+on:
+  push:
+    branches: [ master, dev, ci-cd ]
+  pull_request:
+    branches: [ master, dev ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Configure SSH for private submodules
+        uses: webfactory/ssh-agent@v0.9.0
+        with:
+          ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          repository: Botts-Innovative-Research/osh-android
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'zulu'
+
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
+        with:
+          packages: ''
+
+      - name: Build APK
+        run: |
+          chmod +x ./gradlew
+          ./gradlew build -x test -x osgi -x lintDebug -x javadoc
+
+      - name: Upload APK artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: osh-android-APK
+          path: sensorhub-android-app/build/outputs/apk/debug/sensorhub-android-app-debug.apk
+
+      - name: Create GitHub Release
+        if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
+        uses: softprops/action-gh-release@v2
+        with:
+          files: app/build/outputs/apk/basic/release/*.apk
+          generate_release_notes: true
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
index 437f68a..189cbdf 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,6 +6,3 @@
 	path = submodules/osh-core
 	url = git@github.com:kalynstricklin/osh-core.git
 	branch = update-moduleutils
-[submodule "submodules/botts-addons"]
-	path = submodules/botts-addons
-	url = git@github.com:Botts-Innovative-Research/botts-addons.git
diff --git a/sensorhub-android-app/res/values-de/strings.xml b/sensorhub-android-app/res/values-de/strings.xml
index 1b20577..a82915f 100644
--- a/sensorhub-android-app/res/values-de/strings.xml
+++ b/sensorhub-android-app/res/values-de/strings.xml
@@ -416,4 +416,25 @@
     <string name="msg_port_number">Port muss eine Zahl sein</string>
     <string name="msg_port_range">Port muss zwischen 1 und 65535 liegen</string>
 
+    <!-- Garmin -->
+    <string name="title_license_required">Lizenzschlüssel erforderlich</string>
+    <string name="msg_garmin_license">Der Garmin Health SDK-Lizenzschlüssel ist nicht konfiguriert. Fügen Sie ihn in gradle.properties hinzu.</string>
+    <string name="title_garmin_sdk_error">Garmin SDK-Fehler</string>
+    <string name="msg_garmin_sdk_init_failed">Garmin Health SDK konnte nicht initialisiert werden: %s</string>
+    <string name="title_scan_failed">Scan fehlgeschlagen</string>
+    <string name="msg_garmin_scan_failed">Garmin-Geräte-Scan fehlgeschlagen (Fehler %d)</string>
+    <string name="title_scanning_garmin">Suche nach Garmin-Geräten…</string>
+    <string name="msg_scanning_garmin">Stellen Sie sicher, dass Ihr Garmin-Gerät in der Nähe und im Kopplungsmodus ist.</string>
+    <string name="title_found_garmin_devices">%d Garmin-Gerät(e) gefunden</string>
+    <string name="title_pairing_timeout">Kopplungs-Zeitüberschreitung</string>
+    <string name="msg_pairing_timeout">Authentifizierung ist abgelaufen. Bitte versuchen Sie es erneut.</string>
+    <string name="title_pairing">Kopplung…</string>
+    <string name="msg_pairing_with">Kopplung mit %s.\nBitte bestätigen Sie auf Ihrem Garmin-Gerät, wenn Sie dazu aufgefordert werden.</string>
+    <string name="title_paired_successfully">Erfolgreich gekoppelt</string>
+    <string name="msg_paired_with">Gekoppelt mit %s</string>
+    <string name="title_pairing_failed">Kopplung fehlgeschlagen</string>
+    <string name="msg_pairing_failed">Kopplung fehlgeschlagen: %s</string>
+    <string name="btn_stop">Stopp</string>
+    <string name="btn_keep_scanning">Weiter suchen…</string>
+    <string name="unable_to_get_ip">IP-Adresse konnte nicht ermittelt werden</string>
 </resources>
diff --git a/sensorhub-android-app/res/values-es/strings.xml b/sensorhub-android-app/res/values-es/strings.xml
index 22acc99..0b24dcf 100644
--- a/sensorhub-android-app/res/values-es/strings.xml
+++ b/sensorhub-android-app/res/values-es/strings.xml
@@ -184,4 +184,24 @@
     <string name="msg_port_range">El puerto debe estar entre 1 y 65535</string>
 
     <!-- Garmin -->
+    <string name="title_license_required">Clave de licencia requerida</string>
+    <string name="msg_garmin_license">La clave de licencia del SDK de Garmin Health no está configurada. Agréguela a gradle.properties.</string>
+    <string name="title_garmin_sdk_error">Error del SDK de Garmin</string>
+    <string name="msg_garmin_sdk_init_failed">Error al inicializar el SDK de Garmin Health: %s</string>
+    <string name="title_scan_failed">Escaneo fallido</string>
+    <string name="msg_garmin_scan_failed">El escaneo del dispositivo Garmin falló (error %d)</string>
+    <string name="title_scanning_garmin">Buscando dispositivos Garmin…</string>
+    <string name="msg_scanning_garmin">Asegúrese de que su dispositivo Garmin esté cerca y en modo de emparejamiento.</string>
+    <string name="title_found_garmin_devices">Se encontraron %d dispositivo(s) Garmin</string>
+    <string name="title_pairing_timeout">Tiempo de emparejamiento agotado</string>
+    <string name="msg_pairing_timeout">La autenticación expiró. Por favor, intente de nuevo.</string>
+    <string name="title_pairing">Emparejando…</string>
+    <string name="msg_pairing_with">Emparejando con %s.\nConfirme en su dispositivo Garmin si se le solicita.</string>
+    <string name="title_paired_successfully">Emparejado exitosamente</string>
+    <string name="msg_paired_with">Emparejado con %s</string>
+    <string name="title_pairing_failed">Emparejamiento fallido</string>
+    <string name="msg_pairing_failed">Error al emparejar: %s</string>
+    <string name="btn_stop">Detener</string>
+    <string name="btn_keep_scanning">Seguir buscando…</string>
+    <string name="unable_to_get_ip">No se pudo obtener la dirección IP</string>
 </resources>
diff --git a/sensorhub-android-app/res/values-fr/strings.xml b/sensorhub-android-app/res/values-fr/strings.xml
index 85716bf..bd2ec43 100644
--- a/sensorhub-android-app/res/values-fr/strings.xml
+++ b/sensorhub-android-app/res/values-fr/strings.xml
@@ -416,4 +416,25 @@
     <string name="msg_port_number">Le port doit être un nombre</string>
     <string name="msg_port_range">Le port doit être compris entre 1 et 65535</string>
 
+    <!-- Garmin -->
+    <string name="title_license_required">Clé de licence requise</string>
+    <string name="msg_garmin_license">La clé de licence du SDK Garmin Health n\'est pas configurée. Ajoutez-la dans gradle.properties.</string>
+    <string name="title_garmin_sdk_error">Erreur du SDK Garmin</string>
+    <string name="msg_garmin_sdk_init_failed">Échec de l\'initialisation du SDK Garmin Health : %s</string>
+    <string name="title_scan_failed">Échec du scan</string>
+    <string name="msg_garmin_scan_failed">Le scan de l\'appareil Garmin a échoué (erreur %d)</string>
+    <string name="title_scanning_garmin">Recherche d\'appareils Garmin…</string>
+    <string name="msg_scanning_garmin">Assurez-vous que votre appareil Garmin est à proximité et en mode d\'appairage.</string>
+    <string name="title_found_garmin_devices">%d appareil(s) Garmin trouvé(s)</string>
+    <string name="title_pairing_timeout">Délai d\'appairage expiré</string>
+    <string name="msg_pairing_timeout">L\'authentification a expiré. Veuillez réessayer.</string>
+    <string name="title_pairing">Appairage…</string>
+    <string name="msg_pairing_with">Appairage avec %s.\nVeuillez confirmer sur votre appareil Garmin si demandé.</string>
+    <string name="title_paired_successfully">Appairage réussi</string>
+    <string name="msg_paired_with">Appairé avec %s</string>
+    <string name="title_pairing_failed">Échec de l\'appairage</string>
+    <string name="msg_pairing_failed">Échec de l\'appairage : %s</string>
+    <string name="btn_stop">Arrêter</string>
+    <string name="btn_keep_scanning">Continuer la recherche…</string>
+    <string name="unable_to_get_ip">Impossible d\'obtenir l\'adresse IP</string>
 </resources>
\ No newline at end of file
diff --git a/sensorhub-android-app/res/values-it/strings.xml b/sensorhub-android-app/res/values-it/strings.xml
index 52da53b..205bc21 100644
--- a/sensorhub-android-app/res/values-it/strings.xml
+++ b/sensorhub-android-app/res/values-it/strings.xml
@@ -416,4 +416,25 @@
     <string name="msg_port_number">La porta deve essere un numero</string>
     <string name="msg_port_range">La porta deve essere compresa tra 1 e 65535</string>
 
+    <!-- Garmin -->
+    <string name="title_license_required">Chiave di licenza richiesta</string>
+    <string name="msg_garmin_license">La chiave di licenza del SDK Garmin Health non è configurata. Aggiungila in gradle.properties.</string>
+    <string name="title_garmin_sdk_error">Errore SDK Garmin</string>
+    <string name="msg_garmin_sdk_init_failed">Inizializzazione SDK Garmin Health fallita: %s</string>
+    <string name="title_scan_failed">Scansione fallita</string>
+    <string name="msg_garmin_scan_failed">Scansione dispositivo Garmin fallita (errore %d)</string>
+    <string name="title_scanning_garmin">Ricerca dispositivi Garmin…</string>
+    <string name="msg_scanning_garmin">Assicurati che il dispositivo Garmin sia vicino e in modalità di associazione.</string>
+    <string name="title_found_garmin_devices">Trovati %d dispositivo/i Garmin</string>
+    <string name="title_pairing_timeout">Timeout associazione</string>
+    <string name="msg_pairing_timeout">L\'autenticazione è scaduta. Riprova.</string>
+    <string name="title_pairing">Associazione…</string>
+    <string name="msg_pairing_with">Associazione con %s.\nConferma sul dispositivo Garmin se richiesto.</string>
+    <string name="title_paired_successfully">Associazione riuscita</string>
+    <string name="msg_paired_with">Associato con %s</string>
+    <string name="title_pairing_failed">Associazione fallita</string>
+    <string name="msg_pairing_failed">Associazione fallita: %s</string>
+    <string name="btn_stop">Ferma</string>
+    <string name="btn_keep_scanning">Continua la ricerca…</string>
+    <string name="unable_to_get_ip">Impossibile ottenere l\'indirizzo IP</string>
 </resources>
diff --git a/sensorhub-android-app/res/values-pt/strings.xml b/sensorhub-android-app/res/values-pt/strings.xml
index 78e5adb..6deacaa 100644
--- a/sensorhub-android-app/res/values-pt/strings.xml
+++ b/sensorhub-android-app/res/values-pt/strings.xml
@@ -416,4 +416,25 @@
     <string name="msg_port_number">A porta deve ser um número</string>
     <string name="msg_port_range">A porta deve estar entre 1 e 65535</string>
 
+    <!-- Garmin -->
+    <string name="title_license_required">Chave de licença necessária</string>
+    <string name="msg_garmin_license">A chave de licença do SDK Garmin Health não está configurada. Adicione-a em gradle.properties.</string>
+    <string name="title_garmin_sdk_error">Erro do SDK Garmin</string>
+    <string name="msg_garmin_sdk_init_failed">Falha ao inicializar o SDK Garmin Health: %s</string>
+    <string name="title_scan_failed">Falha na varredura</string>
+    <string name="msg_garmin_scan_failed">Varredura do dispositivo Garmin falhou (erro %d)</string>
+    <string name="title_scanning_garmin">Procurando dispositivos Garmin…</string>
+    <string name="msg_scanning_garmin">Certifique-se de que o dispositivo Garmin está próximo e em modo de emparelhamento.</string>
+    <string name="title_found_garmin_devices">Encontrado(s) %d dispositivo(s) Garmin</string>
+    <string name="title_pairing_timeout">Tempo de emparelhamento esgotado</string>
+    <string name="msg_pairing_timeout">A autenticação expirou. Por favor, tente novamente.</string>
+    <string name="title_pairing">Emparelhando…</string>
+    <string name="msg_pairing_with">Emparelhando com %s.\nConfirme no seu dispositivo Garmin se solicitado.</string>
+    <string name="title_paired_successfully">Emparelhado com sucesso</string>
+    <string name="msg_paired_with">Emparelhado com %s</string>
+    <string name="title_pairing_failed">Falha no emparelhamento</string>
+    <string name="msg_pairing_failed">Falha ao emparelhar: %s</string>
+    <string name="btn_stop">Parar</string>
+    <string name="btn_keep_scanning">Continuar procurando…</string>
+    <string name="unable_to_get_ip">Não foi possível obter o endereço IP</string>
 </resources>
diff --git a/sensorhub-android-app/res/values-zh-rTW/strings.xml b/sensorhub-android-app/res/values-zh-rTW/strings.xml
index 2210e79..f1f8e12 100644
--- a/sensorhub-android-app/res/values-zh-rTW/strings.xml
+++ b/sensorhub-android-app/res/values-zh-rTW/strings.xml
@@ -40,7 +40,6 @@
     <string name="enable_sos_service">啟用 SOS 服務</string>
     <string name="enable_csapi_service">啟用連線系統服務</string>
     <string name="enable_discovery_service">啟用探索服務</string>
-    <string name="run_name">執行名稱</string>
 
     <string name="summary_accel">啟用加速度計資料串流</string>
     <string name="summary_gyro">啟用陀螺儀資料串流</string>
@@ -62,7 +61,6 @@
     <string name="summary_flirone">啟用 FLIR One 熱像儀資料串流（透過 USB 連接時）</string>
     <string name="summary_ste">啟用 STE RadPager 資料串流（感測器須在啟動時透過藍牙 LE 連接）</string>
     <string name="summary_template">啟用範本驅動程式串流</string>
-    <string name="summary_garmin">Stream biometric data from the Garmin Wearable Sensor</string>
 
     <string name="summary_csapi"></string>
     <string name="summary_sos"></string>
@@ -250,4 +248,25 @@
     <string name="msg_port_number">連接埠應為數字</string>
     <string name="msg_port_range">連接埠應介於 1 到 65535 之間</string>
 
+    <!-- Garmin -->
+    <string name="title_license_required">需要授權金鑰</string>
+    <string name="msg_garmin_license">Garmin Health SDK 授權金鑰尚未配置。請將其新增至 gradle.properties。</string>
+    <string name="title_garmin_sdk_error">Garmin SDK 錯誤</string>
+    <string name="msg_garmin_sdk_init_failed">無法初始化 Garmin Health SDK：%s</string>
+    <string name="title_scan_failed">掃描失敗</string>
+    <string name="msg_garmin_scan_failed">Garmin 裝置掃描失敗（錯誤碼 %d）</string>
+    <string name="title_scanning_garmin">正在掃描 Garmin 裝置…</string>
+    <string name="msg_scanning_garmin">請確認 Garmin 裝置在附近且處於配對模式。</string>
+    <string name="title_found_garmin_devices">找到 %d 個 Garmin 裝置</string>
+    <string name="title_pairing_timeout">配對逾時</string>
+    <string name="msg_pairing_timeout">認證逾時，請重試。</string>
+    <string name="title_pairing">配對中…</string>
+    <string name="msg_pairing_with">正在與 %s 配對。\n如有提示，請在 Garmin 裝置上確認。</string>
+    <string name="title_paired_successfully">配對成功</string>
+    <string name="msg_paired_with">已與 %s 配對</string>
+    <string name="title_pairing_failed">配對失敗</string>
+    <string name="msg_pairing_failed">配對失敗：%s</string>
+    <string name="btn_stop">停止</string>
+    <string name="btn_keep_scanning">繼續掃描…</string>
+    <string name="unable_to_get_ip">無法取得 IP 位址</string>
 </resources>
diff --git a/sensorhub-android-app/res/values/strings.xml b/sensorhub-android-app/res/values/strings.xml
index aebba8f..b757e81 100644
--- a/sensorhub-android-app/res/values/strings.xml
+++ b/sensorhub-android-app/res/values/strings.xml
@@ -423,4 +423,20 @@
     <string name="msg_garmin_license">Garmin Health SDK license key is not configured. Add it to gradle.properties.</string>
     <string name="title_garmin_sdk_error">Garmin SDK Error</string>
     <string name="msg_garmin_sdk_init_failed">Failed to initialize Garmin Health SDK: %s</string>
+    <string name="title_scan_failed">Scan Failed</string>
+    <string name="msg_garmin_scan_failed">Garmin device scan failed (error %d)</string>
+    <string name="title_scanning_garmin">Scanning for Garmin Devices…</string>
+    <string name="msg_scanning_garmin">Make sure your Garmin device is nearby and in pairing mode.</string>
+    <string name="title_found_garmin_devices">Found %d Garmin Device(s)</string>
+    <string name="title_pairing_timeout">Pairing Timeout</string>
+    <string name="msg_pairing_timeout">Authentication timed out. Please try again.</string>
+    <string name="title_pairing">Pairing…</string>
+    <string name="msg_pairing_with">Pairing with %s.\nPlease confirm on your Garmin device if prompted.</string>
+    <string name="title_paired_successfully">Paired Successfully</string>
+    <string name="msg_paired_with">Paired with %s</string>
+    <string name="title_pairing_failed">Pairing Failed</string>
+    <string name="msg_pairing_failed">Failed to pair: %s</string>
+    <string name="btn_stop">Stop</string>
+    <string name="btn_keep_scanning">Keep scanning…</string>
+    <string name="unable_to_get_ip">Unable to get IP Address</string>
 </resources>
diff --git a/sensorhub-android-app/src/org/sensorhub/android/MainActivity.java b/sensorhub-android-app/src/org/sensorhub/android/MainActivity.java
index b0b27f2..2d1fed8 100644
--- a/sensorhub-android-app/src/org/sensorhub/android/MainActivity.java
+++ b/sensorhub-android-app/src/org/sensorhub/android/MainActivity.java
@@ -39,11 +39,9 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.Fragment;
 
-import android.content.pm.PackageManager;
 import android.location.LocationManager;
 import android.location.LocationProvider;
 
-import com.botts.impl.sensor.garmin.GarminConfig;
 import com.botts.impl.service.discovery.DiscoveryService;
 import com.botts.impl.service.discovery.DiscoveryServiceConfig;
 import com.google.android.material.appbar.MaterialToolbar;
@@ -137,23 +135,6 @@ public class MainActivity extends AppCompatActivity implements SensorHubServiceP
     private TextView toolbarTitle;
     private BroadcastReceiver broadcastReceiver;
 
-    enum Sensors {
-        Android,
-        TruPulse,
-        TruPulseSim,
-        Angel,
-        FlirOne,
-        DJIDrone,
-        ProxySensor,
-        BLELocation,
-        Meshtastic,
-        PolarHRMonitor,
-        Kestrel,
-        Wardriving,
-        Controller,
-        Template
-    }
-
     private final ServiceConnection sConn = new ServiceConnection()
     {
         public void onServiceConnected(ComponentName className, IBinder service)
@@ -475,19 +456,6 @@ public boolean verify(String arg0, SSLSession arg1) {
             sensorhubConfig.add(kestrelConfig);
         }
 
-        // Garmin sensor
-        if (prefs.getBoolean("garmin_enabled", false)) {
-            GarminConfig garminConfig = new GarminConfig();
-            garminConfig.id = "GARMIN";
-            garminConfig.name = "Garmin [" + deviceName + "]";
-            garminConfig.autoStart = true;
-            garminConfig.lastUpdated = ANDROID_SENSORS_LAST_UPDATED;
-            garminConfig.deviceAddress = prefs.getString("garmin_device_address", "");
-            garminConfig.sdkLicenseKey = BuildConfig.GARMIN_SDK_KEY;
-
-            sensorhubConfig.add(garminConfig);
-        }
-
         // Controller
         if (prefs.getBoolean("controller_enabled", false)) {
             ControllerConfig controllerConfig = new ControllerConfig();
diff --git a/sensorhub-android-lib/build.gradle b/sensorhub-android-lib/build.gradle
index d53b422..64f9aa0 100644
--- a/sensorhub-android-lib/build.gradle
+++ b/sensorhub-android-lib/build.gradle
@@ -9,7 +9,7 @@ dependencies {
   api project(':sensorhub-driver-angelsensor')
   api project(':sensorhub-driver-android')
   api project(':sensorhub-driver-kestrel')
-  api project(':sensorhub-android-garmin')
+//  api project(':sensorhub-android-garmin')
 //  api project(':sensorhub-driver-flirone')
 //  api project(':sensorhub-client-consys-okhttp')
 //  api project(':sensorhub-android-flirone')
diff --git a/settings.gradle b/settings.gradle
index d9ac7b4..23bd0d4 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -31,9 +31,7 @@ def repos = [
                 'sensors/weather/sensorhub-driver-kestrel',
                 'sensors/health/sensorhub-driver-angelsensor',
                 'processing/sensorhub-process-vecmath',
-                'processing/sensorhub-process-geoloc'
-        ],
-        'botts-addons' : [
+                'processing/sensorhub-process-geoloc',
                 'services/sensorhub-service-discovery'
         ]
 ]
diff --git a/submodules/botts-addons b/submodules/botts-addons
deleted file mode 160000
index 7271af1..0000000
--- a/submodules/botts-addons
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7271af1a739256a4170e5281f62efea0a57b41dc
diff --git a/submodules/osh-addons b/submodules/osh-addons
index 029d323..a7bc58a 160000
--- a/submodules/osh-addons
+++ b/submodules/osh-addons
@@ -1 +1 @@
-Subproject commit 029d3235e45bf3fe91b2ef619ab53fec7f7fc03e
+Subproject commit a7bc58af4afce56385f117597e302ad37220f2ee
diff --git a/submodules/osh-core b/submodules/osh-core
index e2935bf..a413b4d 160000
--- a/submodules/osh-core
+++ b/submodules/osh-core
@@ -1 +1 @@
-Subproject commit e2935bf3554ffec84ed5fb929782b8a389b7e3c0
+Subproject commit a413b4d19c5ec00d6bdef84305d9dd9992bc1a15