diff --git a/Makefile b/Makefile
index 5f9b4dd..bbd8b17 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 IMAGE?=localstack/localstack-docker-desktop
-TAG?=0.4.1
+TAG?=0.4.2
 
 BUILDER=buildx-multi-arch
 
diff --git a/ui/src/components/Header/Menu.tsx b/ui/src/components/Header/Menu.tsx
index 56c0250..1a3bab2 100644
--- a/ui/src/components/Header/Menu.tsx
+++ b/ui/src/components/Header/Menu.tsx
@@ -8,6 +8,14 @@ import { UpdateDialog } from '../Views';
 
 const ITEM_HEIGHT = 80;
 
+const IMAGE_PREFIXES = [
+  'localstack/',
+  'lambci/lambda:',
+  'mlupin/docker-lambda:',
+  'public.ecr.aws/lambda',
+];
+
+
 export const LongMenu = () => {
   const [anchorEl, setAnchorEl] = useState<null | HTMLElement>(null);
   const [openModal, setOpenModal] = useState<boolean>(false);
@@ -34,7 +42,10 @@ export const LongMenu = () => {
     const fetchImages = async () => {
       const images = (await ddClient.docker.listImages()) as DockerImage[];
 
-      const localstackImages = images.filter(image => image.RepoTags?.at(0)?.startsWith('localstack/'));
+      const localstackImages = images.filter(image =>
+        IMAGE_PREFIXES.some(prefix => image.RepoTags?.at(0)?.startsWith(prefix)) &&
+        !image.RepoTags?.at(0)?.endsWith(':<none>'));
+
       const imagesWithoutOrgName = localstackImages.map(image => removeRepoFromImage(image.RepoTags?.at(0)));
       setImages(imagesWithoutOrgName);
     };