diff --git a/scripts/image-builder.sh b/scripts/image-builder.sh
index aef0241..ada39e0 100755
--- a/scripts/image-builder.sh
+++ b/scripts/image-builder.sh
@@ -69,17 +69,17 @@ install_docker_and_buildx() {
     chmod +x ~/.docker/cli-plugins/docker-buildx
   fi
 
-  # Prüfen ob Builder existiert
-  if ! docker buildx inspect multiarch-builder >/dev/null 2>&1; then
-    whiptail --msgbox "Richte Buildx-Builder ein..." 10 70
+  # Prüfen, ob multiarch-builder existiert
+  if ! docker buildx ls | grep -q "multiarch-builder"; then
+    whiptail --msgbox "Richte Buildx-Builder 'multiarch-builder' ein..." 10 70
     docker run --rm --privileged tonistiigi/binfmt --install all
     docker buildx create --name multiarch-builder --use
     docker buildx inspect --bootstrap >/dev/null 2>&1
   fi
 
-  # Finalmeldung
-  if docker buildx inspect multiarch-builder >/dev/null 2>&1; then
-    whiptail --msgbox "Buildx-Builder erfolgreich eingerichtet." 10 70
+  # Finalprüfung: existiert Builder jetzt wirklich?
+  if docker buildx ls | grep -q "multiarch-builder"; then
+    whiptail --msgbox "Buildx-Builder 'multiarch-builder' erfolgreich eingerichtet." 10 70
   else
     whiptail --msgbox "Fehler: Buildx-Builder konnte nicht eingerichtet werden!" 10 70
   fi