diff --git a/focal/debian/gz-sim7-cli.install b/focal/debian/gz-sim7-cli.install
new file mode 120000
index 0000000..17de531
--- /dev/null
+++ b/focal/debian/gz-sim7-cli.install
@@ -0,0 +1 @@
+../../ubuntu/debian/gz-sim-cli.install
\ No newline at end of file
diff --git a/jammy/debian/gz-sim7-cli.install b/jammy/debian/gz-sim7-cli.install
new file mode 120000
index 0000000..17de531
--- /dev/null
+++ b/jammy/debian/gz-sim7-cli.install
@@ -0,0 +1 @@
+../../ubuntu/debian/gz-sim-cli.install
\ No newline at end of file
diff --git a/ubuntu/debian/control b/ubuntu/debian/control
index e56b385..68eb234 100644
--- a/ubuntu/debian/control
+++ b/ubuntu/debian/control
@@ -43,6 +43,7 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          qml-module-qtqml-models2
+Suggests: gz-sim7-cli
 Breaks: libignition-gazebo7 (<< 6.999.999+nightly+git20220630+2rcb61c01f8894e4f435f544d3511f346eaa753142-2)
 Replaces: libignition-gazebo7 (<< 6.999.999+nightly+git20220630+2rcb61c01f8894e4f435f544d3511f346eaa753142-2)
 Multi-Arch: same
@@ -52,6 +53,18 @@ Description: Gazebo Sim classes and functions for robot apps - Shared library
  .
  Main shared library
 
+Package: gz-sim7-cli
+Architecture: any
+Depends: libgz-sim7 (= ${binary:Version}),
+         ${shlibs:Depends},
+         ${misc:Depends}
+Multi-Arch: no
+Description: Gazebo Sim classes and functions for robot apps - CLI
+ Gazebo Sim is a component in the Gazebo framework, a set of libraries
+ designed to rapidly develop robot applications.
+ .
+ The package ships the CLI.
+
 Package: libgz-sim7-plugins
 Architecture: any
 Section: libs
@@ -141,6 +154,14 @@ Section: oldlibs
 Description: transitional package
  This is a transitional package. It can safely be removed.
 
+Package: ignition-gazebo7-cli
+Depends: gz-sim7-cli, ${misc:Depends}
+Architecture: all
+Priority: optional
+Section: oldlibs
+Description: transitional package
+ This is a transitional package. It can safely be removed.
+
 Package: libignition-gazebo7-plugins
 Depends: libgz-sim7-plugins, ${misc:Depends}
 Architecture: all
diff --git a/ubuntu/debian/gz-sim-cli.install b/ubuntu/debian/gz-sim-cli.install
new file mode 100644
index 0000000..75225f7
--- /dev/null
+++ b/ubuntu/debian/gz-sim-cli.install
@@ -0,0 +1,4 @@
+usr/lib/ruby/gz/*.rb
+usr/share/*/*[0-99].yaml
+usr/share/*/model[0-99].yaml
+usr/share/gz/*.completion*/*
diff --git a/ubuntu/debian/libgz-sim-dev.install b/ubuntu/debian/libgz-sim-dev.install
index 464df8d..3ccf13d 100644
--- a/ubuntu/debian/libgz-sim-dev.install
+++ b/ubuntu/debian/libgz-sim-dev.install
@@ -3,7 +3,3 @@ usr/lib/*/*.so
 usr/lib/*/pkgconfig/*.pc
 usr/lib/*/cmake/*-*/*
 # usr/share/*/*-*[0-99]/*-*[0-99].tag.xml
-usr/share/*/*[0-99].yaml
-usr/share/*/model[0-99].yaml
-usr/lib/ruby/*/cmdsim[0-99].rb
-usr/lib/ruby/*/cmdmodel[0-99].rb