diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index a8df0ef..653756a 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -1,30 +1,45 @@
 name: Build
+
 on:
   push:
     branches:
       - main
   pull_request:
+
 permissions:
   contents: read
-concurrency: ${{ github.workflow }}-${{ github.ref }}
+
+concurrency: ${{ github.workflow }}-${{ github.ref }}-${{ github.job}}
+
 jobs:
-  build:
-    name: build
+  templates:
+    name: templates-to-build
+    runs-on: ubuntu-latest
+    outputs:
+      allTemplates: ${{ steps.list.outputs.ALL_TEMPLATES }}
+      changedTemplates: ${{ steps.list.outputs.CHANGED_TEMPLATES }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # Fetch all history for all branches and tags
+
+      - name: List templates
+        id: list
+        run: |
+          echo "CHANGED_TEMPLATES=$(git diff --name-only --diff-filter=ACMRT ${{ github.event.pull_request.base.sha }} ${{ github.sha }} | awk -F/ '/^[a-z]*\// {print $1}' | sort -u | jq -Rnc '[inputs]')" >> "$GITHUB_OUTPUT"
+          echo "ALL_TEMPLATES=$(find ./ -name Dockerfile | awk -F/ '/^\.\/[a-z]*\// {print $2}' | sort -u | jq -Rnc '[inputs]')" >> "$GITHUB_OUTPUT"
+          cat $GITHUB_OUTPUT
+
+  build-on-main:
+    name: Build main
+    if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' && (needs.templates.outputs.allTemplates != '' && toJson(fromjson(needs.templates.outputs.allTemplates)) != '[]') }}
+    needs: templates
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        template:
-          [
-            cpp,
-            cpp-low-level,
-            go,
-            javascript,
-            lua,
-            python,
-            ruby,
-            rust,
-            typescript,
-          ]
+        allTemplates: ${{ fromJson(needs.templates.outputs.allTemplates) }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -44,5 +59,40 @@ jobs:
         run: cartesi doctor
 
       - name: Build
-        run: cartesi build
-        working-directory: ${{ matrix.template }}
+        run: |
+          cartesi build
+          cartesi hash
+        working-directory: ${{ matrix.allTemplates }}
+
+  build-on-pr:
+        name: Build PR
+        if: ${{ github.event_name == 'pull_request' && (needs.templates.outputs.changedTemplates != '' && toJson(fromjson(needs.templates.outputs.changedTemplates)) != '[]') }}
+        needs: templates
+        runs-on: ubuntu-latest
+        strategy:
+          fail-fast: false
+          matrix:
+            changedTemplates: ${{ fromJson(needs.templates.outputs.changedTemplates) }}
+        steps:
+          - name: Checkout
+            uses: actions/checkout@v4
+
+          - name: Setup Node.js
+            uses: actions/setup-node@v4
+            with:
+              node-version: current
+
+          - name: Install Cartesi CLI
+            run: npm install -g @cartesi/cli
+
+          - name: Set up QEMU
+            uses: docker/setup-qemu-action@v3
+
+          - name: Check system requirements
+            run: cartesi doctor
+
+          - name: Build
+            run: |
+              cartesi build
+              cartesi hash
+            working-directory: ${{ matrix.changedTemplates }}
diff --git a/go/Dockerfile b/go/Dockerfile
index 1f2e97e..98d0170 100644
--- a/go/Dockerfile
+++ b/go/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker.io/docker/dockerfile:1
-FROM ubuntu:22.04 AS build-stage
+FROM ubuntu:24.04 AS build-stage
 
 ARG DEBIAN_FRONTEND=noninteractive
 RUN <<EOF
@@ -9,7 +9,8 @@ apt install -y --no-install-recommends \
     build-essential=12.9ubuntu3 \
     ca-certificates \
     g++-riscv64-linux-gnu=4:11.2.0--1ubuntu1 \
-    wget
+    wget \
+    curl
 EOF
 
 ARG GOVERSION=1.20.5
diff --git a/lua/Dockerfile b/lua/Dockerfile
index 8019356..387b1a1 100644
--- a/lua/Dockerfile
+++ b/lua/Dockerfile
@@ -10,10 +10,12 @@ apt-get install -y --no-install-recommends \
   lua5.4=5.4.4-1 \
   liblua5.4-dev=5.4.4-1 \
   luarocks=3.8.0+dfsg1-1
-rm -rf /var/lib/apt/lists/*
+
+  rm -rf /var/lib/apt/lists/*
 
 luarocks install --lua-version=5.4 luasocket 3.1.0-1
 luarocks install --lua-version=5.4 dkjson 2.6-1
+
 EOF
 
 FROM --platform=linux/riscv64 ubuntu:22.04