diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 164cdb4..558c05b 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -10,7 +10,7 @@ jobs:
 
     if: ${{ github.event.workflow_run.conclusion == 'success'  && github.event.workflow_run.head_branch == 'main' }}
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     strategy:
         matrix:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1e0b009..31d4d53 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ on:
       - '**'
   pull_request: # on pull request on all branch
     branches:
-      - '**'
+      - 'main'
 
 jobs:
 
@@ -16,7 +16,7 @@ jobs:
   ###################### Building of HybroGen ###########################################
   #######################################################################################
   build-toolschains:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout repo
@@ -34,7 +34,8 @@ jobs:
             libglib2.0-dev \
             libpixman-1-dev \
             zlib1g-dev \
-            pkg-config
+            pkg-config 
+          sudo apt install -y libc6
 
       - name: Restore cache
         id: toolchain-cache
@@ -81,7 +82,7 @@ jobs:
           if-no-files-found: error
 
   build-grammar-and-dataBase:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     services:
       postgres:
         image: postgres:15
@@ -187,7 +188,7 @@ jobs:
   #######################################################################################
 
   regression-test-aarch64:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: [build-toolschains,build-grammar-and-dataBase] 
     services:
       postgres:
@@ -268,7 +269,7 @@ jobs:
         make aarch64
       
   regression-test-riscv:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: [build-toolschains,build-grammar-and-dataBase] 
     services:
       postgres:
@@ -349,7 +350,7 @@ jobs:
         make riscv
 
   regression-test-power:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: [build-toolschains,build-grammar-and-dataBase] 
     services:
       postgres:
@@ -438,7 +439,7 @@ jobs:
   ###################### Demo Stencil ###################################################
   #######################################################################################
   demo-stencil-riscv:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: [regression-test-riscv] 
     services:
       postgres:
@@ -521,7 +522,7 @@ jobs:
 
 
   demo-stencil-aarch64:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: [regression-test-aarch64] 
     services:
       postgres:
@@ -602,7 +603,7 @@ jobs:
         cd ./Demos/Stencil && make allAarch64Qemu
 
   demo-stencil-power:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: [regression-test-power] 
     services:
       postgres:
@@ -688,7 +689,7 @@ jobs:
 
 
   demo-vectorMatrix-aarch64:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: [regression-test-aarch64] 
     services:
       postgres:
@@ -769,7 +770,7 @@ jobs:
         cd ./Demos/VectorMatrix && make aarch64
 
   demo-vectorMatrix-riscv:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: [regression-test-riscv] 
     services:
       postgres:
@@ -852,7 +853,7 @@ jobs:
 
 
   demo-vectorMatrix-power:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: [regression-test-power] 
     services:
       postgres:
@@ -938,7 +939,7 @@ jobs:
   #######################################################################################
 
   demo-NewtonSquareRoot-aarch64:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: [regression-test-aarch64] 
     services:
       postgres:
@@ -1020,7 +1021,7 @@ jobs:
 
 
   demo-NewtonSquareRoot-riscv:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: [regression-test-riscv] 
     services:
       postgres:
@@ -1101,7 +1102,7 @@ jobs:
         cd ./Demos/Newton-SquareRoot-VariablePrecision && make demo-riscv
 
   demo-NewtonSquareRoot-power:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: [regression-test-power] 
     services:
       postgres: