diff --git a/os/linux/local/mode/discoverynmap.pm b/apps/nmap/cli/mode/discovery.pm
similarity index 97%
rename from os/linux/local/mode/discoverynmap.pm
rename to apps/nmap/cli/mode/discovery.pm
index f9477d7e6..35926ad39 100644
--- a/os/linux/local/mode/discoverynmap.pm
+++ b/apps/nmap/cli/mode/discovery.pm
@@ -18,13 +18,12 @@
 # limitations under the License.
 #
 
-package os::linux::local::mode::discoverynmap;
+package apps::nmap::cli::mode::discovery;
 
 use base qw(centreon::plugins::mode);
 
 use strict;
 use warnings;
-use centreon::plugins::snmp;
 use JSON::XS;
 use XML::Simple;
 
@@ -34,8 +33,8 @@ sub new {
     bless $self, $class;
     
     $options{options}->add_options(arguments => {
-        'subnet:s'              => { name => 'subnet' },
-        'prettify'              => { name => 'prettify' }
+        'subnet:s' => { name => 'subnet' },
+        'prettify' => { name => 'prettify' }
     });
                                     
     return $self;
diff --git a/apps/nmap/cli/plugin.pm b/apps/nmap/cli/plugin.pm
new file mode 100644
index 000000000..da8f2468f
--- /dev/null
+++ b/apps/nmap/cli/plugin.pm
@@ -0,0 +1,50 @@
+#
+# Copyright 2021 Centreon (http://www.centreon.com/)
+#
+# Centreon is a full-fledged industry-strength solution that meets
+# the needs in IT infrastructure and application monitoring for
+# service performance.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+package apps::nmap::cli::plugin;
+
+use strict;
+use warnings;
+use base qw(centreon::plugins::script_custom);
+
+sub new {
+    my ($class, %options) = @_;
+    my $self = $class->SUPER::new(package => __PACKAGE__, %options);
+    bless $self, $class;
+
+    $self->{version} = '0.1';
+    $self->{modes} = {
+        'discovery' => 'apps::nmap::cli::mode::discovery',
+    };
+
+    $self->{custom_modes}->{cli} = 'centreon::plugins::script_custom::cli';
+
+    return $self;
+}
+
+1;
+
+__END__
+
+=head1 PLUGIN DESCRIPTION
+
+Nmap Plugin to discover assets on your networks
+
+=cut
diff --git a/os/linux/local/plugin.pm b/os/linux/local/plugin.pm
index 711edee09..54d655a9e 100644
--- a/os/linux/local/plugin.pm
+++ b/os/linux/local/plugin.pm
@@ -37,7 +37,6 @@ sub new {
         'cmd-return'        => 'os::linux::local::mode::cmdreturn',
         'connections'       => 'os::linux::local::mode::connections',
         'directlvm-usage'   => 'os::linux::local::mode::directlvmusage',
-        'discovery-nmap'    => 'os::linux::local::mode::discoverynmap',
         'discovery-snmp'    => 'os::linux::local::mode::discoverysnmp',
         'diskio'            => 'os::linux::local::mode::diskio',
         'files-size'        => 'os::linux::local::mode::filessize',