diff --git a/.github/workflows/action-schedule_master.yml b/.github/workflows/action-schedule_master.yml
index 6bbecdbb..63c92591 100644
--- a/.github/workflows/action-schedule_master.yml
+++ b/.github/workflows/action-schedule_master.yml
@@ -10,9 +10,9 @@ name: nightly
 # When to run
 # -------------------------------------------------------------------------------------------------
 on:
-  # Nightly: At 00:00 on Sunday, Tuesday, and Thursday
+  # Nightly: At 00:00 on Monday, Wednesday, and Friday
   schedule:
-    - cron: '0 0 * * 0,2,4'
+    - cron: '0 18 * * 1,3,5'
   # Dispatch: allows for manual trigger via GH UI
   workflow_dispatch:
 
diff --git a/.github/workflows/action-schedule_tags.yml b/.github/workflows/action-schedule_tags.yml
index 35fb0825..fa467ecc 100644
--- a/.github/workflows/action-schedule_tags.yml
+++ b/.github/workflows/action-schedule_tags.yml
@@ -10,9 +10,9 @@ name: nightly
 # When to run
 # -------------------------------------------------------------------------------------------------
 on:
-  # Nightly: At 00:00 on Sunday, Tuesday, and Thursday
+  # Nightly: At 18:00 on Sunday, Tuesday, and Thursday
   schedule:
-    - cron: '0 0 * * 0,2,4'
+    - cron: '0 18 * * 0,2,4'
   # Dispatch: allows for manual trigger via GH UI
   workflow_dispatch:
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 836113bd..b4b6ccc4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,17 @@
 ## Unreleased
 
 
+## Release 0.139
+
+#### Added
+- (Re-)added mongodb command line client
+- (Re-)added postgresql command line client
+
+### Changed
+- Speed up `xargs` commands by using multi-CPU
+- Use buildkit for building
+
+
 ## Release 0.138
 
 #### Added
diff --git a/Dockerfiles/mods/Dockerfile-5.2 b/Dockerfiles/mods/Dockerfile-5.2
index c2716340..d894e3d7 100644
--- a/Dockerfiles/mods/Dockerfile-5.2
+++ b/Dockerfiles/mods/Dockerfile-5.2
@@ -553,9 +553,9 @@ RUN set -eux \
 
 # Shrink everything down
 RUN set -eux \
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 
diff --git a/Dockerfiles/mods/Dockerfile-5.3 b/Dockerfiles/mods/Dockerfile-5.3
index 33a14cf4..5f0c2304 100644
--- a/Dockerfiles/mods/Dockerfile-5.3
+++ b/Dockerfiles/mods/Dockerfile-5.3
@@ -663,9 +663,9 @@ RUN set -eux \
 
 # Shrink everything down
 RUN set -eux \
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 
diff --git a/Dockerfiles/mods/Dockerfile-5.4 b/Dockerfiles/mods/Dockerfile-5.4
index e4196f1c..77ffb18a 100644
--- a/Dockerfiles/mods/Dockerfile-5.4
+++ b/Dockerfiles/mods/Dockerfile-5.4
@@ -674,9 +674,9 @@ RUN set -eux \
 
 # Shrink everything down
 RUN set -eux \
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 
diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5
index c5f966cd..29d0506a 100644
--- a/Dockerfiles/mods/Dockerfile-5.5
+++ b/Dockerfiles/mods/Dockerfile-5.5
@@ -712,9 +712,9 @@ RUN set -eux \
 
 # Shrink everything down
 RUN set -eux \
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 
diff --git a/Dockerfiles/mods/Dockerfile-5.6 b/Dockerfiles/mods/Dockerfile-5.6
index 08d7a318..1274749a 100644
--- a/Dockerfiles/mods/Dockerfile-5.6
+++ b/Dockerfiles/mods/Dockerfile-5.6
@@ -731,9 +731,9 @@ RUN set -eux \
 
 # Shrink everything down
 RUN set -eux \
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 
diff --git a/Dockerfiles/mods/Dockerfile-7.0 b/Dockerfiles/mods/Dockerfile-7.0
index a46de752..36869c69 100644
--- a/Dockerfiles/mods/Dockerfile-7.0
+++ b/Dockerfiles/mods/Dockerfile-7.0
@@ -817,9 +817,9 @@ RUN set -eux \
 
 # Shrink everything down
 RUN set -eux \
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 
diff --git a/Dockerfiles/mods/Dockerfile-7.1 b/Dockerfiles/mods/Dockerfile-7.1
index c6e6768f..40958954 100644
--- a/Dockerfiles/mods/Dockerfile-7.1
+++ b/Dockerfiles/mods/Dockerfile-7.1
@@ -825,9 +825,9 @@ RUN set -eux \
 
 # Shrink everything down
 RUN set -eux \
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 
diff --git a/Dockerfiles/mods/Dockerfile-7.2 b/Dockerfiles/mods/Dockerfile-7.2
index 5ce787da..7907a8ba 100644
--- a/Dockerfiles/mods/Dockerfile-7.2
+++ b/Dockerfiles/mods/Dockerfile-7.2
@@ -828,9 +828,9 @@ RUN set -eux \
 
 # Shrink everything down
 RUN set -eux \
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 
diff --git a/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3
index cd1bc492..49050c51 100644
--- a/Dockerfiles/mods/Dockerfile-7.3
+++ b/Dockerfiles/mods/Dockerfile-7.3
@@ -818,9 +818,9 @@ RUN set -eux \
 
 # Shrink everything down
 RUN set -eux \
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 
diff --git a/Dockerfiles/mods/Dockerfile-7.4 b/Dockerfiles/mods/Dockerfile-7.4
index f251ecc1..acd6248c 100644
--- a/Dockerfiles/mods/Dockerfile-7.4
+++ b/Dockerfiles/mods/Dockerfile-7.4
@@ -804,9 +804,9 @@ RUN set -eux \
 
 # Shrink everything down
 RUN set -eux \
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 
diff --git a/Dockerfiles/mods/Dockerfile-8.0 b/Dockerfiles/mods/Dockerfile-8.0
index b70a4561..bdd3da17 100644
--- a/Dockerfiles/mods/Dockerfile-8.0
+++ b/Dockerfiles/mods/Dockerfile-8.0
@@ -759,9 +759,9 @@ RUN set -eux \
 
 # Shrink everything down
 RUN set -eux \
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 
diff --git a/Dockerfiles/mods/Dockerfile-8.1 b/Dockerfiles/mods/Dockerfile-8.1
index 947bbbd8..5de0a1fe 100644
--- a/Dockerfiles/mods/Dockerfile-8.1
+++ b/Dockerfiles/mods/Dockerfile-8.1
@@ -746,9 +746,9 @@ RUN set -eux \
 
 # Shrink everything down
 RUN set -eux \
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 
diff --git a/Dockerfiles/mods/Dockerfile-8.2 b/Dockerfiles/mods/Dockerfile-8.2
index aef9e304..42f668c1 100644
--- a/Dockerfiles/mods/Dockerfile-8.2
+++ b/Dockerfiles/mods/Dockerfile-8.2
@@ -720,9 +720,9 @@ RUN set -eux \
 
 # Shrink everything down
 RUN set -eux \
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 
diff --git a/Dockerfiles/prod/Dockerfile-5.2 b/Dockerfiles/prod/Dockerfile-5.2
index 93e4b36a..aaf60da1 100644
--- a/Dockerfiles/prod/Dockerfile-5.2
+++ b/Dockerfiles/prod/Dockerfile-5.2
@@ -47,9 +47,9 @@ RUN set -eux \
 	&& mkdir -p /etc/supervisor/custom.d \
 	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
