diff --git a/packages/renderer/src/lib/image/SaveImages.spec.ts b/packages/renderer/src/lib/image/SaveImages.spec.ts
index 8ba8fdbdb70f4..aec9dc7c91357 100644
--- a/packages/renderer/src/lib/image/SaveImages.spec.ts
+++ b/packages/renderer/src/lib/image/SaveImages.spec.ts
@@ -34,14 +34,16 @@ import SaveImages from './SaveImages.svelte';
 const imageInfo: ImageInfoUI = {
   id: 'id',
   shortId: 'id',
-  name: 'image 1',
+  name: '<none>',
+  tag: '',
   engineId: 'engine',
 } as ImageInfoUI;
 
 const imageInfo2: ImageInfoUI = {
   id: 'id2',
   shortId: 'id2',
-  name: 'image 2',
+  name: '<none>',
+  tag: '',
   engineId: 'engine',
 } as ImageInfoUI;
 
@@ -86,17 +88,18 @@ test('Expect deleteImage is not visible if page has been opened with one item',
 test('Expect deleteImage is visible if page has been opened with multiple item', async () => {
   saveImagesInfo.set([imageInfo, imageInfo2]);
   await waitRender();
-
-  const itemBeforeDelete = screen.getAllByLabelText('container image path');
-  expect(itemBeforeDelete.length).equal(2);
-
-  const deleteButtons = screen.getAllByLabelText('Delete image');
-
-  await userEvent.click(deleteButtons[0]);
-
-  const itemAfterDelete = screen.getAllByLabelText('container image path');
-  expect(itemAfterDelete.length).equal(1);
-  expect(itemAfterDelete.length).toBeLessThan(itemBeforeDelete.length);
+  const itemBeforeDelete1 = screen.getByRole('textbox', { name: 'image id' });
+  expect(itemBeforeDelete1).toBeInTheDocument();
+  const itemBeforeDelete2 = screen.getByRole('textbox', { name: 'image id2' });
+  expect(itemBeforeDelete2).toBeInTheDocument();
+
+  const deleteButtonImage1 = screen.getByRole('button', { name: 'Delete image id' });
+
+  await userEvent.click(deleteButtonImage1);
+  const afterDeletionImage1 = screen.queryByRole('textbox', { name: 'image id' });
+  expect(afterDeletionImage1).not.toBeInTheDocument();
+  const afterDeletionImage2 = screen.getByRole('textbox', { name: 'image id2' });
+  expect(afterDeletionImage2).toBeInTheDocument();
 });
 
 test('Expect save button to be enabled if output target is selected and saveImages function called', async () => {
@@ -168,3 +171,39 @@ test('Expect error message dispayed if saveImages fails', async () => {
   expect(errorDiv).toBeInTheDocument();
   expect((errorDiv as HTMLDivElement).innerHTML).toContain('error while saving');
 });
+
+test('Expect display correctly images to save', async () => {
+  saveImagesInfo.set([
+    {
+      id: 'id1',
+      shortId: 'id1',
+      name: '<none>',
+      tag: '',
+      engineId: 'engine',
+    },
+    {
+      id: 'httpdid2',
+      shortId: 'httpdid2',
+      name: 'httpd',
+      tag: 'latest',
+      engineId: 'engine',
+    },
+    {
+      id: 'httpdid3',
+      shortId: 'httpdid3',
+      name: 'httpd',
+      tag: '1.2.3',
+      engineId: 'engine',
+    },
+  ] as ImageInfoUI[]);
+  await waitRender();
+
+  // now expect to see the images with the correct names
+  // grap all input fields
+  const noImageName = screen.getByRole('textbox', { name: 'image id1' });
+  expect(noImageName).toBeInTheDocument();
+  const inputHttpdWithCustomTag = screen.getByRole('textbox', { name: 'image httpd:1.2.3' });
+  expect(inputHttpdWithCustomTag).toBeInTheDocument();
+  const inputHttpdWithDefaultTag = screen.getByRole('textbox', { name: 'image httpd:latest' });
+  expect(inputHttpdWithDefaultTag).toBeInTheDocument();
+});
diff --git a/packages/renderer/src/lib/image/SaveImages.svelte b/packages/renderer/src/lib/image/SaveImages.svelte
index a1f49b49a4956..591f0f09e86a3 100644
--- a/packages/renderer/src/lib/image/SaveImages.svelte
+++ b/packages/renderer/src/lib/image/SaveImages.svelte
@@ -152,11 +152,13 @@ async function saveImages() {
             <div class="flex flex-col grow">Images to save</div>
           </div>
           {#each imagesToSave as imageToSave, index}
+            {@const imageAndTag = `${imageToSave.name}:${imageToSave.tag}`}
+            {@const imageDisplayName = `${imageToSave.name === '<none>' ? imageToSave.shortId : imageAndTag}`}
             <div class="flex flex-row justify-center w-full py-1">
-              <Input bind:value="{imageToSave.name}" aria-label="container image path" readonly="{true}" />
+              <Input value="{imageDisplayName}" aria-label="image {imageDisplayName}" readonly="{true}" />
               <Button
                 type="link"
-                aria-label="Delete image"
+                aria-label="Delete image {imageDisplayName}"
                 on:click="{() => deleteImageToSave(index)}"
                 icon="{faMinusCircle}" />
             </div>