git.diff

diff --git a/lib/hammer_cli_foreman_docker/docker_image.rb b/lib/hammer_cli_foreman_docker/docker_image.rb
index b9ee01e..46e3147 100644
--- a/lib/hammer_cli_foreman_docker/docker_image.rb
+++ b/lib/hammer_cli_foreman_docker/docker_image.rb
@@ -5,6 +5,8 @@ module HammerCLIForemanDocker
     desc _('Manage docker images')
 
     class ListCommand < HammerCLIForeman::ListCommand
+      include ::HammerCLIKatello::LifecycleEnvironmentNameResolvable
+
       output do
         field :id, _("ID")
         field :image_id, _("Image ID")
diff --git a/lib/hammer_cli_foreman_docker/docker_tag.rb b/lib/hammer_cli_foreman_docker/docker_tag.rb
index bc67e76..31989c9 100644
--- a/lib/hammer_cli_foreman_docker/docker_tag.rb
+++ b/lib/hammer_cli_foreman_docker/docker_tag.rb
@@ -5,6 +5,8 @@ module HammerCLIForemanDocker
     desc _('Manage docker tags')
 
     class ListCommand < HammerCLIForeman::ListCommand
+      include ::HammerCLIKatello::LifecycleEnvironmentNameResolvable
+
       output do
         field :id, _("ID")
         field :name, _("Tag Name")