diff --git a/Dockerfiles/prod/Dockerfile-5.3 b/Dockerfiles/prod/Dockerfile-5.3
index 7c262af3..4975c3d7 100644
--- a/Dockerfiles/prod/Dockerfile-5.3
+++ b/Dockerfiles/prod/Dockerfile-5.3
@@ -47,9 +47,9 @@ RUN set -eux \
 	&& mkdir -p /etc/supervisor/custom.d \
 	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
diff --git a/Dockerfiles/prod/Dockerfile-5.4 b/Dockerfiles/prod/Dockerfile-5.4
index 10c66793..bff4671e 100644
--- a/Dockerfiles/prod/Dockerfile-5.4
+++ b/Dockerfiles/prod/Dockerfile-5.4
@@ -47,9 +47,9 @@ RUN set -eux \
 	&& mkdir -p /etc/supervisor/custom.d \
 	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
diff --git a/Dockerfiles/prod/Dockerfile-5.5 b/Dockerfiles/prod/Dockerfile-5.5
index d86934a0..00eef34c 100644
--- a/Dockerfiles/prod/Dockerfile-5.5
+++ b/Dockerfiles/prod/Dockerfile-5.5
@@ -47,9 +47,9 @@ RUN set -eux \
 	&& mkdir -p /etc/supervisor/custom.d \
 	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
diff --git a/Dockerfiles/prod/Dockerfile-5.6 b/Dockerfiles/prod/Dockerfile-5.6
index 5b2b5ad7..b61faed4 100644
--- a/Dockerfiles/prod/Dockerfile-5.6
+++ b/Dockerfiles/prod/Dockerfile-5.6
@@ -47,9 +47,9 @@ RUN set -eux \
 	&& mkdir -p /etc/supervisor/custom.d \
 	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
diff --git a/Dockerfiles/prod/Dockerfile-7.0 b/Dockerfiles/prod/Dockerfile-7.0
index 8b4716a9..57591ea8 100644
--- a/Dockerfiles/prod/Dockerfile-7.0
+++ b/Dockerfiles/prod/Dockerfile-7.0
@@ -47,9 +47,9 @@ RUN set -eux \
 	&& mkdir -p /etc/supervisor/custom.d \
 	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
diff --git a/Dockerfiles/prod/Dockerfile-7.1 b/Dockerfiles/prod/Dockerfile-7.1
index fb2dfcf8..0e0fe396 100644
--- a/Dockerfiles/prod/Dockerfile-7.1
+++ b/Dockerfiles/prod/Dockerfile-7.1
@@ -47,9 +47,9 @@ RUN set -eux \
 	&& mkdir -p /etc/supervisor/custom.d \
 	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
diff --git a/Dockerfiles/prod/Dockerfile-7.2 b/Dockerfiles/prod/Dockerfile-7.2
index c5a424b8..9cd8e4ae 100644
--- a/Dockerfiles/prod/Dockerfile-7.2
+++ b/Dockerfiles/prod/Dockerfile-7.2
@@ -47,9 +47,9 @@ RUN set -eux \
 	&& mkdir -p /etc/supervisor/custom.d \
 	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
diff --git a/Dockerfiles/prod/Dockerfile-7.3 b/Dockerfiles/prod/Dockerfile-7.3
index 4810c353..57481cc5 100644
--- a/Dockerfiles/prod/Dockerfile-7.3
+++ b/Dockerfiles/prod/Dockerfile-7.3
@@ -47,9 +47,9 @@ RUN set -eux \
 	&& mkdir -p /etc/supervisor/custom.d \
 	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
diff --git a/Dockerfiles/prod/Dockerfile-7.4 b/Dockerfiles/prod/Dockerfile-7.4
index 6cce14ad..6ecf1bcd 100644
--- a/Dockerfiles/prod/Dockerfile-7.4
+++ b/Dockerfiles/prod/Dockerfile-7.4
@@ -47,9 +47,9 @@ RUN set -eux \
 	&& mkdir -p /etc/supervisor/custom.d \
 	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
diff --git a/Dockerfiles/prod/Dockerfile-8.0 b/Dockerfiles/prod/Dockerfile-8.0
index 85630d04..5061343d 100644
--- a/Dockerfiles/prod/Dockerfile-8.0
+++ b/Dockerfiles/prod/Dockerfile-8.0
@@ -47,9 +47,9 @@ RUN set -eux \
 	&& mkdir -p /etc/supervisor/custom.d \
 	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
diff --git a/Dockerfiles/prod/Dockerfile-8.1 b/Dockerfiles/prod/Dockerfile-8.1
index 52136407..60c0e031 100644
--- a/Dockerfiles/prod/Dockerfile-8.1
+++ b/Dockerfiles/prod/Dockerfile-8.1
@@ -47,9 +47,9 @@ RUN set -eux \
 	&& mkdir -p /etc/supervisor/custom.d \
 	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
diff --git a/Dockerfiles/prod/Dockerfile-8.2 b/Dockerfiles/prod/Dockerfile-8.2
index cea8caec..c9c46e97 100644
--- a/Dockerfiles/prod/Dockerfile-8.2
+++ b/Dockerfiles/prod/Dockerfile-8.2
@@ -47,9 +47,9 @@ RUN set -eux \
 	&& mkdir -p /etc/supervisor/custom.d \
 	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2
index 1e11bf3d..2f4eae29 100644
--- a/Dockerfiles/work/Dockerfile-5.2
+++ b/Dockerfiles/work/Dockerfile-5.2
@@ -58,8 +58,6 @@ RUN set -eux \
 	&& echo "deb http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
-	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
 	\
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -97,7 +95,9 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 		mysql-client \
+		\
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -106,7 +106,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-#		postgresql-client \
 		redis-tools \
 		rsync \
 		rubygems \
@@ -129,23 +128,9 @@ RUN set -eux \
 		zsh \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
-
-
-###
-### Instal Architecture Dependent software
-###
-#RUN set -eux \
-#	&& if [ "${ARCH}" = "linux/amd64" ]; then \
-#		DEBIAN_FRONTEND=noninteractive apt-get update \
-#		&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
-#			mongodb-org-shell \
-#			mongodb-org-tools; \
-#	fi \
-#	&& DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-#	&& rm -rf /var/lib/apt/lists/*
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -188,6 +173,29 @@ RUN set -eux \
 && su  -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
  \
 	\
+# -------------------- pgsql_client --------------------
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+  && echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+  && apt-get update; \
+fi \
+ \
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    postgresql-client; \
+fi \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+# -------------------- mongo_client --------------------
+	&& apt-get update \
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    mongodb-clients; \
+fi \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
 # -------------------- awesomeci --------------------
 	&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
 && cd /usr/local/src/awesome-ci \
@@ -352,9 +360,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -449,7 +457,7 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -507,9 +515,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -561,9 +569,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -612,6 +620,22 @@ RUN set -eux \
 # -------------------- Software --------------------
 	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
 && su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+ \
+	&& if echo '5.2' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  pg_isready --version; \
+  fi \
+else \
+  pg_isready --version; \
+fi \
+ \
+	&& if echo '5.2' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+    mongofiles --version; \
+  fi \
+else \
+  mongofiles --version; \
+fi \
  \
 	&& regex-grep --version | grep -E '[0-9][.0-9]+' \
 	&& git-flow version | grep -E '[0-9][.0-9]+' \
diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3
index 508521a6..70403660 100644
--- a/Dockerfiles/work/Dockerfile-5.3
+++ b/Dockerfiles/work/Dockerfile-5.3
@@ -58,8 +58,6 @@ RUN set -eux \
 	&& echo "deb http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
-	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
 	\
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -97,7 +95,9 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 		mysql-client \
+		\
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -106,7 +106,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-#		postgresql-client \
 		redis-tools \
 		rsync \
 		rubygems \
@@ -129,23 +128,9 @@ RUN set -eux \
 		zsh \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
-
-
-###
-### Instal Architecture Dependent software
-###
-#RUN set -eux \
-#	&& if [ "${ARCH}" = "linux/amd64" ]; then \
-#		DEBIAN_FRONTEND=noninteractive apt-get update \
-#		&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
-#			mongodb-org-shell \
-#			mongodb-org-tools; \
-#	fi \
-#	&& DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-#	&& rm -rf /var/lib/apt/lists/*
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -200,6 +185,29 @@ RUN set -eux \
 && su  -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
  \
 	\
+# -------------------- pgsql_client --------------------
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+  && echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+  && apt-get update; \
+fi \
+ \
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    postgresql-client; \
+fi \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+# -------------------- mongo_client --------------------
+	&& apt-get update \
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    mongodb-clients; \
+fi \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
 # -------------------- awesomeci --------------------
 	&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
 && cd /usr/local/src/awesome-ci \
@@ -413,9 +421,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -510,7 +518,7 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -568,9 +576,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -622,9 +630,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -674,6 +682,22 @@ RUN set -eux \
 	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
 	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
 && su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+ \
+	&& if echo '5.3' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  pg_isready --version; \
+  fi \
+else \
+  pg_isready --version; \
+fi \
+ \
+	&& if echo '5.3' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+    mongofiles --version; \
+  fi \
+else \
+  mongofiles --version; \
+fi \
  \
 	&& regex-grep --version | grep -E '[0-9][.0-9]+' \
 	&& drush7 --version | grep -E '7[.0-9]+\s*$' \
diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4
index 927a5a46..eee2416d 100644
--- a/Dockerfiles/work/Dockerfile-5.4
+++ b/Dockerfiles/work/Dockerfile-5.4
@@ -58,8 +58,6 @@ RUN set -eux \
 	&& echo "deb http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
-	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
 	\
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -97,7 +95,9 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 		mysql-client \
+		\
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -106,7 +106,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-#		postgresql-client \
 		redis-tools \
 		rsync \
 		rubygems \
@@ -129,23 +128,9 @@ RUN set -eux \
 		zsh \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
-
-
-###
-### Instal Architecture Dependent software
-###
-#RUN set -eux \
-#	&& if [ "${ARCH}" = "linux/amd64" ]; then \
-#		DEBIAN_FRONTEND=noninteractive apt-get update \
-#		&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
-#			mongodb-org-shell \
-#			mongodb-org-tools; \
-#	fi \
-#	&& DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-#	&& rm -rf /var/lib/apt/lists/*
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -200,6 +185,29 @@ RUN set -eux \
 && su  -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
  \
 	\
+# -------------------- pgsql_client --------------------
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+  && echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+  && apt-get update; \
+fi \
+ \
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    postgresql-client; \
+fi \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+# -------------------- mongo_client --------------------
+	&& apt-get update \
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    mongodb-clients; \
+fi \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
 # -------------------- awesomeci --------------------
 	&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
 && cd /usr/local/src/awesome-ci \
@@ -451,9 +459,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -548,7 +556,7 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -606,9 +614,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -660,9 +668,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -712,6 +720,22 @@ RUN set -eux \
 	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
 	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
 && su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+ \
+	&& if echo '5.4' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  pg_isready --version; \
+  fi \
+else \
+  pg_isready --version; \
+fi \
+ \
+	&& if echo '5.4' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+    mongofiles --version; \
+  fi \
+else \
+  mongofiles --version; \
+fi \
  \
 	&& regex-grep --version | grep -E '[0-9][.0-9]+' \
 	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5
index 3e749773..97c3358f 100644
--- a/Dockerfiles/work/Dockerfile-5.5
+++ b/Dockerfiles/work/Dockerfile-5.5
@@ -58,8 +58,6 @@ RUN set -eux \
 	&& echo "deb http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
-	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
 	\
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -97,7 +95,9 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 		mysql-client \
+		\
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -106,7 +106,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-#		postgresql-client \
 		redis-tools \
 		rsync \
 		rubygems \
@@ -129,23 +128,9 @@ RUN set -eux \
 		zsh \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
-
-
-###
-### Instal Architecture Dependent software
-###
-#RUN set -eux \
-#	&& if [ "${ARCH}" = "linux/amd64" ]; then \
-#		DEBIAN_FRONTEND=noninteractive apt-get update \
-#		&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
-#			mongodb-org-shell \
-#			mongodb-org-tools; \
-#	fi \
-#	&& DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-#	&& rm -rf /var/lib/apt/lists/*
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -200,6 +185,29 @@ RUN set -eux \
 && su  -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
  \
 	\
+# -------------------- pgsql_client --------------------
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+  && echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+  && apt-get update; \
+fi \
+ \
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    postgresql-client; \
+fi \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+# -------------------- mongo_client --------------------
+	&& apt-get update \
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    mongodb-clients; \
+fi \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
 # -------------------- awesomeci --------------------
 	&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
 && cd /usr/local/src/awesome-ci \
@@ -465,9 +473,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -562,7 +570,7 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -620,9 +628,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -674,9 +682,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -726,6 +734,22 @@ RUN set -eux \
 	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
 	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
 && su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+ \
+	&& if echo '5.5' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  pg_isready --version; \
+  fi \
+else \
+  pg_isready --version; \
+fi \
+ \
+	&& if echo '5.5' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+    mongofiles --version; \
+  fi \
+else \
+  mongofiles --version; \
+fi \
  \
 	&& regex-grep --version | grep -E '[0-9][.0-9]+' \
 	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6
index a7eaf89b..8ae79e5b 100644
--- a/Dockerfiles/work/Dockerfile-5.6
+++ b/Dockerfiles/work/Dockerfile-5.6
@@ -58,8 +58,6 @@ RUN set -eux \
 	&& echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
-	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
 	\
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -98,7 +96,9 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 		mysql-client \
+		\
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -107,7 +107,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-#		postgresql-client \
 		redis-tools \
 		rsync \
 		rubygems \
@@ -131,23 +130,9 @@ RUN set -eux \
 		zsh-common \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
-
-
-###
-### Instal Architecture Dependent software
-###
-#RUN set -eux \
-#	&& if [ "${ARCH}" = "linux/amd64" ]; then \
-#		DEBIAN_FRONTEND=noninteractive apt-get update \
-#		&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
-#			mongodb-org-shell \
-#			mongodb-org-tools; \
-#	fi \
-#	&& DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-#	&& rm -rf /var/lib/apt/lists/*
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -202,6 +187,33 @@ RUN set -eux \
 && su  -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
  \
 	\
