diff --git a/source/compose.manager/php/compose_manager_main.php b/source/compose.manager/php/compose_manager_main.php
index d5aa07c..e502875 100755
--- a/source/compose.manager/php/compose_manager_main.php
+++ b/source/compose.manager/php/compose_manager_main.php
@@ -2380,7 +2380,7 @@ function renderStackActionDialog(action, stackName, path, profile, containers) {
 
             containers.forEach(function(container, index) {
                 var containerName = container.Name || container.Service || 'Unknown';
-                var shortName = containerName.replace(/^[^-]+-/, '');
+                var shortName = container.Service || containerName.replace(/^[^-]+-/, '');
                 var image = container.Image || '';
                 var imageParts = image.split(':');
                 var imageName = imageParts[0].split('/').pop();
@@ -3666,7 +3666,7 @@ function renderContainerDetails(stackId, containers, project) {
 
         containers.forEach(function(container, idx) {
             var containerName = container.Name || container.Service || 'Unknown';
-            var shortName = containerName.replace(/^[^-]+-/, ''); // Remove project prefix
+            var shortName = container.Service || containerName.replace(/^[^-]+-/, ''); // Prefer service name; fall back to stripping project prefix
             var image = container.Image || '';
 
             // Parse image - handle docker.io/ prefix and @sha256: digest