diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ed1a13c..389dafa 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,7 +12,7 @@ on:
 
 env:
   RELEASE: 4.5.0.16
-  TAILSCALE_VERSION: 1.56.1
+  TAILSCALE_VERSION: 1.58.2
 
 jobs:
   build:
diff --git a/qml/pages/MainPage.qml b/qml/pages/MainPage.qml
index 8fb7fc8..bd2847b 100644
--- a/qml/pages/MainPage.qml
+++ b/qml/pages/MainPage.qml
@@ -118,4 +118,17 @@ Page {
             }
         );
     }
+
+    Component.onDestruction: {
+        systemd.typedCall('StopUnit',
+            [
+                { 'type': 's', 'value': 'tailscaled.service' },
+                { 'type': 's', 'value': 'fail' }
+            ],
+            function(result) {},
+            function(error, message) {
+                console.log("failed (" + error + ") with:", message)
+            }
+        );
+    }
 }
diff --git a/rpm/harbour-tailscale.changes b/rpm/harbour-tailscale.changes
index 03f665a..1e063a5 100644
--- a/rpm/harbour-tailscale.changes
+++ b/rpm/harbour-tailscale.changes
@@ -1,3 +1,7 @@
+* Fri Feb 9 2024 Andrea Scarpino <andrea@scarpino.dev> 0.0.8-1
+- Stop tailscale on application close
+- Update tailscale to 1.58.2
+
 * Fri Jan 12 2024 Andrea Scarpino <andrea@scarpino.dev> 0.0.7-1
 - Update tailscale to 1.56.1
 
diff --git a/rpm/harbour-tailscale.spec b/rpm/harbour-tailscale.spec
index c642e53..b2f9b2a 100644
--- a/rpm/harbour-tailscale.spec
+++ b/rpm/harbour-tailscale.spec
@@ -2,7 +2,7 @@ Name:       harbour-tailscale
 
 # >> macros
 %global _missing_build_ids_terminate_build 0
-%define tailscale_version 1.56.1
+%define tailscale_version 1.58.2
 # << macros
 
 %{!?qtc_qmake:%define qtc_qmake %qmake}
@@ -10,7 +10,7 @@ Name:       harbour-tailscale
 %{!?qtc_make:%define qtc_make make}
 %{?qtc_builddir:%define _builddir %qtc_builddir}
 Summary:    tailscale
-Version:    0.0.7
+Version:    0.0.8
 Release:    1
 Group:      Qt/Qt
 License:    GPLv3