+# -------------------- pgsql_client --------------------
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+  && echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+  && apt-get update; \
+fi \
+ \
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    postgresql-client; \
+fi \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+# -------------------- mongo_client --------------------
+	&& apt-get update \
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    mongodb-clients \
+    mongo-tools; \
+else \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    mongodb-clients; \
+fi \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
 # -------------------- awesomeci --------------------
 	&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
 && cd /usr/local/src/awesome-ci \
@@ -481,9 +493,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -578,7 +590,7 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -633,9 +645,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -687,9 +699,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -739,6 +751,22 @@ RUN set -eux \
 	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
 	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
 && su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+ \
+	&& if echo '5.6' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  pg_isready --version; \
+  fi \
+else \
+  pg_isready --version; \
+fi \
+ \
+	&& if echo '5.6' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+    mongofiles --version; \
+  fi \
+else \
+  mongofiles --version; \
+fi \
  \
 	&& regex-grep --version | grep -E '[0-9][.0-9]+' \
 	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0
index c66f3b78..1bc83d8c 100644
--- a/Dockerfiles/work/Dockerfile-7.0
+++ b/Dockerfiles/work/Dockerfile-7.0
@@ -58,8 +58,6 @@ RUN set -eux \
 	&& echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
-	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
 	\
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -98,7 +96,9 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 		mysql-client \
+		\
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -107,7 +107,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-#		postgresql-client \
 		redis-tools \
 		rsync \
 		rubygems \
@@ -131,23 +130,9 @@ RUN set -eux \
 		zsh-common \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
-
-
-###
-### Instal Architecture Dependent software
-###
-#RUN set -eux \
-#	&& if [ "${ARCH}" = "linux/amd64" ]; then \
-#		DEBIAN_FRONTEND=noninteractive apt-get update \
-#		&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
-#			mongodb-org-shell \
-#			mongodb-org-tools; \
-#	fi \
-#	&& DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-#	&& rm -rf /var/lib/apt/lists/*
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -202,6 +187,33 @@ RUN set -eux \
 && su  -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
  \
 	\
+# -------------------- pgsql_client --------------------
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+  && echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+  && apt-get update; \
+fi \
+ \
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    postgresql-client; \
+fi \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+# -------------------- mongo_client --------------------
+	&& apt-get update \
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    mongodb-clients \
+    mongo-tools; \
+else \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    mongodb-clients; \
+fi \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
 # -------------------- awesomeci --------------------
 	&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
 && cd /usr/local/src/awesome-ci \
@@ -462,9 +474,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -559,7 +571,7 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -614,9 +626,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -668,9 +680,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -720,6 +732,22 @@ RUN set -eux \
 	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
 	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
 && su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+ \
+	&& if echo '7.0' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  pg_isready --version; \
+  fi \
+else \
+  pg_isready --version; \
+fi \
+ \
+	&& if echo '7.0' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+    mongofiles --version; \
+  fi \
+else \
+  mongofiles --version; \
+fi \
  \
 	&& regex-grep --version | grep -E '[0-9][.0-9]+' \
 	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1
index 86a8eead..539fd3af 100644
--- a/Dockerfiles/work/Dockerfile-7.1
+++ b/Dockerfiles/work/Dockerfile-7.1
@@ -55,11 +55,9 @@ RUN set -eux \
 		gnupg \
 		\
 	&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 \
-	&& echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list \
+	&& echo "deb http://ftp.debian.org/debian buster-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
-	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
 	\
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -98,7 +96,9 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 		mariadb-client \
+		\
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -107,7 +107,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-#		postgresql-client \
 		redis-tools \
 		rsync \
 		rubygems \
@@ -130,23 +129,9 @@ RUN set -eux \
 		zsh \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
-
-
-###
-### Instal Architecture Dependent software
-###
-#RUN set -eux \
-#	&& if [ "${ARCH}" = "linux/amd64" ]; then \
-#		DEBIAN_FRONTEND=noninteractive apt-get update \
-#		&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
-#			mongodb-org-shell \
-#			mongodb-org-tools; \
-#	fi \
-#	&& DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-#	&& rm -rf /var/lib/apt/lists/*
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -201,6 +186,27 @@ RUN set -eux \
 && su  -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
  \
 	\
+# -------------------- pgsql_client --------------------
+	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+&& echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  postgresql-client \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+# -------------------- mongo_client --------------------
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \
+&& echo "deb http://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.4 multiverse" > /etc/apt/sources.list.d/mongo.list \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  mongodb-org-tools \
+  mongodb-org-shell \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
 # -------------------- awesomeci --------------------
 	&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
 && cd /usr/local/src/awesome-ci \
@@ -461,9 +467,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -558,7 +564,7 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -613,9 +619,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -667,9 +673,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -719,6 +725,22 @@ RUN set -eux \
 	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
 	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
 && su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+ \
+	&& if echo '7.1' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  pg_isready --version; \
+  fi \
+else \
+  pg_isready --version; \
+fi \
+ \
+	&& if echo '7.1' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+    mongofiles --version; \
+  fi \
+else \
+  mongofiles --version; \
+fi \
  \
 	&& regex-grep --version | grep -E '[0-9][.0-9]+' \
 	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2
index ef0c686f..a0667b77 100644
--- a/Dockerfiles/work/Dockerfile-7.2
+++ b/Dockerfiles/work/Dockerfile-7.2
@@ -55,11 +55,9 @@ RUN set -eux \
 		gnupg \
 		\
 	&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 \
-	&& echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list \
+	&& echo "deb http://ftp.debian.org/debian buster-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
-	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main" > /etc/apt/sources.list.d/git.list \
 	\
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -98,7 +96,9 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 		mariadb-client \
+		\
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -107,7 +107,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-#		postgresql-client \
 		redis-tools \
 		rsync \
 		rubygems \
@@ -130,23 +129,9 @@ RUN set -eux \
 		zsh \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
-
-
-###
-### Instal Architecture Dependent software
-###
-#RUN set -eux \
-#	&& if [ "${ARCH}" = "linux/amd64" ]; then \
-#		DEBIAN_FRONTEND=noninteractive apt-get update \
-#		&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
-#			mongodb-org-shell \
-#			mongodb-org-tools; \
-#	fi \
-#	&& DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-#	&& rm -rf /var/lib/apt/lists/*
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -201,6 +186,27 @@ RUN set -eux \
 && su  -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
  \
 	\
+# -------------------- pgsql_client --------------------
+	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+&& echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  postgresql-client \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+# -------------------- mongo_client --------------------
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \
+&& echo "deb http://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.4 multiverse" > /etc/apt/sources.list.d/mongo.list \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  mongodb-org-tools \
+  mongodb-org-shell \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
 # -------------------- awesomeci --------------------
 	&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
 && cd /usr/local/src/awesome-ci \
@@ -481,9 +487,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -578,7 +584,7 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -633,9 +639,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -687,9 +693,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -739,6 +745,22 @@ RUN set -eux \
 	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
 	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
 && su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+ \
+	&& if echo '7.2' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  pg_isready --version; \
+  fi \
+else \
+  pg_isready --version; \
+fi \
+ \
+	&& if echo '7.2' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+    mongofiles --version; \
+  fi \
+else \
+  mongofiles --version; \
+fi \
  \
 	&& regex-grep --version | grep -E '[0-9][.0-9]+' \
 	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3
index c2a89713..29472098 100644
--- a/Dockerfiles/work/Dockerfile-7.3
+++ b/Dockerfiles/work/Dockerfile-7.3
@@ -55,11 +55,9 @@ RUN set -eux \
 		gnupg \
 		\
 	&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 \
-	&& echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list \
+	&& echo "deb http://ftp.debian.org/debian bullseye-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
-	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main" > /etc/apt/sources.list.d/git.list \
 	\
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -98,7 +96,9 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 		mariadb-client \
+		\
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -107,7 +107,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-#		postgresql-client \
 		redis-tools \
 		rsync \
 		rubygems \
@@ -130,23 +129,9 @@ RUN set -eux \
 		zsh \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
-
-
-###
-### Instal Architecture Dependent software
-###
-#RUN set -eux \
-#	&& if [ "${ARCH}" = "linux/amd64" ]; then \
-#		DEBIAN_FRONTEND=noninteractive apt-get update \
-#		&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
-#			mongodb-org-shell \
-#			mongodb-org-tools; \
-#	fi \
-#	&& DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-#	&& rm -rf /var/lib/apt/lists/*
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -202,6 +187,27 @@ RUN set -eux \
 && su  -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
  \
 	\
+# -------------------- pgsql_client --------------------
+	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+&& echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  postgresql-client \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+# -------------------- mongo_client --------------------
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \
+&& echo "deb http://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" > /etc/apt/sources.list.d/mongo.list \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  mongodb-org-tools \
+  mongodb-org-shell \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
 # -------------------- awesomeci --------------------
 	&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
 && cd /usr/local/src/awesome-ci \
@@ -482,9 +488,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -579,7 +585,7 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -634,9 +640,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -688,9 +694,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -740,6 +746,22 @@ RUN set -eux \
 	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
 	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
 && su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+ \
+	&& if echo '7.3' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  pg_isready --version; \
+  fi \
+else \
+  pg_isready --version; \
+fi \
+ \
+	&& if echo '7.3' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+    mongofiles --version; \
+  fi \
+else \
+  mongofiles --version; \
+fi \
  \
 	&& regex-grep --version | grep -E '[0-9][.0-9]+' \
 	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4
index b3f7f584..c06b77b5 100644
--- a/Dockerfiles/work/Dockerfile-7.4
+++ b/Dockerfiles/work/Dockerfile-7.4
@@ -55,11 +55,9 @@ RUN set -eux \
 		gnupg \
 		\
 	&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 \
-	&& echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list \
+	&& echo "deb http://ftp.debian.org/debian bullseye-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
-	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main" > /etc/apt/sources.list.d/git.list \
 	\
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -98,7 +96,9 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 		mariadb-client \
+		\
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -107,7 +107,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-#		postgresql-client \
 		redis-tools \
 		rsync \
 		rubygems \
@@ -130,23 +129,9 @@ RUN set -eux \
 		zsh \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
-
-
-###
-### Instal Architecture Dependent software
-###
-#RUN set -eux \
-#	&& if [ "${ARCH}" = "linux/amd64" ]; then \
-#		DEBIAN_FRONTEND=noninteractive apt-get update \
-#		&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
-#			mongodb-org-shell \
-#			mongodb-org-tools; \
-#	fi \
-#	&& DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-#	&& rm -rf /var/lib/apt/lists/*
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -202,6 +187,27 @@ RUN set -eux \
 && su  -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
  \
 	\
+# -------------------- pgsql_client --------------------
+	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+&& echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  postgresql-client \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+# -------------------- mongo_client --------------------
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \
+&& echo "deb http://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" > /etc/apt/sources.list.d/mongo.list \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  mongodb-org-tools \
+  mongodb-org-shell \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
 # -------------------- awesomeci --------------------
 	&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
 && cd /usr/local/src/awesome-ci \
@@ -482,9 +488,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -579,7 +585,7 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -634,9 +640,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -688,9 +694,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -740,6 +746,22 @@ RUN set -eux \
 	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
 	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
 && su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+ \
+	&& if echo '7.4' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  pg_isready --version; \
+  fi \
+else \
+  pg_isready --version; \
+fi \
+ \
+	&& if echo '7.4' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+    mongofiles --version; \
+  fi \
+else \
+  mongofiles --version; \
+fi \
  \
 	&& regex-grep --version | grep -E '[0-9][.0-9]+' \
 	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0
index f7aaefb9..8b059cb7 100644
--- a/Dockerfiles/work/Dockerfile-8.0
+++ b/Dockerfiles/work/Dockerfile-8.0
@@ -55,11 +55,9 @@ RUN set -eux \
 		gnupg \
 		\
 	&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 \
-	&& echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list \
+	&& echo "deb http://ftp.debian.org/debian bullseye-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
-	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main" > /etc/apt/sources.list.d/git.list \
 	\
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -98,7 +96,9 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 		mariadb-client \
+		\
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -107,7 +107,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-#		postgresql-client \
 		redis-tools \
 		rsync \
 		rubygems \
@@ -130,23 +129,9 @@ RUN set -eux \
 		zsh \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
-
-
-###
-### Instal Architecture Dependent software
-###
-#RUN set -eux \
-#	&& if [ "${ARCH}" = "linux/amd64" ]; then \
-#		DEBIAN_FRONTEND=noninteractive apt-get update \
-#		&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
-#			mongodb-org-shell \
-#			mongodb-org-tools; \
-#	fi \
-#	&& DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-#	&& rm -rf /var/lib/apt/lists/*
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -202,6 +187,27 @@ RUN set -eux \
 && su  -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
  \
 	\
+# -------------------- pgsql_client --------------------
+	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+&& echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  postgresql-client \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+# -------------------- mongo_client --------------------
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \
+&& echo "deb http://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" > /etc/apt/sources.list.d/mongo.list \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  mongodb-org-tools \
+  mongodb-org-shell \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
 # -------------------- awesomeci --------------------
 	&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
 && cd /usr/local/src/awesome-ci \
@@ -401,9 +407,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -498,7 +504,7 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -553,9 +559,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -607,9 +613,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -659,6 +665,22 @@ RUN set -eux \
 	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
 	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
 && su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+ \
+	&& if echo '8.0' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  pg_isready --version; \
+  fi \
+else \
+  pg_isready --version; \
+fi \
+ \
+	&& if echo '8.0' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+    mongofiles --version; \
+  fi \
+else \
+  mongofiles --version; \
+fi \
  \
 	&& regex-grep --version | grep -E '[0-9][.0-9]+' \
 	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
diff --git a/Dockerfiles/work/Dockerfile-8.1 b/Dockerfiles/work/Dockerfile-8.1
index 26c7c9f1..f97c5583 100644
--- a/Dockerfiles/work/Dockerfile-8.1
+++ b/Dockerfiles/work/Dockerfile-8.1
@@ -55,11 +55,9 @@ RUN set -eux \
 		gnupg \
 		\
 	&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 \
-	&& echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list \
+	&& echo "deb http://ftp.debian.org/debian bullseye-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
-	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main" > /etc/apt/sources.list.d/git.list \
 	\
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -98,7 +96,9 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 		mariadb-client \
+		\
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -107,7 +107,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-#		postgresql-client \
 		redis-tools \
 		rsync \
 		rubygems \
@@ -130,23 +129,9 @@ RUN set -eux \
 		zsh \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
-
-
-###
-### Instal Architecture Dependent software
-###
-#RUN set -eux \
-#	&& if [ "${ARCH}" = "linux/amd64" ]; then \
-#		DEBIAN_FRONTEND=noninteractive apt-get update \
-#		&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
-#			mongodb-org-shell \
-#			mongodb-org-tools; \
-#	fi \
-#	&& DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-#	&& rm -rf /var/lib/apt/lists/*
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -202,6 +187,27 @@ RUN set -eux \
 && su  -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
  \
 	\
