diff --git a/.gitea/workflows/build-jupyterhub.yaml b/.gitea/workflows/build-jupyterhub.yaml
index 44afec9..d74342a 100644
--- a/.gitea/workflows/build-jupyterhub.yaml
+++ b/.gitea/workflows/build-jupyterhub.yaml
@@ -6,7 +6,7 @@ on:
       - 'jupyterhub/**'
       - '.gitea/workflows/build-jupyterhub.yaml'      
 jobs:
-  "Build wildfly docker images":
+  "Build jupyterhub docker images":
     runs-on: woryzen
     steps:
       -
diff --git a/.gitea/workflows/build-wildfly.yaml b/.gitea/workflows/build-wildfly.yaml
index 4c0426c..174006f 100644
--- a/.gitea/workflows/build-wildfly.yaml
+++ b/.gitea/workflows/build-wildfly.yaml
@@ -22,7 +22,7 @@ jobs:
           username: woggioni
           password: ${{ secrets.PUBLISHER_TOKEN }}
       -
-        name: Build and push jenkins-agent images
+        name: Build and push wildfly images
         uses: docker/build-push-action@v6
         with:
           context: "{{defaultContext}}:wildfly"
diff --git a/arch-builder/makepkg/makepkg-aarch64.conf b/arch-builder/makepkg/makepkg-aarch64.conf
index 7a26d18..5aaff4f 100644
--- a/arch-builder/makepkg/makepkg-aarch64.conf
+++ b/arch-builder/makepkg/makepkg-aarch64.conf
@@ -49,7 +49,7 @@ LTOFLAGS="-flto=auto"
 
 #RUSTFLAGS="-C opt-level=2"
 #-- Make Flags: change this for DistCC/SMP systems
-MAKEFLAGS="-j4"
+MAKEFLAGS="--jobs=$(nproc)"
 #-- Debugging flags
 DEBUG_CFLAGS="-g -fvar-tracking-assignments"
 DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
diff --git a/arch-builder/makepkg/makepkg-armv7h.conf b/arch-builder/makepkg/makepkg-armv7h.conf
index bfa2029..a838a12 100644
--- a/arch-builder/makepkg/makepkg-armv7h.conf
+++ b/arch-builder/makepkg/makepkg-armv7h.conf
@@ -46,7 +46,7 @@ LTOFLAGS="-flto=auto"
 
 #RUSTFLAGS="-C opt-level=2"
 #-- Make Flags: change this for DistCC/SMP systems
-MAKEFLAGS="-j4"
+MAKEFLAGS="--jobs=$(nproc)"
 #-- Debugging flags
 DEBUG_CFLAGS="-g -fvar-tracking-assignments"
 DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
diff --git a/arch-builder/makepkg/makepkg-goldmont.conf b/arch-builder/makepkg/makepkg-goldmont.conf
index 140e9d3..1aaa006 100644
--- a/arch-builder/makepkg/makepkg-goldmont.conf
+++ b/arch-builder/makepkg/makepkg-goldmont.conf
@@ -48,7 +48,7 @@ LTOFLAGS="-flto=auto"
 
 #RUSTFLAGS="-C opt-level=2"
 #-- Make Flags: change this for DistCC/SMP systems
-MAKEFLAGS="-j4"
+MAKEFLAGS="--jobs=$(nproc)"
 #-- Debugging flags
 DEBUG_CFLAGS="-g -fvar-tracking-assignments"
 DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
diff --git a/arch-builder/makepkg/makepkg-native.conf b/arch-builder/makepkg/makepkg-native.conf
index 5ea62df..cb7150e 100644
--- a/arch-builder/makepkg/makepkg-native.conf
+++ b/arch-builder/makepkg/makepkg-native.conf
@@ -44,7 +44,7 @@ LDFLAGS="-Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now \
 LTOFLAGS="-flto=auto"
 
 #-- Make Flags: change this for DistCC/SMP systems
-MAKEFLAGS="-j4"
+MAKEFLAGS="--jobs=$(nproc)"
 #-- Debugging flags
 DEBUG_CFLAGS="-g -fvar-tracking-assignments"
 DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
diff --git a/arch-builder/makepkg/makepkg-sandybridge.conf b/arch-builder/makepkg/makepkg-sandybridge.conf
index f44b701..821da02 100644
--- a/arch-builder/makepkg/makepkg-sandybridge.conf
+++ b/arch-builder/makepkg/makepkg-sandybridge.conf
@@ -48,7 +48,7 @@ LTOFLAGS="-flto=auto"
 
 #RUSTFLAGS="-C opt-level=2"
 #-- Make Flags: change this for DistCC/SMP systems
-MAKEFLAGS="-j4"
+MAKEFLAGS="--jobs=$(nproc)"
 #-- Debugging flags
 DEBUG_CFLAGS="-g -fvar-tracking-assignments"
 DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
diff --git a/arch-builder/makepkg/makepkg-silvermont.conf b/arch-builder/makepkg/makepkg-silvermont.conf
index d17832d..99545df 100644
--- a/arch-builder/makepkg/makepkg-silvermont.conf
+++ b/arch-builder/makepkg/makepkg-silvermont.conf
@@ -48,7 +48,7 @@ LTOFLAGS="-flto=auto"
 
 #RUSTFLAGS="-C opt-level=2"
 #-- Make Flags: change this for DistCC/SMP systems
