diff --git a/wo/cli/plugins/stack.py b/wo/cli/plugins/stack.py
index f2a5981..302621f 100644
--- a/wo/cli/plugins/stack.py
+++ b/wo/cli/plugins/stack.py
@@ -767,9 +767,9 @@ class WOStackController(CementBaseController):
 
         # netdata
         if pargs.netdata:
-            Log.debug(self, "Removing Netdata")
-            if os.path.isfile('/opt/netdata/usr/'
-                              'libexec/netdata/netdata-uninstaller.sh'):
+            if (os.path.exists('/opt/netdata') or
+                    os.path.exists('/etc/netdata')):
+                Log.debug(self, "Removing Netdata")
                 packages = packages + ['/var/lib/wo/tmp/kickstart.sh']
 
         # wordops dashboard
@@ -814,20 +814,28 @@ class WOStackController(CementBaseController):
                 WOService.stop_service(self, 'mysql')
 
             # Netdata uninstaller
-            if (set(['/var/lib/wo/tmp/'
-                     'kickstart.sh']).issubset(set(packages))):
-                if WOVar.wo_distro == 'Raspbian':
+            if '/var/lib/wo/tmp/kickstart.sh' in packages:
+                if os.path.exists(
+                        '/usr/libexec/netdata/netdata-uninstaller.sh'):
+                    Log.debug(self, "Uninstalling Netdata from /etc/netdata")
                     WOShellExec.cmd_exec(
-                        self, "bash /usr/"
-                        "libexec/netdata/"
-                        "netdata-uninstaller.sh -y -f",
+                        self, "bash /usr/libexec/netdata/netdata-"
+                        "uninstaller.sh -y -f",
                         errormsg='', log=False)
+                    packages = packages + ["/etc/netdata"]
+                elif os.path.exists(
+                    '/opt/netdata/usr/libexec/'
+                        'netdata/netdata-uninstaller.sh'):
+                    Log.debug(self, "Uninstalling Netdata from /opt/netdata")
+                    WOShellExec.cmd_exec(
+                        self, "bash /opt/netdata/usr/libexec/netdata/netdata-"
+                        "uninstaller.sh -y -f")
+                    packages = packages + ["/opt/netdata"]
                 else:
-                    WOShellExec.cmd_exec(
-                        self, "bash /opt/netdata/usr/"
-                        "libexec/netdata/"
-                        "netdata-uninstaller.sh -y -f",
-                        errormsg='', log=False)
+                    Log.debug(self, "Netdata uninstaller not found")
+                if WOShellExec.cmd_exec(self, 'mysqladmin ping'):
+                    WOMysql.execute(
+                        self, "DELETE FROM mysql.user WHERE User = 'netdata';")
 
             if (packages):
                 Log.wait(self, "Removing packages           ")
@@ -1079,11 +1087,11 @@ class WOStackController(CementBaseController):
                                    '{0}22222/htdocs/db/anemometer'
                                    .format(WOVar.wo_webroot)
                                    ]
-
+        # netdata
         if pargs.netdata:
-            Log.debug(self, "Removing Netdata")
-            if os.path.isfile('/opt/netdata/usr/'
-                              'libexec/netdata/netdata-uninstaller.sh'):
+            if (os.path.exists('/opt/netdata') or
+                    os.path.exists('/etc/netdata')):
+                Log.debug(self, "Removing Netdata")
                 packages = packages + ['/var/lib/wo/tmp/kickstart.sh']
 
         # wordops dashboard
@@ -1129,17 +1137,25 @@ class WOStackController(CementBaseController):
                     WOService.stop_service(self, 'mysql')
 
             # Netdata uninstaller
-            if (set(['/var/lib/wo/tmp/'
-                     'kickstart.sh']).issubset(set(packages))):
-                if WOVar.wo_distro == 'Raspbian':
-                    WOShellExec.cmd_exec(self, "bash /usr/"
-                                         "libexec/netdata/netdata-"
-                                         "uninstaller.sh -y -f",
-                                         errormsg='', log=False)
+            if '/var/lib/wo/tmp/kickstart.sh' in packages:
+                if os.path.exists(
+                        '/usr/libexec/netdata/netdata-uninstaller.sh'):
+                    Log.debug(self, "Uninstalling Netdata from /etc/netdata")
+                    WOShellExec.cmd_exec(
+                        self, "bash /usr/libexec/netdata/netdata-"
+                        "uninstaller.sh -y -f",
+                        errormsg='', log=False)
+                    packages = packages + ["/etc/netdata"]
+                elif os.path.exists(
+                    '/opt/netdata/usr/libexec/'
+                        'netdata/netdata-uninstaller.sh'):
+                    Log.debug(self, "Uninstalling Netdata from /opt/netdata")
+                    WOShellExec.cmd_exec(
+                        self, "bash /opt/netdata/usr/libexec/netdata/netdata-"
+                        "uninstaller.sh -y -f")
+                    packages = packages + ["/opt/netdata"]
                 else:
-                    WOShellExec.cmd_exec(self, "bash /opt/netdata/usr/"
-                                         "libexec/netdata/netdata-"
-                                         "uninstaller.sh -y -f")
+                    Log.debug(self, "Netdata uninstaller not found")
                 if WOShellExec.cmd_exec(self, 'mysqladmin ping'):
                     WOMysql.execute(
                         self, "DELETE FROM mysql.user WHERE User = 'netdata';")