diff --git a/versions/baseline.json b/versions/baseline.json
index 61ad480894e262..f3a7ae2a9cff78 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6580,10 +6580,6 @@
       "baseline": "1.5.1",
       "port-version": 1
     },
-    "orange-math": {
-      "baseline": "1.0.1",
-      "port-version": 0
-    },
     "omniorb": {
       "baseline": "4.3.0",
       "port-version": 3
@@ -6824,6 +6820,10 @@
       "baseline": "0.12+20221121",
       "port-version": 1
     },
+    "orange-math": {
+      "baseline": "1.0.1",
+      "port-version": 0
+    },
     "orc": {
       "baseline": "2.0.0",
       "port-version": 0
@@ -8937,8 +8937,8 @@
       "port-version": 3
     },
     "thrift": {
-      "baseline": "0.20.0",
-      "port-version": 1
+      "baseline": "0.21.0",
+      "port-version": 0
     },
     "tidy-html5": {
       "baseline": "5.8.0",
diff --git a/versions/t-/thrift.json b/versions/t-/thrift.json
index 7464bde22cea5a..5766eaff7ee8a7 100644
--- a/versions/t-/thrift.json
+++ b/versions/t-/thrift.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "79207b69ed9c144d3f037664d50e2e6fbd8d4752",
+      "version": "0.21.0",
+      "port-version": 0
+    },
     {
       "git-tree": "13757a6b05741cf3c9c39e3a1dcc5e5cd685e025",
       "version": "0.20.0",