+# -------------------- pgsql_client --------------------
+	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+&& echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  postgresql-client \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+# -------------------- mongo_client --------------------
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \
+&& echo "deb http://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" > /etc/apt/sources.list.d/mongo.list \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  mongodb-org-tools \
+  mongodb-org-shell \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
 # -------------------- awesomeci --------------------
 	&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
 && cd /usr/local/src/awesome-ci \
@@ -401,9 +407,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -498,7 +504,7 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -553,9 +559,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -607,9 +613,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -659,6 +665,22 @@ RUN set -eux \
 	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
 	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
 && su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+ \
+	&& if echo '8.1' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  pg_isready --version; \
+  fi \
+else \
+  pg_isready --version; \
+fi \
+ \
+	&& if echo '8.1' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+    mongofiles --version; \
+  fi \
+else \
+  mongofiles --version; \
+fi \
  \
 	&& regex-grep --version | grep -E '[0-9][.0-9]+' \
 	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
diff --git a/Dockerfiles/work/Dockerfile-8.2 b/Dockerfiles/work/Dockerfile-8.2
index be9df10a..7046938a 100644
--- a/Dockerfiles/work/Dockerfile-8.2
+++ b/Dockerfiles/work/Dockerfile-8.2
@@ -55,11 +55,9 @@ RUN set -eux \
 		gnupg \
 		\
 	&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 \
-	&& echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list \
+	&& echo "deb http://ftp.debian.org/debian bullseye-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
-	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main" > /etc/apt/sources.list.d/git.list \
 	\
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -98,7 +96,9 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 		mariadb-client \
+		\
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -107,7 +107,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-#		postgresql-client \
 		redis-tools \
 		rsync \
 		rubygems \
@@ -130,23 +129,9 @@ RUN set -eux \
 		zsh \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
-
-
-###
-### Instal Architecture Dependent software
-###
-#RUN set -eux \
-#	&& if [ "${ARCH}" = "linux/amd64" ]; then \
-#		DEBIAN_FRONTEND=noninteractive apt-get update \
-#		&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
-#			mongodb-org-shell \
-#			mongodb-org-tools; \
-#	fi \
-#	&& DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-#	&& rm -rf /var/lib/apt/lists/*
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -202,6 +187,27 @@ RUN set -eux \
 && su  -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
  \
 	\
+# -------------------- pgsql_client --------------------
+	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+&& echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  postgresql-client \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+# -------------------- mongo_client --------------------
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \
+&& echo "deb http://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" > /etc/apt/sources.list.d/mongo.list \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  mongodb-org-tools \
+  mongodb-org-shell \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
 # -------------------- awesomeci --------------------
 	&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
 && cd /usr/local/src/awesome-ci \
@@ -385,9 +391,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -482,7 +488,7 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /opt/nvm -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -537,9 +543,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -591,9 +597,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -643,6 +649,22 @@ RUN set -eux \
 	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
 	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
 && su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+ \
+	&& if echo '8.2' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  pg_isready --version; \
+  fi \
+else \
+  pg_isready --version; \
+fi \
+ \
+	&& if echo '8.2' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+    mongofiles --version; \
+  fi \
+else \
+  mongofiles --version; \
+fi \
  \
 	&& regex-grep --version | grep -E '[0-9][.0-9]+' \
 	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
