diff --git a/.github/workflows/Build Thunder on MacOS.yml b/.github/workflows/Build Thunder on MacOS.yml
index 7aadd595b..91972b2df 100644
--- a/.github/workflows/Build Thunder on MacOS.yml	
+++ b/.github/workflows/Build Thunder on MacOS.yml	
@@ -16,25 +16,21 @@ on:
       - 'ReleaseNotes/**'
 
 jobs:
-  Thunder:
+  Thunder_MacOS:
     uses: rdkcentral/Thunder/.github/workflows/MacOS build template.yml@master
 
-  # ThunderInterfaces:
-  #   needs: Thunder
-  #   uses: rdkcentral/ThunderInterfaces/.github/workflows/Linux build template.yml@master
+  ThunderInterfaces_MacOS:
+    needs: Thunder_MacOS
+    uses: rdkcentral/ThunderInterfaces/.github/workflows/MacOS build template.yml@master
 
-  # ThunderLibraries:
-  #   needs: Thunder
-  #   uses: WebPlatformForEmbedded/ThunderLibraries/.github/workflows/Linux build template.yml@main
+  ThunderClientLibraries_MacOS:
+    needs: ThunderInterfaces_MacOS
+    uses: rdkcentral/ThunderClientLibraries/.github/workflows/MacOS build template.yml@master
 
-  # ThunderClientLibraries:
-  #   needs: ThunderInterfaces
-  #   uses: rdkcentral/ThunderClientLibraries/.github/workflows/Linux build template.yml@master
+  ThunderNanoServices_MacOS:
+    needs: ThunderInterfaces_MacOS
+    uses: rdkcentral/ThunderNanoServices/.github/workflows/MacOS build template.yml@master
 
-  # ThunderNanoServices:
-  #   needs: ThunderInterfaces
-  #   uses: rdkcentral/ThunderNanoServices/.github/workflows/Linux build template.yml@master
-
-  # ThunderNanoServicesRDK:
-  #   needs: ThunderInterfaces
-  #   uses: WebPlatformForEmbedded/ThunderNanoServicesRDK/.github/workflows/Linux build template.yml@master
+  ThunderNanoServicesRDK_MacOS:
+    needs: ThunderInterfaces_MacOS
+    uses: WebPlatformForEmbedded/ThunderNanoServicesRDK/.github/workflows/MacOS build template.yml@master
diff --git a/.github/workflows/Test Thunder.yml b/.github/workflows/Test Thunder.yml
index 6c589cdbf..d8c13fff4 100644
--- a/.github/workflows/Test Thunder.yml	
+++ b/.github/workflows/Test Thunder.yml	
@@ -17,7 +17,7 @@ on:
 
 jobs:
   Thunder:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     strategy:
       matrix: