diff --git a/README.md b/README.md
index 7055d6aa..072bab92 100644
--- a/README.md
+++ b/README.md
@@ -54,10 +54,6 @@ See Docker Hub or GitHub Container Registry for an updated list of tags
 * [sapmachine-11](https://github.com/carlossg/docker-maven/blob/main/sapmachine-11/)
 * [sapmachine-17](https://github.com/carlossg/docker-maven/blob/main/sapmachine-17/)
 * [sapmachine-21](https://github.com/carlossg/docker-maven/blob/main/sapmachine-21/)
-* [graalvm-community-17](https://github.com/carlossg/docker-maven/blob/main/graalvm-community-17/)
-* [graalvm-community-21](https://github.com/carlossg/docker-maven/blob/main/graalvm-community-21/)
-* [oracle-graalvm-17](https://github.com/carlossg/docker-maven/blob/main/oracle-graalvm-17/)
-* [oracle-graalvm-21](https://github.com/carlossg/docker-maven/blob/main/oracle-graalvm-21/)
 
 Only under `csanchez/maven` and `ghcr.io/carlossg/maven`:
 * [azulzulu-8](https://github.com/carlossg/docker-maven/blob/main/azulzulu-8/Dockerfile)
@@ -68,6 +64,8 @@ Only under `csanchez/maven` and `ghcr.io/carlossg/maven`:
 * [azulzulu-17-alpine](https://github.com/carlossg/docker-maven/blob/main/azulzulu-17-alpine/Dockerfile)
 * [azulzulu-21](https://github.com/carlossg/docker-maven/blob/main/azulzulu-21/Dockerfile)
 * [azulzulu-21-alpine](https://github.com/carlossg/docker-maven/blob/main/azulzulu-21-alpine/Dockerfile)
+* [graalvm-community-17](https://github.com/carlossg/docker-maven/blob/main/graalvm-community-17/)
+* [graalvm-community-21](https://github.com/carlossg/docker-maven/blob/main/graalvm-community-21/)
 * [libericaopenjdk-11](https://github.com/carlossg/docker-maven/blob/main/libericaopenjdk-11/Dockerfile)
 * [libericaopenjdk-11-alpine](https://github.com/carlossg/docker-maven/blob/main/libericaopenjdk-11-alpine/Dockerfile)
 * [libericaopenjdk-17](https://github.com/carlossg/docker-maven/blob/main/libericaopenjdk-17/Dockerfile)
@@ -77,6 +75,8 @@ Only under `csanchez/maven` and `ghcr.io/carlossg/maven`:
 * [microsoft-openjdk-11-ubuntu](https://github.com/carlossg/docker-maven/blob/main/microsoft-openjdk-11-ubuntu/Dockerfile)
 * [microsoft-openjdk-17-ubuntu](https://github.com/carlossg/docker-maven/blob/main/microsoft-openjdk-17-ubuntu/Dockerfile)
 * [microsoft-openjdk-21-ubuntu](https://github.com/carlossg/docker-maven/blob/main/microsoft-openjdk-21-ubuntu/Dockerfile)
+* [oracle-graalvm-17](https://github.com/carlossg/docker-maven/blob/main/oracle-graalvm-17/)
+* [oracle-graalvm-21](https://github.com/carlossg/docker-maven/blob/main/oracle-graalvm-21/)
 
 ## Windows Based Images
 
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
index 521bfb60..02c2382e 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -80,17 +80,15 @@ echo "GitRepo: $url"
 echo 'GitFetch: refs/heads/main'
 
 for version in "${all_dirs[@]}"; do
-	# ignore images that can't be official
-	if grep -q "FROM mcr.microsoft.com" "$version/Dockerfile"; then
-		continue
-	fi
-	# ignore all windows images
-	if grep -q "FROM .*windows" "$version/Dockerfile"; then
-		continue
-	fi
-	if [[ "$version" != azulzulu* ]] && [[ "$version" != liberica* ]]; then
-		branch=main
-		mapfile -t versionAliases < <(version-aliases "$version" "$branch")
-		generate-version "$version" "$branch" "${versionAliases[@]}"
-	fi
+	# ignore images that can't be official and windows
+	ignore_from=(".*windows" "container-registry.oracle.com" "ghcr.io" "mcr.microsoft.com" "azul/" "bellsoft/")
+	for ignore in "${ignore_from[@]}"; do
+		if grep -q "FROM $ignore" "$version/Dockerfile"; then
+			continue 2
+		fi
+	done
+
+	branch=main
+	mapfile -t versionAliases < <(version-aliases "$version" "$branch")
+	generate-version "$version" "$branch" "${versionAliases[@]}"
 done