diff --git a/deploy/data/windows/x32/post_install.cmd b/deploy/data/windows/x32/post_install.cmd
new file mode 100644
index 00000000..155234e2
--- /dev/null
+++ b/deploy/data/windows/x32/post_install.cmd
@@ -0,0 +1,5 @@
+sc stop WireGuardTunnel$AmneziaVPN
+sc delete WireGuardTunnel$AmneziaVPN
+taskkill /IM "AmneziaVPN-service.exe" /F
+taskkill /IM "AmneziaVPN.exe" /F
+exit /b 0
diff --git a/deploy/data/windows/x32/post_uninstall.cmd b/deploy/data/windows/x32/post_uninstall.cmd
index 6248a295..a26c8a08 100644
--- a/deploy/data/windows/x32/post_uninstall.cmd
+++ b/deploy/data/windows/x32/post_uninstall.cmd
@@ -5,3 +5,8 @@ echo %AmneziaPath%
 timeout /t 1
 sc stop AmneziaVPN-service
 sc delete AmneziaVPN-service
+sc stop WireGuardTunnel$AmneziaVPN
+sc delete WireGuardTunnel$AmneziaVPN
+taskkill /IM "AmneziaVPN-service.exe" /F
+taskkill /IM "AmneziaVPN.exe" /F
+exit /b 0
diff --git a/deploy/data/windows/x64/post_install.cmd b/deploy/data/windows/x64/post_install.cmd
new file mode 100644
index 00000000..155234e2
--- /dev/null
+++ b/deploy/data/windows/x64/post_install.cmd
@@ -0,0 +1,5 @@
+sc stop WireGuardTunnel$AmneziaVPN
+sc delete WireGuardTunnel$AmneziaVPN
+taskkill /IM "AmneziaVPN-service.exe" /F
+taskkill /IM "AmneziaVPN.exe" /F
+exit /b 0
diff --git a/deploy/data/windows/x64/post_uninstall.cmd b/deploy/data/windows/x64/post_uninstall.cmd
index 6248a295..a26c8a08 100644
--- a/deploy/data/windows/x64/post_uninstall.cmd
+++ b/deploy/data/windows/x64/post_uninstall.cmd
@@ -5,3 +5,8 @@ echo %AmneziaPath%
 timeout /t 1
 sc stop AmneziaVPN-service
 sc delete AmneziaVPN-service
+sc stop WireGuardTunnel$AmneziaVPN
+sc delete WireGuardTunnel$AmneziaVPN
+taskkill /IM "AmneziaVPN-service.exe" /F
+taskkill /IM "AmneziaVPN.exe" /F
+exit /b 0
diff --git a/deploy/installer/config/controlscript.js b/deploy/installer/config/controlscript.js
index d0c82636..0a047fe7 100644
--- a/deploy/installer/config/controlscript.js
+++ b/deploy/installer/config/controlscript.js
@@ -93,8 +93,9 @@ function checkProcessIsRunning(arg)
 {
     var cmdArgs = ["-c", arg];
     var result = installer.execute("/bin/bash", cmdArgs);
-    var resultArg1  = Number(result[0])
-    if (resultArg1 >= 3) {
+    var lines = result[0].trim().split(/\n+/);
+    var resultArg1 = Number(lines[0])
+    if (resultArg1 >= 2) {
         return true;
     }
     return false;
diff --git a/deploy/installer/packages/org.amneziavpn.package/meta/componentscript.js b/deploy/installer/packages/org.amneziavpn.package/meta/componentscript.js
index aae48338..7355c658 100644
--- a/deploy/installer/packages/org.amneziavpn.package/meta/componentscript.js
+++ b/deploy/installer/packages/org.amneziavpn.package/meta/componentscript.js
@@ -88,8 +88,9 @@ Component.prototype.createOperations = function()
         component.addElevatedOperation("Execute",
                                        ["sc", "create", serviceName(), "binpath=", pu_path + serviceName() + ".exe",
                                         "start=", "auto", "depend=", "BFE/nsi"],
-                                       "UNDOEXECUTE", "cmd", "/c", pu_path + "post_uninstall.cmd");
-
+                                        "UNDOEXECUTE", "cmd", "/c", pu_path + "post_uninstall.cmd");
+										
+        component.addElevatedOperation("Execute", "cmd", "/c", pu_path + "post_install.cmd");
     } else if (runningOnMacOS()) {
         component.addElevatedOperation("Execute", "@TargetDir@/post_install.sh", "UNDOEXECUTE", "@TargetDir@/post_uninstall.sh");
     } else if (runningOnLinux()) {