diff --git a/lisa/_assets/binaries/arm64/README.json-c b/lisa/_assets/binaries/arm64/README.json-c
index ce18600f9c..7d8417f944 100644
--- a/lisa/_assets/binaries/arm64/README.json-c
+++ b/lisa/_assets/binaries/arm64/README.json-c
@@ -1,5 +1,5 @@
 Sources of json-c available at:
-Git commit: 9021cdcdd01fc9dbcbe1f06391848c2ac915212f
+Git commit: 2f2ddc1f2dbca56c874e8f9c31b5b963202d80e7
 Git repository: https://github.com/json-c/json-c
 
 
@@ -7,27 +7,28 @@ Build host info:
 
 NAME="Alpine Linux"
 ID=alpine
-VERSION_ID=3.13.4
-PRETTY_NAME="Alpine Linux v3.13"
+VERSION_ID=3.16.1
+PRETTY_NAME="Alpine Linux v3.16"
 HOME_URL="https://alpinelinux.org/"
-BUG_REPORT_URL="https://bugs.alpinelinux.org/"
+BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues"
 
 
 Build recipe:
 
 export ARCH=arm64
-export BUILD_DIR=/tmp/tmp9j6fbooz/arm64/source
+export BUILD_DIR=/tmp/tmpwlo34ncm/arm64/source
 export LISA_ARCH_ASSETS=/lisa/_assets/binaries/arm64
 export LISA_HOME=''
 #! /bin/bash
 
