diff --git a/.scripts/update_readme_badges.sh b/.scripts/update_readme_badges.sh
index 88e16cc34..a116bd50d 100755
--- a/.scripts/update_readme_badges.sh
+++ b/.scripts/update_readme_badges.sh
@@ -30,7 +30,7 @@ for _ in $(seq 0 $((COLS - 1))); do
 done
 echo "|" >> "$BADGES_TMP"
 
-for BUILD_WORKFLOW_FILE in .github/workflows/build_*.yaml; do
+for BUILD_WORKFLOW_FILE in $(find .github/workflows/ -name 'build_*.yaml' | sort -d); do
   CURRENT_COLUMN=$(( (CURRENT_COLUMN + 1) % COLS ))
 
   BUILD_WORKFLOW_NAME=$(yq -r '.name' "$BUILD_WORKFLOW_FILE")
diff --git a/README.md b/README.md
index c94304772..0846d41bd 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ This repository contains Dockerfiles and scripts to build base images for use wi
 | [![Build Airflow]][build_airflow.yaml] | [![Build Druid]][build_druid.yaml] | [![Build Hadoop]][build_hadoop.yaml] | [![Build HBase]][build_hbase.yaml] |
 | [![Build Hive]][build_hive.yaml] | [![Build Java Base]][build_java-base.yaml] | [![Build Java Development]][build_java-devel.yaml] | [![Build Kafka Testing Tools]][build_kafka-testing-tools.yaml] |
 | [![Build Kafka]][build_kafka.yaml] | [![Build Krb5]][build_krb5.yaml] | [![Build NiFi]][build_nifi.yaml] | [![Build Omid]][build_omid.yaml] |
-| [![Build OPA]][build_opa.yaml] | [![Build OpenSearch]][build_opensearch.yaml] | [![Build OpenSearch Dashboards]][build_opensearch_dashboards.yaml] | [![Build Spark Connect Client]][build_spark-connect-client.yaml] |
+| [![Build OPA]][build_opa.yaml] | [![Build OpenSearch Dashboards]][build_opensearch_dashboards.yaml] | [![Build OpenSearch]][build_opensearch.yaml] | [![Build Spark Connect Client]][build_spark-connect-client.yaml] |
 | [![Build Spark K8s]][build_spark-k8s.yaml] | [![Build Stackable Base]][build_stackable-base.yaml] | [![Build Superset]][build_superset.yaml] | [![Build Testing Tools]][build_testing-tools.yaml] |
 | [![Build Tools]][build_tools.yaml] | [![Build Trino CLI]][build_trino-cli.yaml] | [![Build Trino]][build_trino.yaml] | [![Build Vector]][build_vector.yaml] |
 | [![Build ZooKeeper]][build_zookeeper.yaml] | | | |
@@ -78,10 +78,10 @@ preflight check container oci.stackable.tech/sdp/<IMAGE>:<VERSION>-stackable<REL
 [build_omid.yaml]: https://github.com/stackabletech/docker-images/actions/workflows/build_omid.yaml
 [Build OPA]: https://github.com/stackabletech/docker-images/actions/workflows/build_opa.yaml/badge.svg
 [build_opa.yaml]: https://github.com/stackabletech/docker-images/actions/workflows/build_opa.yaml
-[Build OpenSearch]: https://github.com/stackabletech/docker-images/actions/workflows/build_opensearch.yaml/badge.svg
-[build_opensearch.yaml]: https://github.com/stackabletech/docker-images/actions/workflows/build_opensearch.yaml
 [Build OpenSearch Dashboards]: https://github.com/stackabletech/docker-images/actions/workflows/build_opensearch_dashboards.yaml/badge.svg
 [build_opensearch_dashboards.yaml]: https://github.com/stackabletech/docker-images/actions/workflows/build_opensearch_dashboards.yaml
+[Build OpenSearch]: https://github.com/stackabletech/docker-images/actions/workflows/build_opensearch.yaml/badge.svg
+[build_opensearch.yaml]: https://github.com/stackabletech/docker-images/actions/workflows/build_opensearch.yaml
 [Build Spark Connect Client]: https://github.com/stackabletech/docker-images/actions/workflows/build_spark-connect-client.yaml/badge.svg
 [build_spark-connect-client.yaml]: https://github.com/stackabletech/docker-images/actions/workflows/build_spark-connect-client.yaml
 [Build Spark K8s]: https://github.com/stackabletech/docker-images/actions/workflows/build_spark-k8s.yaml/badge.svg