diff --git a/Dockerfile b/Dockerfile
index e79df01..7f5aa74 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ WORKDIR /go/src/commento-ce/api
 
 RUN apk update && apk add bash make git
 
-RUN make prod -j8
+RUN make prod -j$(($(nproc) + 1))
 
 
 # frontend build (html, js, css, images)
@@ -18,7 +18,7 @@ WORKDIR /commento-ce/frontend/
 RUN apk update && apk add bash make
 RUN npm install -g html-minifier@3.5.7 uglify-js@3.4.1 sass@1.5.1
 
-RUN make prod -j8
+RUN make prod -j$(($(nproc) + 1))
 
 
 # templates build
@@ -29,7 +29,7 @@ WORKDIR /commento-ce/templates
 
 RUN apk update && apk add bash make
 
-RUN make prod -j8
+RUN make prod -j$(($(nproc) + 1))
 
 
 # db build
@@ -40,7 +40,7 @@ WORKDIR /commento-ce/db
 
 RUN apk update && apk add bash make
 
-RUN make prod -j8
+RUN make prod -j$(($(nproc) + 1))
 
 
 # final image
diff --git a/scripts/autoserve b/scripts/autoserve
index 1823bfc..711e517 100755
--- a/scripts/autoserve
+++ b/scripts/autoserve
@@ -10,7 +10,7 @@ ctrl_c() {
 }
 
 binary_pid=
-if make -j8; then
+if make -j$(($(nproc) + 1)); then
   source devel.env
   cd build/devel
   ./$binary_name &
@@ -50,7 +50,7 @@ while true; do
     wait $binary_pid
   fi
 
-  if make -j8; then
+  if make -j$(($(nproc) + 1)); then
     source devel.env
     cd build/devel
     ./$binary_name &