diff --git a/apps/faultmanagement/fmcli/BUILD b/apps/faultmanagement/fmcli/BUILD
index d71db6d..c86b7f3 100644
--- a/apps/faultmanagement/fmcli/BUILD
+++ b/apps/faultmanagement/fmcli/BUILD
@@ -4,6 +4,6 @@
 ]
 
 osgi_jar_with_tests(
-    import_packages = "*,org.onosproject.cli.net",
+    karaf_command_packages = ["org.onosproject.faultmanagement.alarms.cli"],
     deps = COMPILE_DEPS,
 )
diff --git a/apps/faultmanagement/fmcli/src/main/java/org/onosproject/faultmanagement/alarms/cli/GetAllAlarms.java b/apps/faultmanagement/fmcli/src/main/java/org/onosproject/faultmanagement/alarms/cli/GetAllAlarms.java
index deefd22..1c48dfb 100644
--- a/apps/faultmanagement/fmcli/src/main/java/org/onosproject/faultmanagement/alarms/cli/GetAllAlarms.java
+++ b/apps/faultmanagement/fmcli/src/main/java/org/onosproject/faultmanagement/alarms/cli/GetAllAlarms.java
@@ -19,9 +19,11 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.apache.karaf.shell.api.action.Argument;
 import org.apache.karaf.shell.api.action.Command;
+import org.apache.karaf.shell.api.action.Completion;
 import org.apache.karaf.shell.api.action.Option;
 import org.apache.karaf.shell.api.action.lifecycle.Service;
 import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.cli.net.DeviceIdCompleter;
 import org.onosproject.incubator.net.faultmanagement.alarm.Alarm;
 import org.onosproject.incubator.net.faultmanagement.alarm.AlarmService;
 import org.onosproject.net.DeviceId;
@@ -42,6 +44,7 @@
 
     @Argument(index = 0, name = "deviceId", description = "Device identity",
             required = false, multiValued = false)
+    @Completion(DeviceIdCompleter.class)
     String deviceId = null;
 
     private AlarmService alarmService = AbstractShellCommand.get(AlarmService.class);
diff --git a/apps/faultmanagement/fmcli/src/main/java/org/onosproject/faultmanagement/alarms/cli/GetAllAlarmsCounts.java b/apps/faultmanagement/fmcli/src/main/java/org/onosproject/faultmanagement/alarms/cli/GetAllAlarmsCounts.java
index 0fa2e3e..1ce2ed2 100644
--- a/apps/faultmanagement/fmcli/src/main/java/org/onosproject/faultmanagement/alarms/cli/GetAllAlarmsCounts.java
+++ b/apps/faultmanagement/fmcli/src/main/java/org/onosproject/faultmanagement/alarms/cli/GetAllAlarmsCounts.java
@@ -19,9 +19,11 @@
 
 import org.apache.karaf.shell.api.action.Argument;
 import org.apache.karaf.shell.api.action.Command;
+import org.apache.karaf.shell.api.action.Completion;
 import org.apache.karaf.shell.api.action.Option;
 import org.apache.karaf.shell.api.action.lifecycle.Service;
 import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.cli.net.DeviceIdCompleter;
 import org.onosproject.incubator.net.faultmanagement.alarm.Alarm;
 import org.onosproject.incubator.net.faultmanagement.alarm.AlarmService;
 import org.onosproject.net.DeviceId;
@@ -43,6 +45,7 @@
 
     @Argument(index = 0, name = "deviceId", description = "Device identity",
             required = false, multiValued = false)
+    @Completion(DeviceIdCompleter.class)
     String deviceId = null;
 
     private AlarmService alarmService = AbstractShellCommand.get(AlarmService.class);