diff --git a/scripts/centos8/pEpEngine.centos8.Dockerfile b/scripts/centos8/pEpEngine.centos8.Dockerfile
index e70d669f..856e04d9 100644
--- a/scripts/centos8/pEpEngine.centos8.Dockerfile
+++ b/scripts/centos8/pEpEngine.centos8.Dockerfile
@@ -27,13 +27,13 @@ ARG CURRENT_DISTRO
 ### Build pEpEngine dependencies
 USER pep-builder
 
-RUN sh ./scripts/${CURRENT_DISTRO}/build_pEpEngine_deps.sh
+RUN sh ./scripts/common/build_pEpEngine_deps.sh
 
 ### Build pEpEngine
-RUN sh ./scripts/${CURRENT_DISTRO}/build_pEpEngine.sh
+RUN sh ./scripts/common/build_pEpEngine.sh
 
 ### Install Systemdb
 USER root
 
-RUN sh ./scripts/${CURRENT_DISTRO}/install_pEpEngine_systemdb.sh && \
+RUN sh ./scripts/common/install_pEpEngine_systemdb.sh && \
     rm -rf ${BUILDROOT}/*
diff --git a/scripts/centos8/build_pEpEngine.sh b/scripts/common/build_pEpEngine.sh
similarity index 100%
rename from scripts/centos8/build_pEpEngine.sh
rename to scripts/common/build_pEpEngine.sh
diff --git a/scripts/centos8/build_pEpEngine_deps.sh b/scripts/common/build_pEpEngine_deps.sh
similarity index 100%
rename from scripts/centos8/build_pEpEngine_deps.sh
rename to scripts/common/build_pEpEngine_deps.sh
diff --git a/scripts/centos8/install_pEpEngine_systemdb.sh b/scripts/common/install_pEpEngine_systemdb.sh
similarity index 100%
rename from scripts/centos8/install_pEpEngine_systemdb.sh
rename to scripts/common/install_pEpEngine_systemdb.sh
diff --git a/scripts/debian10/build_pEpEngine.sh b/scripts/debian10/build_pEpEngine.sh
deleted file mode 100755
index 8a5b116e..00000000
--- a/scripts/debian10/build_pEpEngine.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env sh
-set -exo
-
-export LC_ALL=en_US.UTF-8
-
-cat >local.conf <<__LOCAL__
-PREFIX=${INSTPREFIX}
-SQLITE3_FROM_OS=""
-PER_MACHINE_DIRECTORY=${PEP_MACHINE_DIR}
-YML2_PATH=${INSTPREFIX}/yml2
-YML2_PROC=${INSTPREFIX}/yml2/yml2proc
-ETPAN_LIB=-L${INSTPREFIX}/libetpan/lib
-ETPAN_INC=-I${INSTPREFIX}/libetpan/include
-ASN1C=${INSTPREFIX}/asn1c/bin/asn1c
-ASN1C_INC=-I${INSTPREFIX}/asn1c/share/asn1c
-OPENPGP=SEQUOIA
-SEQUOIA_LIB=-L${INSTPREFIX}/lib
-SEQUOIA_INC=-I${INSTPREFIX}/include
-LDFLAGS  += -L${INSTPREFIX}/lib -L${INSTPREFIX}/libetpan/lib -L${INSTPREFIX}/pep/lib -nostartfiles
-__LOCAL__
-
-cat local.conf
-
-export PKG_CONFIG_PATH=$INSTPREFIX/share/pkgconfig/
-make all && make db && make install
diff --git a/scripts/debian10/build_pEpEngine_deps.sh b/scripts/debian10/build_pEpEngine_deps.sh
deleted file mode 100755
index 195096d8..00000000
--- a/scripts/debian10/build_pEpEngine_deps.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env sh
-set -exo
-
-### YML2
-cd $INSTPREFIX
-curl -O "https://gitea.pep.foundation/fdik/yml2/archive/${YML2_VERSION}.tar.gz"
-tar -xf "${YML2_VERSION}.tar.gz"
-rm -f ${YML2_VERSION}.tar*
-
-
-### libetpan
-git clone https://github.com/fdik/libetpan $BUILDROOT/libetpan
-cd $BUILDROOT/libetpan
-test -f configure || NOCONFIGURE=absolutely ./autogen.sh
-./configure --prefix=${INSTPREFIX}/libetpan \
-    --without-openssl --without-gnutls --without-sasl \
-    --without-curl --without-expat --without-zlib \
-    --disable-dependency-tracking
-make -j$(nproc)
-make install
-echo "${libetpan_ver}">${INSTPREFIX}/libetpan.ver
-
-
-### ASN1c
-git clone https://github.com/vlm/asn1c.git $BUILDROOT/asn1c
-cd $BUILDROOT/asn1c
-git checkout tags/v0.9.28 -b pep-engine
-test -f configure || autoreconf -iv
-./configure --prefix=${INSTPREFIX}/asn1c
-make -j$(nproc) && make install
-echo "${asn1c_ver}">${INSTPREFIX}/asn1c.ver
diff --git a/scripts/debian10/install_pEpEngine_systemdb.sh b/scripts/debian10/install_pEpEngine_systemdb.sh
deleted file mode 100755
index 2585e974..00000000
--- a/scripts/debian10/install_pEpEngine_systemdb.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env sh
-set -exo
-
-# Install systemdb (need to be root depending on the path)
-cd $BUILDROOT/pEpEngine
-export LC_ALL=en_US.UTF-8
-export PKG_CONFIG_PATH=$INSTPREFIX/share/pkgconfig/
-echo "Setup DB"
-make -C db install
diff --git a/scripts/debian10/pEpEngine.debian10.Dockerfile b/scripts/debian10/pEpEngine.debian10.Dockerfile
index 54f867cf..088ccd58 100644
--- a/scripts/debian10/pEpEngine.debian10.Dockerfile
+++ b/scripts/debian10/pEpEngine.debian10.Dockerfile
@@ -28,13 +28,13 @@ RUN  apt-get update && apt-get install -y bzip2 && \
 ### Build pEpEngine dependencies
 USER pep-builder
 
-RUN sh ./scripts/${CURRENT_DISTRO}/build_pEpEngine_deps.sh
+RUN sh ./scripts/common/build_pEpEngine_deps.sh
 
 ### Build pEpEngine
-RUN sh ./scripts/${CURRENT_DISTRO}/build_pEpEngine.sh
+RUN sh ./scripts/common/build_pEpEngine.sh
 
 ### Install Systemdb
 USER root
 
-RUN sh ./scripts/${CURRENT_DISTRO}/install_pEpEngine_systemdb.sh && \
+RUN sh ./scripts/common/install_pEpEngine_systemdb.sh && \
     rm -rf ${BUILDROOT}/*