-ALPINE_VERSION=v3.13/main
+ALPINE_VERSION=v3.16
 ALPINE_BUILD_DEPENDENCIES=(autoconf automake bash cmake gcc git make libtool linux-headers musl-dev)
 
 build_jsonc() {
-    # As recommended in the README, build in a separate tree
-    mkdir json-c-build
-    cd json-c-build
+    # As recommended in the README, build in a separate tree. The folder needs
+    # to be called "json-c" as rt-app will #include <json-c/json.h>
+    mkdir json-c
+    cd json-c
     export ac_cv_func_malloc_0_nonnull=yes
     export ac_cv_func_realloc_0_nonnull=yes
     cmake ../json-c -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON -DCMAKE_C_COMPILER=${CROSS_COMPILE}gcc
@@ -46,8 +47,8 @@ build_rtapp() {
     export ac_cv_lib_json_c_json_object_from_file=yes
     export ac_cv_lib_numa_numa_available=yes
     ./autogen.sh
-    ./configure --host=$CONFIGURE_HOST LDFLAGS="--static -L$BUILD_DIR/json-c-build/ -L$BUILD_DIR/numactl/" \
-                CFLAGS="-I$BUILD_DIR -I$BUILD_DIR/numactl -I$BUILD_DIR/json-c-build" --with-deadline
+    ./configure --host=$CONFIGURE_HOST LDFLAGS="--static -L$BUILD_DIR/json-c/ -L$BUILD_DIR/numactl/" \
+                CFLAGS="-I$BUILD_DIR -I$BUILD_DIR/numactl -I$BUILD_DIR/json-c" --with-deadline
     make
     "$CROSS_COMPILE"strip src/rt-app
 }
@@ -55,14 +56,14 @@ build_rtapp() {
 download() {
     git clone https://github.com/json-c/json-c json-c
     # git -C json-c checkout ddd049045d98dd3163d01a7d79184b3c7fb95a14
-    git -C json-c checkout json-c-0.15-20200726
+    git -C json-c checkout json-c-0.16-20220414
 
     git clone https://github.com/numactl/numactl.git
-    git -C numactl checkout 26fba7199c365b55e72e054bb2adba097ce04924
+    git -C numactl checkout 8b18345065c39d6b1e498bf635b4c8668e2d8f4e
 
     git clone https://github.com/douglas-raillard-arm/rt-app.git
     # Branch: lisa
-    git -C rt-app checkout 5c6e0d8e96487dce8f3fb37e0e9aba995b70998e
+    git -C rt-app checkout 341f1f944023524c18ac6d254d83315434554ee4
 }
 
 build() {
diff --git a/lisa/_assets/binaries/arm64/README.libnumactl b/lisa/_assets/binaries/arm64/README.libnumactl
index 448f0770b5..6630a4bf73 100644
--- a/lisa/_assets/binaries/arm64/README.libnumactl
+++ b/lisa/_assets/binaries/arm64/README.libnumactl
@@ -1,5 +1,5 @@
 Sources of libnumactl available at:
-Git commit: 26fba7199c365b55e72e054bb2adba097ce04924
+Git commit: 8b18345065c39d6b1e498bf635b4c8668e2d8f4e
 Git repository: https://github.com/numactl/numactl.git
 
 
@@ -7,27 +7,28 @@ Build host info:
 
 NAME="Alpine Linux"
 ID=alpine
-VERSION_ID=3.13.4
-PRETTY_NAME="Alpine Linux v3.13"
+VERSION_ID=3.16.1
+PRETTY_NAME="Alpine Linux v3.16"
 HOME_URL="https://alpinelinux.org/"
-BUG_REPORT_URL="https://bugs.alpinelinux.org/"
+BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues"
 
 
 Build recipe:
 
 export ARCH=arm64
-export BUILD_DIR=/tmp/tmp9j6fbooz/arm64/source
+export BUILD_DIR=/tmp/tmpwlo34ncm/arm64/source
 export LISA_ARCH_ASSETS=/lisa/_assets/binaries/arm64
 export LISA_HOME=''
 #! /bin/bash
 
-ALPINE_VERSION=v3.13/main
+ALPINE_VERSION=v3.16
 ALPINE_BUILD_DEPENDENCIES=(autoconf automake bash cmake gcc git make libtool linux-headers musl-dev)
 
 build_jsonc() {
-    # As recommended in the README, build in a separate tree
-    mkdir json-c-build
-    cd json-c-build
+    # As recommended in the README, build in a separate tree. The folder needs
+    # to be called "json-c" as rt-app will #include <json-c/json.h>
+    mkdir json-c
+    cd json-c
     export ac_cv_func_malloc_0_nonnull=yes
     export ac_cv_func_realloc_0_nonnull=yes
     cmake ../json-c -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON -DCMAKE_C_COMPILER=${CROSS_COMPILE}gcc
@@ -46,8 +47,8 @@ build_rtapp() {
     export ac_cv_lib_json_c_json_object_from_file=yes
     export ac_cv_lib_numa_numa_available=yes
     ./autogen.sh
-    ./configure --host=$CONFIGURE_HOST LDFLAGS="--static -L$BUILD_DIR/json-c-build/ -L$BUILD_DIR/numactl/" \
-                CFLAGS="-I$BUILD_DIR -I$BUILD_DIR/numactl -I$BUILD_DIR/json-c-build" --with-deadline
+    ./configure --host=$CONFIGURE_HOST LDFLAGS="--static -L$BUILD_DIR/json-c/ -L$BUILD_DIR/numactl/" \
+                CFLAGS="-I$BUILD_DIR -I$BUILD_DIR/numactl -I$BUILD_DIR/json-c" --with-deadline
     make
     "$CROSS_COMPILE"strip src/rt-app
 }
@@ -55,14 +56,14 @@ build_rtapp() {
 download() {
     git clone https://github.com/json-c/json-c json-c
     # git -C json-c checkout ddd049045d98dd3163d01a7d79184b3c7fb95a14
-    git -C json-c checkout json-c-0.15-20200726
+    git -C json-c checkout json-c-0.16-20220414
 
     git clone https://github.com/numactl/numactl.git
-    git -C numactl checkout 26fba7199c365b55e72e054bb2adba097ce04924
+    git -C numactl checkout 8b18345065c39d6b1e498bf635b4c8668e2d8f4e
 
     git clone https://github.com/douglas-raillard-arm/rt-app.git
     # Branch: lisa
-    git -C rt-app checkout 5c6e0d8e96487dce8f3fb37e0e9aba995b70998e
+    git -C rt-app checkout 341f1f944023524c18ac6d254d83315434554ee4
 }
 
 build() {
diff --git a/lisa/_assets/binaries/arm64/README.rt-app b/lisa/_assets/binaries/arm64/README.rt-app
index 60fd5ef1c6..842bc3214a 100644
--- a/lisa/_assets/binaries/arm64/README.rt-app
+++ b/lisa/_assets/binaries/arm64/README.rt-app
@@ -1,5 +1,5 @@
 Sources of rt-app available at:
-Git commit: 5c6e0d8e96487dce8f3fb37e0e9aba995b70998e
+Git commit: 341f1f944023524c18ac6d254d83315434554ee4
 Git repository: https://github.com/douglas-raillard-arm/rt-app.git
 
 
@@ -7,27 +7,28 @@ Build host info:
 
 NAME="Alpine Linux"
 ID=alpine
-VERSION_ID=3.13.4
-PRETTY_NAME="Alpine Linux v3.13"
+VERSION_ID=3.16.1
+PRETTY_NAME="Alpine Linux v3.16"
 HOME_URL="https://alpinelinux.org/"
-BUG_REPORT_URL="https://bugs.alpinelinux.org/"
+BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues"
 
 
 Build recipe:
 
 export ARCH=arm64
-export BUILD_DIR=/tmp/tmp9j6fbooz/arm64/source
+export BUILD_DIR=/tmp/tmpwlo34ncm/arm64/source
 export LISA_ARCH_ASSETS=/lisa/_assets/binaries/arm64
 export LISA_HOME=''
 #! /bin/bash
 
-ALPINE_VERSION=v3.13/main
+ALPINE_VERSION=v3.16
 ALPINE_BUILD_DEPENDENCIES=(autoconf automake bash cmake gcc git make libtool linux-headers musl-dev)
 
 build_jsonc() {
-    # As recommended in the README, build in a separate tree
-    mkdir json-c-build
-    cd json-c-build
+    # As recommended in the README, build in a separate tree. The folder needs
+    # to be called "json-c" as rt-app will #include <json-c/json.h>
+    mkdir json-c
+    cd json-c
     export ac_cv_func_malloc_0_nonnull=yes
     export ac_cv_func_realloc_0_nonnull=yes
     cmake ../json-c -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON -DCMAKE_C_COMPILER=${CROSS_COMPILE}gcc
@@ -46,8 +47,8 @@ build_rtapp() {
     export ac_cv_lib_json_c_json_object_from_file=yes
     export ac_cv_lib_numa_numa_available=yes
     ./autogen.sh
-    ./configure --host=$CONFIGURE_HOST LDFLAGS="--static -L$BUILD_DIR/json-c-build/ -L$BUILD_DIR/numactl/" \
-                CFLAGS="-I$BUILD_DIR -I$BUILD_DIR/numactl -I$BUILD_DIR/json-c-build" --with-deadline
+    ./configure --host=$CONFIGURE_HOST LDFLAGS="--static -L$BUILD_DIR/json-c/ -L$BUILD_DIR/numactl/" \
+                CFLAGS="-I$BUILD_DIR -I$BUILD_DIR/numactl -I$BUILD_DIR/json-c" --with-deadline
     make
     "$CROSS_COMPILE"strip src/rt-app
 }
@@ -55,14 +56,14 @@ build_rtapp() {
 download() {
     git clone https://github.com/json-c/json-c json-c
     # git -C json-c checkout ddd049045d98dd3163d01a7d79184b3c7fb95a14
-    git -C json-c checkout json-c-0.15-20200726
+    git -C json-c checkout json-c-0.16-20220414
 
     git clone https://github.com/numactl/numactl.git
-    git -C numactl checkout 26fba7199c365b55e72e054bb2adba097ce04924
+    git -C numactl checkout 8b18345065c39d6b1e498bf635b4c8668e2d8f4e
 
     git clone https://github.com/douglas-raillard-arm/rt-app.git
     # Branch: lisa
-    git -C rt-app checkout 5c6e0d8e96487dce8f3fb37e0e9aba995b70998e
+    git -C rt-app checkout 341f1f944023524c18ac6d254d83315434554ee4
 }
 
 build() {
diff --git a/lisa/_assets/binaries/arm64/rt-app b/lisa/_assets/binaries/arm64/rt-app
index 8e098b1c04..9e8866e709 100755
Binary files a/lisa/_assets/binaries/arm64/rt-app and b/lisa/_assets/binaries/arm64/rt-app differ
diff --git a/lisa/_assets/binaries/armeabi/README.json-c b/lisa/_assets/binaries/armeabi/README.json-c
index dfd12956ea..3d6f6e267e 100644
--- a/lisa/_assets/binaries/armeabi/README.json-c
+++ b/lisa/_assets/binaries/armeabi/README.json-c
@@ -1,5 +1,5 @@
 Sources of json-c available at:
-Git commit: 9021cdcdd01fc9dbcbe1f06391848c2ac915212f
+Git commit: 2f2ddc1f2dbca56c874e8f9c31b5b963202d80e7
 Git repository: https://github.com/json-c/json-c
 
 
@@ -7,27 +7,28 @@ Build host info:
 
 NAME="Alpine Linux"
 ID=alpine
-VERSION_ID=3.13.4
-PRETTY_NAME="Alpine Linux v3.13"
+VERSION_ID=3.16.1
+PRETTY_NAME="Alpine Linux v3.16"
 HOME_URL="https://alpinelinux.org/"
-BUG_REPORT_URL="https://bugs.alpinelinux.org/"
+BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues"
 
 
 Build recipe:
 
 export ARCH=armeabi
-export BUILD_DIR=/tmp/tmp9j6fbooz/armeabi/source
+export BUILD_DIR=/tmp/tmpwlo34ncm/armeabi/source
 export LISA_ARCH_ASSETS=/lisa/_assets/binaries/armeabi
 export LISA_HOME=''
 #! /bin/bash
 
-ALPINE_VERSION=v3.13/main
+ALPINE_VERSION=v3.16
 ALPINE_BUILD_DEPENDENCIES=(autoconf automake bash cmake gcc git make libtool linux-headers musl-dev)
 
 build_jsonc() {
-    # As recommended in the README, build in a separate tree
-    mkdir json-c-build
-    cd json-c-build
+    # As recommended in the README, build in a separate tree. The folder needs
+    # to be called "json-c" as rt-app will #include <json-c/json.h>
+    mkdir json-c
+    cd json-c
     export ac_cv_func_malloc_0_nonnull=yes
     export ac_cv_func_realloc_0_nonnull=yes
     cmake ../json-c -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON -DCMAKE_C_COMPILER=${CROSS_COMPILE}gcc
@@ -46,8 +47,8 @@ build_rtapp() {
     export ac_cv_lib_json_c_json_object_from_file=yes
     export ac_cv_lib_numa_numa_available=yes
     ./autogen.sh
-    ./configure --host=$CONFIGURE_HOST LDFLAGS="--static -L$BUILD_DIR/json-c-build/ -L$BUILD_DIR/numactl/" \
-                CFLAGS="-I$BUILD_DIR -I$BUILD_DIR/numactl -I$BUILD_DIR/json-c-build" --with-deadline
+    ./configure --host=$CONFIGURE_HOST LDFLAGS="--static -L$BUILD_DIR/json-c/ -L$BUILD_DIR/numactl/" \
+                CFLAGS="-I$BUILD_DIR -I$BUILD_DIR/numactl -I$BUILD_DIR/json-c" --with-deadline
     make
     "$CROSS_COMPILE"strip src/rt-app
 }
@@ -55,14 +56,14 @@ build_rtapp() {
 download() {
     git clone https://github.com/json-c/json-c json-c
     # git -C json-c checkout ddd049045d98dd3163d01a7d79184b3c7fb95a14
-    git -C json-c checkout json-c-0.15-20200726
+    git -C json-c checkout json-c-0.16-20220414
 
     git clone https://github.com/numactl/numactl.git
-    git -C numactl checkout 26fba7199c365b55e72e054bb2adba097ce04924
+    git -C numactl checkout 8b18345065c39d6b1e498bf635b4c8668e2d8f4e
 
     git clone https://github.com/douglas-raillard-arm/rt-app.git
     # Branch: lisa
-    git -C rt-app checkout 5c6e0d8e96487dce8f3fb37e0e9aba995b70998e
+    git -C rt-app checkout 341f1f944023524c18ac6d254d83315434554ee4
 }
 
 build() {
diff --git a/lisa/_assets/binaries/armeabi/README.libnumactl b/lisa/_assets/binaries/armeabi/README.libnumactl
index 2a827d3e00..c4afc3e509 100644
--- a/lisa/_assets/binaries/armeabi/README.libnumactl
+++ b/lisa/_assets/binaries/armeabi/README.libnumactl
@@ -1,5 +1,5 @@
 Sources of libnumactl available at:
-Git commit: 26fba7199c365b55e72e054bb2adba097ce04924
+Git commit: 8b18345065c39d6b1e498bf635b4c8668e2d8f4e
 Git repository: https://github.com/numactl/numactl.git
 
 
@@ -7,27 +7,28 @@ Build host info:
 
 NAME="Alpine Linux"
 ID=alpine
-VERSION_ID=3.13.4
-PRETTY_NAME="Alpine Linux v3.13"
+VERSION_ID=3.16.1
+PRETTY_NAME="Alpine Linux v3.16"
 HOME_URL="https://alpinelinux.org/"
-BUG_REPORT_URL="https://bugs.alpinelinux.org/"
+BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues"
 
 
 Build recipe:
 
 export ARCH=armeabi
-export BUILD_DIR=/tmp/tmp9j6fbooz/armeabi/source
+export BUILD_DIR=/tmp/tmpwlo34ncm/armeabi/source
 export LISA_ARCH_ASSETS=/lisa/_assets/binaries/armeabi
 export LISA_HOME=''
 #! /bin/bash
 
-ALPINE_VERSION=v3.13/main
+ALPINE_VERSION=v3.16
 ALPINE_BUILD_DEPENDENCIES=(autoconf automake bash cmake gcc git make libtool linux-headers musl-dev)
 
 build_jsonc() {
-    # As recommended in the README, build in a separate tree
-    mkdir json-c-build
-    cd json-c-build
+    # As recommended in the README, build in a separate tree. The folder needs
+    # to be called "json-c" as rt-app will #include <json-c/json.h>
+    mkdir json-c
+    cd json-c
     export ac_cv_func_malloc_0_nonnull=yes
     export ac_cv_func_realloc_0_nonnull=yes
     cmake ../json-c -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON -DCMAKE_C_COMPILER=${CROSS_COMPILE}gcc
@@ -46,8 +47,8 @@ build_rtapp() {
     export ac_cv_lib_json_c_json_object_from_file=yes
     export ac_cv_lib_numa_numa_available=yes
     ./autogen.sh
-    ./configure --host=$CONFIGURE_HOST LDFLAGS="--static -L$BUILD_DIR/json-c-build/ -L$BUILD_DIR/numactl/" \
-                CFLAGS="-I$BUILD_DIR -I$BUILD_DIR/numactl -I$BUILD_DIR/json-c-build" --with-deadline
+    ./configure --host=$CONFIGURE_HOST LDFLAGS="--static -L$BUILD_DIR/json-c/ -L$BUILD_DIR/numactl/" \
+                CFLAGS="-I$BUILD_DIR -I$BUILD_DIR/numactl -I$BUILD_DIR/json-c" --with-deadline
     make
     "$CROSS_COMPILE"strip src/rt-app
 }
@@ -55,14 +56,14 @@ build_rtapp() {
 download() {
     git clone https://github.com/json-c/json-c json-c
     # git -C json-c checkout ddd049045d98dd3163d01a7d79184b3c7fb95a14
-    git -C json-c checkout json-c-0.15-20200726
+    git -C json-c checkout json-c-0.16-20220414
 
     git clone https://github.com/numactl/numactl.git
-    git -C numactl checkout 26fba7199c365b55e72e054bb2adba097ce04924
+    git -C numactl checkout 8b18345065c39d6b1e498bf635b4c8668e2d8f4e
 
     git clone https://github.com/douglas-raillard-arm/rt-app.git
     # Branch: lisa
-    git -C rt-app checkout 5c6e0d8e96487dce8f3fb37e0e9aba995b70998e
+    git -C rt-app checkout 341f1f944023524c18ac6d254d83315434554ee4
 }
 
 build() {
diff --git a/lisa/_assets/binaries/armeabi/README.rt-app b/lisa/_assets/binaries/armeabi/README.rt-app
index 3cdd7e54d9..7ec34d3e94 100644
--- a/lisa/_assets/binaries/armeabi/README.rt-app
+++ b/lisa/_assets/binaries/armeabi/README.rt-app
@@ -1,5 +1,5 @@
 Sources of rt-app available at:
-Git commit: 5c6e0d8e96487dce8f3fb37e0e9aba995b70998e
+Git commit: 341f1f944023524c18ac6d254d83315434554ee4
 Git repository: https://github.com/douglas-raillard-arm/rt-app.git
 
 
@@ -7,27 +7,28 @@ Build host info:
 
 NAME="Alpine Linux"
 ID=alpine
-VERSION_ID=3.13.4
-PRETTY_NAME="Alpine Linux v3.13"
+VERSION_ID=3.16.1
+PRETTY_NAME="Alpine Linux v3.16"
 HOME_URL="https://alpinelinux.org/"
-BUG_REPORT_URL="https://bugs.alpinelinux.org/"
+BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues"
 
 
 Build recipe:
 
 export ARCH=armeabi
-export BUILD_DIR=/tmp/tmp9j6fbooz/armeabi/source
+export BUILD_DIR=/tmp/tmpwlo34ncm/armeabi/source
 export LISA_ARCH_ASSETS=/lisa/_assets/binaries/armeabi
 export LISA_HOME=''
 #! /bin/bash
 
-ALPINE_VERSION=v3.13/main
+ALPINE_VERSION=v3.16
 ALPINE_BUILD_DEPENDENCIES=(autoconf automake bash cmake gcc git make libtool linux-headers musl-dev)
 
 build_jsonc() {
-    # As recommended in the README, build in a separate tree
-    mkdir json-c-build
-    cd json-c-build
+    # As recommended in the README, build in a separate tree. The folder needs
+    # to be called "json-c" as rt-app will #include <json-c/json.h>
+    mkdir json-c
+    cd json-c
     export ac_cv_func_malloc_0_nonnull=yes
     export ac_cv_func_realloc_0_nonnull=yes
     cmake ../json-c -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON -DCMAKE_C_COMPILER=${CROSS_COMPILE}gcc
@@ -46,8 +47,8 @@ build_rtapp() {
     export ac_cv_lib_json_c_json_object_from_file=yes
     export ac_cv_lib_numa_numa_available=yes
     ./autogen.sh
-    ./configure --host=$CONFIGURE_HOST LDFLAGS="--static -L$BUILD_DIR/json-c-build/ -L$BUILD_DIR/numactl/" \
-                CFLAGS="-I$BUILD_DIR -I$BUILD_DIR/numactl -I$BUILD_DIR/json-c-build" --with-deadline
+    ./configure --host=$CONFIGURE_HOST LDFLAGS="--static -L$BUILD_DIR/json-c/ -L$BUILD_DIR/numactl/" \
+                CFLAGS="-I$BUILD_DIR -I$BUILD_DIR/numactl -I$BUILD_DIR/json-c" --with-deadline
     make
     "$CROSS_COMPILE"strip src/rt-app
 }
@@ -55,14 +56,14 @@ build_rtapp() {
 download() {
     git clone https://github.com/json-c/json-c json-c
     # git -C json-c checkout ddd049045d98dd3163d01a7d79184b3c7fb95a14
-    git -C json-c checkout json-c-0.15-20200726
+    git -C json-c checkout json-c-0.16-20220414
 
     git clone https://github.com/numactl/numactl.git
-    git -C numactl checkout 26fba7199c365b55e72e054bb2adba097ce04924
+    git -C numactl checkout 8b18345065c39d6b1e498bf635b4c8668e2d8f4e
 
     git clone https://github.com/douglas-raillard-arm/rt-app.git
     # Branch: lisa
-    git -C rt-app checkout 5c6e0d8e96487dce8f3fb37e0e9aba995b70998e
+    git -C rt-app checkout 341f1f944023524c18ac6d254d83315434554ee4
 }
 
 build() {
diff --git a/lisa/_assets/binaries/armeabi/rt-app b/lisa/_assets/binaries/armeabi/rt-app
index a688a68007..52e6b98467 100755
Binary files a/lisa/_assets/binaries/armeabi/rt-app and b/lisa/_assets/binaries/armeabi/rt-app differ
diff --git a/lisa/_assets/binaries/x86_64/README.json-c b/lisa/_assets/binaries/x86_64/README.json-c
index 8ea0e364fa..df5c13f849 100644
--- a/lisa/_assets/binaries/x86_64/README.json-c
+++ b/lisa/_assets/binaries/x86_64/README.json-c
@@ -1,5 +1,5 @@
 Sources of json-c available at:
-Git commit: 9021cdcdd01fc9dbcbe1f06391848c2ac915212f
+Git commit: 2f2ddc1f2dbca56c874e8f9c31b5b963202d80e7
 Git repository: https://github.com/json-c/json-c
 
 
@@ -7,27 +7,28 @@ Build host info:
 
 NAME="Alpine Linux"
 ID=alpine
-VERSION_ID=3.13.4
-PRETTY_NAME="Alpine Linux v3.13"
+VERSION_ID=3.16.1
+PRETTY_NAME="Alpine Linux v3.16"
 HOME_URL="https://alpinelinux.org/"
-BUG_REPORT_URL="https://bugs.alpinelinux.org/"
+BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues"
 
 
 Build recipe:
 
 export ARCH=x86_64
-export BUILD_DIR=/tmp/tmp9j6fbooz/x86_64/source
+export BUILD_DIR=/tmp/tmpwlo34ncm/x86_64/source
 export LISA_ARCH_ASSETS=/lisa/_assets/binaries/x86_64
 export LISA_HOME=''
 #! /bin/bash
 
-ALPINE_VERSION=v3.13/main
+ALPINE_VERSION=v3.16
 ALPINE_BUILD_DEPENDENCIES=(autoconf automake bash cmake gcc git make libtool linux-headers musl-dev)
 
 build_jsonc() {
-    # As recommended in the README, build in a separate tree
-    mkdir json-c-build
-    cd json-c-build
+    # As recommended in the README, build in a separate tree. The folder needs
+    # to be called "json-c" as rt-app will #include <json-c/json.h>
+    mkdir json-c
+    cd json-c
     export ac_cv_func_malloc_0_nonnull=yes
     export ac_cv_func_realloc_0_nonnull=yes
     cmake ../json-c -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON -DCMAKE_C_COMPILER=${CROSS_COMPILE}gcc
@@ -46,8 +47,8 @@ build_rtapp() {
     export ac_cv_lib_json_c_json_object_from_file=yes
     export ac_cv_lib_numa_numa_available=yes
     ./autogen.sh
-    ./configure --host=$CONFIGURE_HOST LDFLAGS="--static -L$BUILD_DIR/json-c-build/ -L$BUILD_DIR/numactl/" \
-                CFLAGS="-I$BUILD_DIR -I$BUILD_DIR/numactl -I$BUILD_DIR/json-c-build" --with-deadline
+    ./configure --host=$CONFIGURE_HOST LDFLAGS="--static -L$BUILD_DIR/json-c/ -L$BUILD_DIR/numactl/" \
+                CFLAGS="-I$BUILD_DIR -I$BUILD_DIR/numactl -I$BUILD_DIR/json-c" --with-deadline
     make
     "$CROSS_COMPILE"strip src/rt-app
 }
@@ -55,14 +56,14 @@ build_rtapp() {
 download() {
     git clone https://github.com/json-c/json-c json-c
     # git -C json-c checkout ddd049045d98dd3163d01a7d79184b3c7fb95a14
-    git -C json-c checkout json-c-0.15-20200726
+    git -C json-c checkout json-c-0.16-20220414
 
     git clone https://github.com/numactl/numactl.git
-    git -C numactl checkout 26fba7199c365b55e72e054bb2adba097ce04924
+    git -C numactl checkout 8b18345065c39d6b1e498bf635b4c8668e2d8f4e
 
     git clone https://github.com/douglas-raillard-arm/rt-app.git
     # Branch: lisa
-    git -C rt-app checkout 5c6e0d8e96487dce8f3fb37e0e9aba995b70998e
+    git -C rt-app checkout 341f1f944023524c18ac6d254d83315434554ee4
 }
 
 build() {
diff --git a/lisa/_assets/binaries/x86_64/README.libnumactl b/lisa/_assets/binaries/x86_64/README.libnumactl
index a89f9873e5..f21593e34d 100644
--- a/lisa/_assets/binaries/x86_64/README.libnumactl
+++ b/lisa/_assets/binaries/x86_64/README.libnumactl
@@ -1,5 +1,5 @@
 Sources of libnumactl available at:
-Git commit: 26fba7199c365b55e72e054bb2adba097ce04924
+Git commit: 8b18345065c39d6b1e498bf635b4c8668e2d8f4e
 Git repository: https://github.com/numactl/numactl.git
 
 
@@ -7,27 +7,28 @@ Build host info:
 
 NAME="Alpine Linux"
 ID=alpine
-VERSION_ID=3.13.4
-PRETTY_NAME="Alpine Linux v3.13"
+VERSION_ID=3.16.1
+PRETTY_NAME="Alpine Linux v3.16"
 HOME_URL="https://alpinelinux.org/"
-BUG_REPORT_URL="https://bugs.alpinelinux.org/"
+BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues"
 
 
 Build recipe:
 
 export ARCH=x86_64
-export BUILD_DIR=/tmp/tmp9j6fbooz/x86_64/source
+export BUILD_DIR=/tmp/tmpwlo34ncm/x86_64/source
 export LISA_ARCH_ASSETS=/lisa/_assets/binaries/x86_64
 export LISA_HOME=''
 #! /bin/bash
 
-ALPINE_VERSION=v3.13/main
+ALPINE_VERSION=v3.16
 ALPINE_BUILD_DEPENDENCIES=(autoconf automake bash cmake gcc git make libtool linux-headers musl-dev)
 
 build_jsonc() {
-    # As recommended in the README, build in a separate tree
-    mkdir json-c-build
-    cd json-c-build
+    # As recommended in the README, build in a separate tree. The folder needs
+    # to be called "json-c" as rt-app will #include <json-c/json.h>
+    mkdir json-c
+    cd json-c
     export ac_cv_func_malloc_0_nonnull=yes
     export ac_cv_func_realloc_0_nonnull=yes
     cmake ../json-c -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON -DCMAKE_C_COMPILER=${CROSS_COMPILE}gcc
@@ -46,8 +47,8 @@ build_rtapp() {
     export ac_cv_lib_json_c_json_object_from_file=yes
     export ac_cv_lib_numa_numa_available=yes
     ./autogen.sh
-    ./configure --host=$CONFIGURE_HOST LDFLAGS="--static -L$BUILD_DIR/json-c-build/ -L$BUILD_DIR/numactl/" \
-                CFLAGS="-I$BUILD_DIR -I$BUILD_DIR/numactl -I$BUILD_DIR/json-c-build" --with-deadline
+    ./configure --host=$CONFIGURE_HOST LDFLAGS="--static -L$BUILD_DIR/json-c/ -L$BUILD_DIR/numactl/" \
+                CFLAGS="-I$BUILD_DIR -I$BUILD_DIR/numactl -I$BUILD_DIR/json-c" --with-deadline
     make
     "$CROSS_COMPILE"strip src/rt-app
 }
@@ -55,14 +56,14 @@ build_rtapp() {
 download() {
     git clone https://github.com/json-c/json-c json-c
     # git -C json-c checkout ddd049045d98dd3163d01a7d79184b3c7fb95a14
-    git -C json-c checkout json-c-0.15-20200726
+    git -C json-c checkout json-c-0.16-20220414
 
     git clone https://github.com/numactl/numactl.git
-    git -C numactl checkout 26fba7199c365b55e72e054bb2adba097ce04924
+    git -C numactl checkout 8b18345065c39d6b1e498bf635b4c8668e2d8f4e
 
     git clone https://github.com/douglas-raillard-arm/rt-app.git
     # Branch: lisa
-    git -C rt-app checkout 5c6e0d8e96487dce8f3fb37e0e9aba995b70998e
+    git -C rt-app checkout 341f1f944023524c18ac6d254d83315434554ee4
 }
 
 build() {
diff --git a/lisa/_assets/binaries/x86_64/README.rt-app b/lisa/_assets/binaries/x86_64/README.rt-app
index 2d00da37a2..c56ac2d5cb 100644
--- a/lisa/_assets/binaries/x86_64/README.rt-app
+++ b/lisa/_assets/binaries/x86_64/README.rt-app
@@ -1,5 +1,5 @@
 Sources of rt-app available at:
-Git commit: 5c6e0d8e96487dce8f3fb37e0e9aba995b70998e
+Git commit: 341f1f944023524c18ac6d254d83315434554ee4
 Git repository: https://github.com/douglas-raillard-arm/rt-app.git
 
 
@@ -7,27 +7,28 @@ Build host info:
 
 NAME="Alpine Linux"
 ID=alpine
-VERSION_ID=3.13.4
-PRETTY_NAME="Alpine Linux v3.13"
+VERSION_ID=3.16.1
+PRETTY_NAME="Alpine Linux v3.16"
 HOME_URL="https://alpinelinux.org/"
-BUG_REPORT_URL="https://bugs.alpinelinux.org/"
+BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues"
 
 
 Build recipe:
 
 export ARCH=x86_64
-export BUILD_DIR=/tmp/tmp9j6fbooz/x86_64/source
+export BUILD_DIR=/tmp/tmpwlo34ncm/x86_64/source
 export LISA_ARCH_ASSETS=/lisa/_assets/binaries/x86_64
 export LISA_HOME=''
 #! /bin/bash
 
-ALPINE_VERSION=v3.13/main
+ALPINE_VERSION=v3.16
 ALPINE_BUILD_DEPENDENCIES=(autoconf automake bash cmake gcc git make libtool linux-headers musl-dev)
 
 build_jsonc() {
-    # As recommended in the README, build in a separate tree
-    mkdir json-c-build
-    cd json-c-build
+    # As recommended in the README, build in a separate tree. The folder needs
+    # to be called "json-c" as rt-app will #include <json-c/json.h>
+    mkdir json-c
+    cd json-c
     export ac_cv_func_malloc_0_nonnull=yes
     export ac_cv_func_realloc_0_nonnull=yes
     cmake ../json-c -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON -DCMAKE_C_COMPILER=${CROSS_COMPILE}gcc
@@ -46,8 +47,8 @@ build_rtapp() {
     export ac_cv_lib_json_c_json_object_from_file=yes
     export ac_cv_lib_numa_numa_available=yes
     ./autogen.sh
-    ./configure --host=$CONFIGURE_HOST LDFLAGS="--static -L$BUILD_DIR/json-c-build/ -L$BUILD_DIR/numactl/" \
-                CFLAGS="-I$BUILD_DIR -I$BUILD_DIR/numactl -I$BUILD_DIR/json-c-build" --with-deadline
+    ./configure --host=$CONFIGURE_HOST LDFLAGS="--static -L$BUILD_DIR/json-c/ -L$BUILD_DIR/numactl/" \
+                CFLAGS="-I$BUILD_DIR -I$BUILD_DIR/numactl -I$BUILD_DIR/json-c" --with-deadline
     make
     "$CROSS_COMPILE"strip src/rt-app
 }
@@ -55,14 +56,14 @@ build_rtapp() {
 download() {
     git clone https://github.com/json-c/json-c json-c
     # git -C json-c checkout ddd049045d98dd3163d01a7d79184b3c7fb95a14
-    git -C json-c checkout json-c-0.15-20200726
+    git -C json-c checkout json-c-0.16-20220414
 
     git clone https://github.com/numactl/numactl.git
-    git -C numactl checkout 26fba7199c365b55e72e054bb2adba097ce04924
+    git -C numactl checkout 8b18345065c39d6b1e498bf635b4c8668e2d8f4e
 
     git clone https://github.com/douglas-raillard-arm/rt-app.git
     # Branch: lisa
-    git -C rt-app checkout 5c6e0d8e96487dce8f3fb37e0e9aba995b70998e
+    git -C rt-app checkout 341f1f944023524c18ac6d254d83315434554ee4
 }
 
 build() {
diff --git a/lisa/_assets/binaries/x86_64/rt-app b/lisa/_assets/binaries/x86_64/rt-app
index 4384dd126e..c7f2a13e3c 100755
Binary files a/lisa/_assets/binaries/x86_64/rt-app and b/lisa/_assets/binaries/x86_64/rt-app differ
diff --git a/tools/recipes/rt-app.manifest.yaml b/tools/recipes/rt-app.manifest.yaml
new file mode 100644
index 0000000000..ae59187961
--- /dev/null
+++ b/tools/recipes/rt-app.manifest.yaml
@@ -0,0 +1,34 @@
+
+# batch-rebase manifest used to create the rt-app branch for LISA
+
+# The "lisa" branch in the rt-app repo can be constructed with:
+# batch-rebase create . --manifest "$LISA_HOME/tools/recipes/rt-app.manifest.yaml" --create-branch lisa
+
+rebase-conf:
+    rr-cache: ./rr-cache
+    base:
+        remote: github
+        ref: master
+
+    topics:
+        # https://github.com/scheduler-tools/rt-app/pull/122
+        -
+            remote: github
+            base: master
+            tip: fix_cpu_set
+
+        # https://github.com/scheduler-tools/rt-app/pull/113
+        -
+            remote: github
+            base: master
+            tip: uclamp-reset
+
+        # https://github.com/scheduler-tools/rt-app/pull/126
+        -
+            remote: github
+            base: master
+            tip: tracefs_path_set
+
+    remotes:
+        github:
+            url: https://github.com/douglas-raillard-arm/rt-app.git
diff --git a/tools/recipes/rt-app.recipe b/tools/recipes/rt-app.recipe
index 1bcc92301f..ac50c85860 100644
--- a/tools/recipes/rt-app.recipe
+++ b/tools/recipes/rt-app.recipe
@@ -1,12 +1,13 @@
 #! /bin/bash
 
-ALPINE_VERSION=v3.13
+ALPINE_VERSION=v3.16
 ALPINE_BUILD_DEPENDENCIES=(autoconf automake bash cmake gcc git make libtool linux-headers musl-dev)
 
 build_jsonc() {
-    # As recommended in the README, build in a separate tree
-    mkdir json-c-build
-    cd json-c-build
+    # As recommended in the README, build in a separate tree. The folder needs
+    # to be called "json-c" as rt-app will #include <json-c/json.h>
+    mkdir json-c
+    cd json-c
     export ac_cv_func_malloc_0_nonnull=yes
     export ac_cv_func_realloc_0_nonnull=yes
     cmake ../json-c -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON -DCMAKE_C_COMPILER=${CROSS_COMPILE}gcc
@@ -25,8 +26,8 @@ build_rtapp() {
     export ac_cv_lib_json_c_json_object_from_file=yes
     export ac_cv_lib_numa_numa_available=yes
     ./autogen.sh
-    ./configure --host=$CONFIGURE_HOST LDFLAGS="--static -L$BUILD_DIR/json-c-build/ -L$BUILD_DIR/numactl/" \
-                CFLAGS="-I$BUILD_DIR -I$BUILD_DIR/numactl -I$BUILD_DIR/json-c-build" --with-deadline
+    ./configure --host=$CONFIGURE_HOST LDFLAGS="--static -L$BUILD_DIR/json-c/ -L$BUILD_DIR/numactl/" \
+                CFLAGS="-I$BUILD_DIR -I$BUILD_DIR/numactl -I$BUILD_DIR/json-c" --with-deadline
     make
     "$CROSS_COMPILE"strip src/rt-app
 }
@@ -34,14 +35,14 @@ build_rtapp() {
 download() {
     git clone https://github.com/json-c/json-c json-c
     # git -C json-c checkout ddd049045d98dd3163d01a7d79184b3c7fb95a14
-    git -C json-c checkout json-c-0.15-20200726
+    git -C json-c checkout json-c-0.16-20220414
 
     git clone https://github.com/numactl/numactl.git
-    git -C numactl checkout 26fba7199c365b55e72e054bb2adba097ce04924
+    git -C numactl checkout 8b18345065c39d6b1e498bf635b4c8668e2d8f4e
 
     git clone https://github.com/douglas-raillard-arm/rt-app.git
     # Branch: lisa
-    git -C rt-app checkout 5c6e0d8e96487dce8f3fb37e0e9aba995b70998e
+    git -C rt-app checkout 341f1f944023524c18ac6d254d83315434554ee4
 }
 
 build() {