diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 60bfe278d5..4fb558fba2 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -28,8 +28,8 @@ body:
         - area:browser
         - area:cicd
         - area:client
-        - area:cloud
         - area:cloudevents
+        - area:cloud
         - area:code
         - area:container
         - area:cpu
diff --git a/.github/ISSUE_TEMPLATE/change_proposal.yaml b/.github/ISSUE_TEMPLATE/change_proposal.yaml
index e42b7c23cc..9c7d3646ed 100644
--- a/.github/ISSUE_TEMPLATE/change_proposal.yaml
+++ b/.github/ISSUE_TEMPLATE/change_proposal.yaml
@@ -20,8 +20,8 @@ body:
         - area:browser
         - area:cicd
         - area:client
-        - area:cloud
         - area:cloudevents
+        - area:cloud
         - area:code
         - area:container
         - area:cpu
diff --git a/.github/ISSUE_TEMPLATE/new-conventions.yaml b/.github/ISSUE_TEMPLATE/new-conventions.yaml
index f7854371b4..f0d28f0055 100644
--- a/.github/ISSUE_TEMPLATE/new-conventions.yaml
+++ b/.github/ISSUE_TEMPLATE/new-conventions.yaml
@@ -29,8 +29,8 @@ body:
         - area:browser
         - area:cicd
         - area:client
-        - area:cloud
         - area:cloudevents
+        - area:cloud
         - area:code
         - area:container
         - area:cpu
diff --git a/.github/workflows/scripts/get-registry-areas.sh b/.github/workflows/scripts/get-registry-areas.sh
index b4fd8b6e18..b33c9b3c60 100755
--- a/.github/workflows/scripts/get-registry-areas.sh
+++ b/.github/workflows/scripts/get-registry-areas.sh
@@ -9,8 +9,8 @@ CUR_DIRECTORY=$(dirname "$0")
 REPO_DIR="$( cd "$CUR_DIRECTORY/../../../" && pwd )"
 REGISTRY_DIR="$( cd "$REPO_DIR/model/registry" && pwd )"
 
-
-for entry in $(ls $REGISTRY_DIR | egrep '\.yaml$' | sort)
+# Explicitly sort with `-d` (dictionary) so BSD and GNU work alike.
+for entry in $(ls $REGISTRY_DIR | egrep '\.yaml$' | sort -d)
 do
   echo "$entry"
 done