-MAKEFLAGS="-j4"
+MAKEFLAGS="--jobs=$(nproc)"
 #-- Debugging flags
 DEBUG_CFLAGS="-g -fvar-tracking-assignments"
 DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
diff --git a/arch-builder/makepkg/makepkg-skylake.conf b/arch-builder/makepkg/makepkg-skylake.conf
index a3f21a3..84245c0 100644
--- a/arch-builder/makepkg/makepkg-skylake.conf
+++ b/arch-builder/makepkg/makepkg-skylake.conf
@@ -48,7 +48,7 @@ LTOFLAGS="-flto=auto"
 
 #RUSTFLAGS="-C opt-level=2"
 #-- Make Flags: change this for DistCC/SMP systems
-MAKEFLAGS="-j4"
+MAKEFLAGS="--jobs=$(nproc)"
 #-- Debugging flags
 DEBUG_CFLAGS="-g -fvar-tracking-assignments"
 DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
diff --git a/arch-builder/makepkg/makepkg-tigerlake.conf b/arch-builder/makepkg/makepkg-tigerlake.conf
index 80171ad..c7ded71 100644
--- a/arch-builder/makepkg/makepkg-tigerlake.conf
+++ b/arch-builder/makepkg/makepkg-tigerlake.conf
@@ -48,7 +48,7 @@ LTOFLAGS="-flto=auto"
 
 #RUSTFLAGS="-C opt-level=2"
 #-- Make Flags: change this for DistCC/SMP systems
-MAKEFLAGS="-j4"
+MAKEFLAGS="--jobs=$(nproc)"
 #-- Debugging flags
 DEBUG_CFLAGS="-g -fvar-tracking-assignments"
 DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
diff --git a/arch-builder/makepkg/makepkg-znver1.conf b/arch-builder/makepkg/makepkg-znver1.conf
index df75bbe..d4ba1a4 100644
--- a/arch-builder/makepkg/makepkg-znver1.conf
+++ b/arch-builder/makepkg/makepkg-znver1.conf
@@ -48,7 +48,8 @@ LTOFLAGS="-flto=auto"
 
 #RUSTFLAGS="-C opt-level=2"
 #-- Make Flags: change this for DistCC/SMP systems
-MAKEFLAGS="-j4"
+MAKEFLAGS="--jobs=$(nproc)"
+
 #-- Debugging flags
 DEBUG_CFLAGS="-g -fvar-tracking-assignments"
 DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
diff --git a/arch-builder/makepkg/makepkg-znver2.conf b/arch-builder/makepkg/makepkg-znver2.conf
index 6794d68..c052c8c 100644
--- a/arch-builder/makepkg/makepkg-znver2.conf
+++ b/arch-builder/makepkg/makepkg-znver2.conf
@@ -48,7 +48,7 @@ LTOFLAGS="-flto=auto"
 
 #RUSTFLAGS="-C opt-level=2"
 #-- Make Flags: change this for DistCC/SMP systems
-MAKEFLAGS="-j4"
+MAKEFLAGS="--jobs=$(nproc)"
 #-- Debugging flags
 DEBUG_CFLAGS="-g -fvar-tracking-assignments"
 DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
diff --git a/arch-builder/makepkg/makepkg-znver3.conf b/arch-builder/makepkg/makepkg-znver3.conf
index 129a476..834c172 100644
--- a/arch-builder/makepkg/makepkg-znver3.conf
+++ b/arch-builder/makepkg/makepkg-znver3.conf
@@ -48,7 +48,8 @@ LTOFLAGS="-flto=auto"
 
 #RUSTFLAGS="-C opt-level=2"
 #-- Make Flags: change this for DistCC/SMP systems
-MAKEFLAGS="-j4"
+MAKEFLAGS="--jobs=$(nproc)"
+
 #-- Debugging flags
 DEBUG_CFLAGS="-g -fvar-tracking-assignments"
 DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
diff --git a/arch-builder/makepkg/makepkg-znver5.conf b/arch-builder/makepkg/makepkg-znver5.conf
index 2c493c5..742707b 100644
--- a/arch-builder/makepkg/makepkg-znver5.conf
+++ b/arch-builder/makepkg/makepkg-znver5.conf
@@ -48,7 +48,7 @@ LTOFLAGS="-flto=auto"
 
 #RUSTFLAGS="-C opt-level=2"
 #-- Make Flags: change this for DistCC/SMP systems
-MAKEFLAGS="-j4"
+MAKEFLAGS="--jobs=$(nproc)"
 #-- Debugging flags
 DEBUG_CFLAGS="-g -fvar-tracking-assignments"
 DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
diff --git a/arch-builder/makepkg/makepkg.conf b/arch-builder/makepkg/makepkg.conf
index 3c8b92e..e2ed384 100644
--- a/arch-builder/makepkg/makepkg.conf
+++ b/arch-builder/makepkg/makepkg.conf
@@ -46,7 +46,7 @@ LDFLAGS="-Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now \
          -Wl,-z,pack-relative-relocs"
 LTOFLAGS="-flto=auto"
 #-- Make Flags: change this for DistCC/SMP systems
-MAKEFLAGS="-j4"
+MAKEFLAGS="--jobs=$(nproc)"
 #-- Debugging flags
 DEBUG_CFLAGS="-g -fvar-tracking-assignments"
 DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"