diff --git a/Makefile b/Makefile
index 0c9b2fcc..24b9d081 100644
--- a/Makefile
+++ b/Makefile
@@ -123,6 +123,9 @@ EXT_DIR=$$( docker run --rm --platform $(ARCH) --entrypoint=php $(IMAGE):$(BASE_
 )
 endif
 
+# Use Buldkit for building
+export DOCKER_BUILDKIT=1
+
 .PHONY: build
 build: check-stage-is-set
 build: check-parent-image-exists
diff --git a/build/ansible/DOCKERFILES/Dockerfile-mods.j2 b/build/ansible/DOCKERFILES/Dockerfile-mods.j2
index a0abf7f9..ad90902e 100644
--- a/build/ansible/DOCKERFILES/Dockerfile-mods.j2
+++ b/build/ansible/DOCKERFILES/Dockerfile-mods.j2
@@ -312,9 +312,9 @@ RUN set -eux \
 
 # Shrink everything down
 RUN set -eux \
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 
diff --git a/build/ansible/DOCKERFILES/Dockerfile-prod.j2 b/build/ansible/DOCKERFILES/Dockerfile-prod.j2
index c04b340b..318d6e60 100644
--- a/build/ansible/DOCKERFILES/Dockerfile-prod.j2
+++ b/build/ansible/DOCKERFILES/Dockerfile-prod.j2
@@ -47,9 +47,9 @@ RUN set -eux \
 	&& mkdir -p /etc/supervisor/custom.d \
 	&& chown devilbox:devilbox /etc/supervisor/custom.d \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 {% if debug %}
diff --git a/build/ansible/DOCKERFILES/Dockerfile-work.j2 b/build/ansible/DOCKERFILES/Dockerfile-work.j2
index c4fdb91e..d4231b06 100644
--- a/build/ansible/DOCKERFILES/Dockerfile-work.j2
+++ b/build/ansible/DOCKERFILES/Dockerfile-work.j2
@@ -119,11 +119,13 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 {% if php_version in [7.1, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2] %}
 		mariadb-client \
 {% else %}
 		mysql-client \
 {% endif %}
+		\
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -132,7 +134,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-#		postgresql-client \
 		redis-tools \
 		rsync \
 		rubygems \
@@ -158,23 +159,9 @@ RUN set -eux \
 {% endif %}
 	&& rm -rf /var/lib/apt/lists/* \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
-
-
-###
-### Instal Architecture Dependent software
-###
-#RUN set -eux \
-#	&& if [ "${ARCH}" = "linux/amd64" ]; then \
-#		DEBIAN_FRONTEND=noninteractive apt-get update \
-#		&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
-#			mongodb-org-shell \
-#			mongodb-org-tools; \
-#	fi \
-#	&& DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-#	&& rm -rf /var/lib/apt/lists/*
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -300,9 +287,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -365,7 +352,7 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find {{ nvm_home }} -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find {{ nvm_home }} -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -421,9 +408,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
@@ -479,9 +466,9 @@ RUN set -eux \
 	&& (rm -rf /tmp/*  || true) \
 	&& (rm -rf /tmp/.* || true) \
 	\
-	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
 
 
 ###
diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml
index cea0d731..59dcb8b4 100644
--- a/build/ansible/group_vars/all/work.yml
+++ b/build/ansible/group_vars/all/work.yml
@@ -8,6 +8,58 @@
 #
 
 
+###
+### Define operating system versions
+###
+os_release:
+  # Jessie (Ubuntu: trusty, utopic, vivid, wily)
+  5.2:
+    debian: jessie
+    ubuntu: trusty
+  5.3:
+    debian: jessie
+    ubuntu: trusty
+  5.4:
+    debian: jessie
+    ubuntu: trusty
+  5.5:
+    debian: jessie
+    ubuntu: trusty
+  # Strech (Ubuntu: xenial, yakkety, zesty, artful)
+  5.6:
+    debian: stretch
+    ubuntu: xenial
+  7.0:
+    debian: stretch
+    ubuntu: xenial
+  # Buster (Ubuntu: bionic, cosmic, disco, eoan)
+  7.1:
+    debian: buster
+    ubuntu: bionic
+  7.2:
+    debian: buster
+    ubuntu: bionic
+  # Bullseye (Ubuntu: focal, groovy, hirsute, impish)
+  7.3:
+    debian: bullseye
+    ubuntu: focal
+  7.4:
+    debian: bullseye
+    ubuntu: focal
+  8.0:
+    debian: bullseye
+    ubuntu: focal
+  8.1:
+    debian: bullseye
+    ubuntu: focal
+  8.2:
+    debian: bullseye
+    ubuntu: focal
+  all:
+    debian: bullseye
+    ubuntu: focal
+
+
 # -------------------------------------------------------------------------------------------------
 # Global variables
 # -------------------------------------------------------------------------------------------------
@@ -40,7 +92,7 @@ directory_to_clean:
 apt_repositories_enabled:
   - backports
   - blackfire
-  - git
+  #- git
   #- mongo
   #- pgsql
 
@@ -104,6 +156,9 @@ software_enabled:
   - composer
   - pip
   - nvm
+  # Required for internal Devilbox connection
+  - pgsql_client
+  - mongo_client
   # Normal packages start here
   - awesomeci
   - deployer
@@ -142,85 +197,153 @@ software_enabled:
 #   pre:       [optional] Run custom command to add gpg key for repository
 #
 apt_repositories_available:
+  ###
+  ### Backports
+  ###
   backports:
+    # [Jessie]
     5.2:
       pre: echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until
-      deb: deb http://archive.debian.org/debian jessie-backports main
+      deb: deb http://archive.debian.org/debian {{ os_release[5.2].debian }}-backports main
+    # [Jessie]
     5.3:
       pre: echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until
-      deb: deb http://archive.debian.org/debian jessie-backports main
+      deb: deb http://archive.debian.org/debian {{ os_release[5.3].debian }}-backports main
+    # [Jessie]
     5.4:
       pre: echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until
-      deb: deb http://archive.debian.org/debian jessie-backports main
+      deb: deb http://archive.debian.org/debian {{ os_release[5.4].debian }}-backports main
+    # [Jessie]
     5.5:
       pre: echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until
-      deb: deb http://archive.debian.org/debian jessie-backports main
+      deb: deb http://archive.debian.org/debian {{ os_release[5.5].debian }}-backports main
+    # [Stretch]
+    5.6:
+      pre: apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138
+      deb: deb http://ftp.debian.org/debian {{ os_release[5.6].debian }}-backports main
+    # [Stretch]
+    7.0:
+      pre: apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138
+      deb: deb http://ftp.debian.org/debian {{ os_release[7.0].debian }}-backports main
+    # [Buster]
+    7.1:
+      pre: apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138
+      deb: deb http://ftp.debian.org/debian {{ os_release[7.1].debian }}-backports main
+    # [Buster]
+    7.2:
+      pre: apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138
+      deb: deb http://ftp.debian.org/debian {{ os_release[7.2].debian }}-backports main
+    # [Bullseye]
     all:
       pre: apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138
-      deb: deb http://ftp.debian.org/debian stretch-backports main
+      deb: deb http://ftp.debian.org/debian {{ os_release['all'].debian }}-backports main
+  ###
+  ### Blackfire
+  ###
   blackfire:
     all:
       deb: deb http://packages.blackfire.io/debian any main
       pre: curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
+  ###
+  ### Git (currently obsolete)
+  ###
   git:
+    5.2:
+      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu {{ os_release[5.2].ubuntu }} main
+    5.3:
+      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu {{ os_release[5.3].ubuntu }} main
+    5.4:
+      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu {{ os_release[5.4].ubuntu }} main
+    5.5:
+      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu {{ os_release[5.5].ubuntu }} main
+    5.6:
+      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu {{ os_release[5.6].ubuntu }} main
+    7.0:
+      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu {{ os_release[7.0].ubuntu }} main
+    7.1:
+      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu {{ os_release[7.1].ubuntu }} main
     7.2:
-      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main
+      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu {{ os_release[7.2].ubuntu }} main
     7.3:
-      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main
+      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu {{ os_release[7.3].ubuntu }} main
     7.4:
-      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main
+      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu {{ os_release[7.4].ubuntu }} main
     8.0:
-      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main
+      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu {{ os_release[8.0].ubuntu }} main
     8.1:
-      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main
+      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu {{ os_release[8.1].ubuntu }} main
     8.2:
-      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main
+      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu {{ os_release[8.2].ubuntu }} main
     all:
-      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main
       key: A1715D88E1DF1F24
-  # Get keys
-  # gpg --dry-run --with-fingerprint < <(curl https://www.mongodb.org/static/pgp/server-3.6.asc) | grep fingerprint | sed 's/.*=//g' | sed 's/ //g'
+  ###
+  ### MongoDB (currently obsolete)
+  ###
   mongo:
-    5.2:
-      # gpg --dry-run --with-fingerprint < <(curl https://www.mongodb.org/static/pgp/server-3.6.asc) | grep fingerprint | sed 's/.*=//g' | sed 's/ //g'
-      deb: deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main
-      key: 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5
-    5.3:
-      deb: deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main
-      key: 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5
-    5.4:
-      deb: deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main
-      key: 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5
-    5.5:
-      deb: deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main
-      key: 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5
+    # 5.2: mongodb-clients (amd64)
+    # 5.3: mongodb-clients (amd64)
+    # 5.4: mongodb-clients (amd64)
+    # 5.5: mongodb-clients (amd64)
+    # 5.6: mongodb-clients & mongo-tools (amd64, arm64)
+    # 7.0: mongodb-clients & mongo-tools (amd64, arm64)
+    # 7.1: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
+    # 7.2: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
+    # 7.3: mongodb-org-(tools|shell) (amd64, arm64)
+    # 7.4: mongodb-org-(tools|shell) (amd64, arm64)
+    # 8.0: mongodb-org-(tools|shell) (amd64, arm64)
+    # 8.1: mongodb-org-(tools|shell) (amd64, arm64)
+    # 8.2: mongodb-org-(tools|shell) (amd64, arm64)
+    disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0]
+    # [Buster] Ubuntu repository required for arm64 support instead
+    7.1:
+      # gpg --dry-run --with-fingerprint < <(curl https://www.mongodb.org/static/pgp/server-4.4.asc) | grep fingerprint | sed 's/.*=//g' | sed 's/ //g'
+      deb: deb http://repo.mongodb.org/apt/ubuntu {{ os_release[7.1].ubuntu }}/mongodb-org/4.4 multiverse
+      key: 20691EEC35216C63CAF66CE1656408E390CFB1F5
+    # [Buster] Ubuntu repository required for arm64 support instead
+    7.2:
+      # gpg --dry-run --with-fingerprint < <(curl https://www.mongodb.org/static/pgp/server-4.4.asc) | grep fingerprint | sed 's/.*=//g' | sed 's/ //g'
+      deb: deb http://repo.mongodb.org/apt/ubuntu {{ os_release[7.2].ubuntu }}/mongodb-org/4.4 multiverse
+      key: 20691EEC35216C63CAF66CE1656408E390CFB1F5
+    # [Bullseye] Ubuntu repository required for arm64 support instead
     all:
-      # gpg --dry-run --with-fingerprint < <(curl https://www.mongodb.org/static/pgp/server-4.0.asc) | grep fingerprint | sed 's/.*=//g' | sed 's/ //g'
-      deb: deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main
-      key: 9DA31620334BD75D9DCB49F368818C72E52529D4
+      # gpg --dry-run --with-fingerprint < <(curl https://www.mongodb.org/static/pgp/server-4.4.asc) | grep fingerprint | sed 's/.*=//g' | sed 's/ //g'
+      deb: deb http://repo.mongodb.org/apt/ubuntu {{ os_release['all'].ubuntu }}/mongodb-org/4.4 multiverse
+      key: 20691EEC35216C63CAF66CE1656408E390CFB1F5
+  ###
+  ### PostgrSQL (currently obsolete)
+  ###
   pgsql:
+    # [Jessie]
     5.2:
-      deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main
+      deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ {{ os_release[5.2].debian }}-pgdg main
+    # [Jessie]
     5.3:
-      deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main
+      deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ {{ os_release[5.3].debian }}-pgdg main
+    # [Jessie]
     5.4:
-      deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main
+      deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ {{ os_release[5.4].debian }}-pgdg main
+    # [Jessie]
     5.5:
-      deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main
+      deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ {{ os_release[5.5].debian }}-pgdg main
+    # [Stretch]
     5.6:
-      deb: deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main
+      deb: deb http://apt.postgresql.org/pub/repos/apt/ {{ os_release[5.6].debian }}-pgdg main
       pre: curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
+    # [Stretch]
     7.0:
-      deb: deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main
+      deb: deb http://apt.postgresql.org/pub/repos/apt/ {{ os_release[7.0].debian }}-pgdg main
       pre: curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
+    # [Buster]
     7.1:
-      deb: deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main
+      deb: deb http://apt.postgresql.org/pub/repos/apt/ {{ os_release[7.1].debian }}-pgdg main
       pre: curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
+    # [Buster]
     7.2:
-      deb: deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main
+      deb: deb http://apt.postgresql.org/pub/repos/apt/ {{ os_release[7.2].debian }}-pgdg main
       pre: curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
+    # [Bullseye]
     all:
-      deb: deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main
+      deb: deb http://apt.postgresql.org/pub/repos/apt/ {{ os_release['all'].debian }}-pgdg main
       pre: curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
 
 
@@ -583,6 +706,197 @@ software_available:
         su  -c '. {{ nvm_home }}/nvm.sh; nvm install {{ node_version }}' devilbox \
         && su  -c '. {{ nvm_home }}/nvm.sh; nvm use {{ node_version }}' devilbox \
         && su  -c '. {{ nvm_home }}/nvm.sh; corepack enable' devilbox \
+  ###
+  ### PostgrSQL Command line client
+  ###
+  # 5.2: (amd64)
+  # 5.3: (amd64)
+  # 5.4: (amd64)
+  # 5.5: (amd64)
+  # 5.6: (amd64)
+  # 7.0: (amd64)
+  # 7.1: (amd64, arm64)
+  # 7.2: (amd64, arm64)
+  # 7.3: (amd64, arm64)
+  # 7.4: (amd64, arm64)
+  # 8.0: (amd64, arm64)
+  # 8.1: (amd64, arm64)
+  # 8.2: (amd64, arm64)
+  pgsql_client:
+    check: |
+      if echo '{{ php_version }}' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+        pg_isready --version; \
+        fi \
+      else \
+        pg_isready --version; \
+      fi \
+    5.2:
+      pre: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+          && echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ {{ os_release[php_version].debian }}-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+          && apt-get update; \
+        fi \
+      command: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            postgresql-client; \
+        fi \
+    5.3:
+      pre: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+          && echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ {{ os_release[php_version].debian }}-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+          && apt-get update; \
+        fi \
+      command: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            postgresql-client; \
+        fi \
+    5.4:
+      pre: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+          && echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ {{ os_release[php_version].debian }}-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+          && apt-get update; \
+        fi \
+      command: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            postgresql-client; \
+        fi \
+    5.5:
+      pre: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+          && echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ {{ os_release[php_version].debian }}-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+          && apt-get update; \
+        fi \
+      command: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            postgresql-client; \
+        fi \
+    5.6:
+      pre: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+          && echo "deb http://apt.postgresql.org/pub/repos/apt/ {{ os_release[php_version].debian }}-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+          && apt-get update; \
+        fi \
+      command: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            postgresql-client; \
+        fi \
+    7.0:
+      pre: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+          && echo "deb http://apt.postgresql.org/pub/repos/apt/ {{ os_release[php_version].debian }}-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+          && apt-get update; \
+        fi \
+      command: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            postgresql-client; \
+        fi \
+    all:
+      pre: |
+        curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+        && echo "deb http://apt.postgresql.org/pub/repos/apt/ {{ os_release[php_version].debian }}-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+        && apt-get update \
+      command: |
+        apt-get install -y --no-install-recommends --no-install-suggests \
+          postgresql-client \
+      post: rm -rf /var/lib/apt/lists/*
+  ###
+  ### MongoDB Command line client
+  ###
+  # 5.2: mongodb-clients (amd64)
+  # 5.3: mongodb-clients (amd64)
+  # 5.4: mongodb-clients (amd64)
+  # 5.5: mongodb-clients (amd64)
+  # 5.6: mongodb-clients & mongo-tools (amd64, arm64)
+  # 7.0: mongodb-clients & mongo-tools (amd64, arm64)
+  # 7.1: mongodb-org-(tools|shell) (amd64, arm64)
+  # 7.2: mongodb-org-(tools|shell) (amd64, arm64)
+  # 7.3: mongodb-org-(tools|shell) (amd64, arm64)
+  # 7.4: mongodb-org-(tools|shell) (amd64, arm64)
+  # 8.0: mongodb-org-(tools|shell) (amd64, arm64)
+  # 8.1: mongodb-org-(tools|shell) (amd64, arm64)
+  # 8.2: mongodb-org-(tools|shell) (amd64, arm64)
+  mongo_client:
+    check: |
+      if echo '{{ php_version }}' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          mongofiles --version; \
+        fi \
+      else \
+        mongofiles --version; \
+      fi \
+    5.2:
+      pre: apt-get update
+      command: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            mongodb-clients; \
+        fi \
+    5.3:
+      pre: apt-get update
+      command: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            mongodb-clients; \
+        fi \
+    5.4:
+      pre: apt-get update
+      command: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            mongodb-clients; \
+        fi \
+    5.5:
+      pre: apt-get update
+      command: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            mongodb-clients; \
+        fi \
+    5.6:
+      pre: apt-get update
+      command: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            mongodb-clients \
+            mongo-tools; \
+        else \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            mongodb-clients; \
+        fi \
+    7.0:
+      pre: apt-get update
+      command: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            mongodb-clients \
+            mongo-tools; \
+        else \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            mongodb-clients; \
+        fi \
+    all:
+      pre: |
+        APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \
+        && echo "deb http://repo.mongodb.org/apt/ubuntu {{ os_release[php_version].ubuntu }}/mongodb-org/4.4 multiverse" > /etc/apt/sources.list.d/mongo.list \
+        && apt-get update \
+      command: |
+        apt-get install -y --no-install-recommends --no-install-suggests \
+          mongodb-org-tools \
+          mongodb-org-shell \
+      post: rm -rf /var/lib/apt/lists/*
   awesomeci:
     check: regex-grep --version | grep -E '[0-9][.0-9]+'
     all: