diff --git a/docker/Dockerfile.j2 b/docker/Dockerfile.j2
index 4a60408567761209b14b6c21baa395e416313275..54c3e8b8e929057eca308d631bb371ca86c0e59d 100644
--- a/docker/Dockerfile.j2
+++ b/docker/Dockerfile.j2
@@ -37,7 +37,6 @@ RUN apk add --no-cache --upgrade \
     curl \
     tar
 {% else %}
-
 # Build time options to avoid dpkg warnings and help with reproducible builds.
 ARG DEBIAN_FRONTEND=noninteractive
 ARG LANG=C.UTF-8
@@ -76,14 +75,16 @@ FROM {{ build_stage_base_image }} as build
 {% if "sqlite" in target_file %}
 # set sqlite as default for DB ARG for backward compatibility
 ARG DB=sqlite
+
 {% elif "mysql" in target_file %}
 # set mysql backend
 ARG DB=mysql
+
 {% elif "postgresql" in target_file %}
 # set postgresql backend
 ARG DB=postgresql
-{% endif %}
 
+{% endif %}
 # Build time options to avoid dpkg warnings and help with reproducible builds.
 ARG DEBIAN_FRONTEND=noninteractive
 ARG LANG=C.UTF-8
@@ -244,8 +245,8 @@ ENV SSL_CERT_DIR=/etc/ssl/certs
 
 {% if "amd64" not in target_file %}
 RUN [ "cross-build-start" ]
-{% endif %}
 
+{% endif %}
 # Install needed libraries
 {% if "alpine" in runtime_stage_base_image %}
 RUN apk add --no-cache \
diff --git a/docker/aarch64/mysql/Dockerfile b/docker/aarch64/mysql/Dockerfile
index 5dfac4a5023a719ddb455e4e7af32740b6df63f7..c1bf4ad26aed480900a3c8c194d19fac2c40fd04 100644
--- a/docker/aarch64/mysql/Dockerfile
+++ b/docker/aarch64/mysql/Dockerfile
@@ -8,7 +8,6 @@ ENV VAULT_VERSION "v2.12.0b"
 
 ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz"
 
-
 # Build time options to avoid dpkg warnings and help with reproducible builds.
 ARG DEBIAN_FRONTEND=noninteractive
 ARG LANG=C.UTF-8
diff --git a/docker/aarch64/sqlite/Dockerfile b/docker/aarch64/sqlite/Dockerfile
index fa7cd7d632652c57f69e90345dc100929ff446a4..2424c67bffb494c741e1295fc435e562e5c09976 100644
--- a/docker/aarch64/sqlite/Dockerfile
+++ b/docker/aarch64/sqlite/Dockerfile
@@ -8,7 +8,6 @@ ENV VAULT_VERSION "v2.12.0b"
 
 ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz"
 
-
 # Build time options to avoid dpkg warnings and help with reproducible builds.
 ARG DEBIAN_FRONTEND=noninteractive
 ARG LANG=C.UTF-8
diff --git a/docker/amd64/mysql/Dockerfile b/docker/amd64/mysql/Dockerfile
index d2d304ffbc9507cb83a725d04a1bf5eebc11ed55..4368a374399814fc7041fa22e42e5953cb37557e 100644
--- a/docker/amd64/mysql/Dockerfile
+++ b/docker/amd64/mysql/Dockerfile
@@ -8,7 +8,6 @@ ENV VAULT_VERSION "v2.12.0b"
 
 ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz"
 
-
 # Build time options to avoid dpkg warnings and help with reproducible builds.
 ARG DEBIAN_FRONTEND=noninteractive
 ARG LANG=C.UTF-8
@@ -88,7 +87,6 @@ ENV ROCKET_ENV "staging"
 ENV ROCKET_PORT=80
 ENV ROCKET_WORKERS=10
 
-
 # Install needed libraries
 RUN apt-get update && apt-get install -y \
     --no-install-recommends \
diff --git a/docker/amd64/mysql/Dockerfile.alpine b/docker/amd64/mysql/Dockerfile.alpine
index b20754b2a11a12a4af0a0211f0f41896daa5c807..b09b422aed2169531b2b65bada8e602d04afb57b 100644
--- a/docker/amd64/mysql/Dockerfile.alpine
+++ b/docker/amd64/mysql/Dockerfile.alpine
@@ -82,7 +82,6 @@ ENV ROCKET_PORT=80
 ENV ROCKET_WORKERS=10
 ENV SSL_CERT_DIR=/etc/ssl/certs
 
-
 # Install needed libraries
 RUN apk add --no-cache \
         openssl \
diff --git a/docker/amd64/postgresql/Dockerfile b/docker/amd64/postgresql/Dockerfile
index 532f6fdf7fa90324fbaaecb5be14174a452a168d..0ba087c7603f50213e5d30c071e6375e885d3dbc 100644
--- a/docker/amd64/postgresql/Dockerfile
+++ b/docker/amd64/postgresql/Dockerfile
@@ -8,7 +8,6 @@ ENV VAULT_VERSION "v2.12.0b"
 
 ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz"
 
-
 # Build time options to avoid dpkg warnings and help with reproducible builds.
 ARG DEBIAN_FRONTEND=noninteractive
 ARG LANG=C.UTF-8
@@ -88,7 +87,6 @@ ENV ROCKET_ENV "staging"
 ENV ROCKET_PORT=80
 ENV ROCKET_WORKERS=10
 
-
 # Install needed libraries
 RUN apt-get update && apt-get install -y \
     --no-install-recommends \
diff --git a/docker/amd64/postgresql/Dockerfile.alpine b/docker/amd64/postgresql/Dockerfile.alpine
index cef25d1cb94983f5fb6428d8e17abaed687e9d5a..0a298baa7966c2ea53b94deb04feca8fdafd344e 100644
--- a/docker/amd64/postgresql/Dockerfile.alpine
+++ b/docker/amd64/postgresql/Dockerfile.alpine
@@ -82,7 +82,6 @@ ENV ROCKET_PORT=80
 ENV ROCKET_WORKERS=10
 ENV SSL_CERT_DIR=/etc/ssl/certs
 
-
 # Install needed libraries
 RUN apk add --no-cache \
         openssl \
diff --git a/docker/amd64/sqlite/Dockerfile b/docker/amd64/sqlite/Dockerfile
index ec5b84964771f1f9f18a22e3316d65843c499df7..f295fad01e12fb74883972a7ac85c8f0a8db8f8c 100644
--- a/docker/amd64/sqlite/Dockerfile
+++ b/docker/amd64/sqlite/Dockerfile
@@ -8,7 +8,6 @@ ENV VAULT_VERSION "v2.12.0b"
 
 ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz"
 
-
 # Build time options to avoid dpkg warnings and help with reproducible builds.
 ARG DEBIAN_FRONTEND=noninteractive
 ARG LANG=C.UTF-8
@@ -82,7 +81,6 @@ ENV ROCKET_ENV "staging"
 ENV ROCKET_PORT=80
 ENV ROCKET_WORKERS=10
 
-
 # Install needed libraries
 RUN apt-get update && apt-get install -y \
     --no-install-recommends \
diff --git a/docker/amd64/sqlite/Dockerfile.alpine b/docker/amd64/sqlite/Dockerfile.alpine
index 1b08bd217e9b7facdf5601586ccf35adba781c53..269a3dc4ce4a2ba7b36f83e4728f2d72e0be2461 100644
--- a/docker/amd64/sqlite/Dockerfile.alpine
+++ b/docker/amd64/sqlite/Dockerfile.alpine
@@ -76,7 +76,6 @@ ENV ROCKET_PORT=80
 ENV ROCKET_WORKERS=10
 ENV SSL_CERT_DIR=/etc/ssl/certs
 
-
 # Install needed libraries
 RUN apk add --no-cache \
         openssl \
diff --git a/docker/armv6/mysql/Dockerfile b/docker/armv6/mysql/Dockerfile
index 114261794168a5250168db800d746913e1621fc0..a89e49b79d787748e87cc203f0a1fe683d99d6a4 100644
--- a/docker/armv6/mysql/Dockerfile
+++ b/docker/armv6/mysql/Dockerfile
@@ -8,7 +8,6 @@ ENV VAULT_VERSION "v2.12.0b"
 
 ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz"
 
-
 # Build time options to avoid dpkg warnings and help with reproducible builds.
 ARG DEBIAN_FRONTEND=noninteractive
 ARG LANG=C.UTF-8
diff --git a/docker/armv6/sqlite/Dockerfile b/docker/armv6/sqlite/Dockerfile
index 6c71322114bed35c3a862b723bf0d73367fcceed..3a04b439b0f483af5d230646af5eebf51788b42f 100644
--- a/docker/armv6/sqlite/Dockerfile
+++ b/docker/armv6/sqlite/Dockerfile
@@ -8,7 +8,6 @@ ENV VAULT_VERSION "v2.12.0b"
 
 ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz"
 
-
 # Build time options to avoid dpkg warnings and help with reproducible builds.
 ARG DEBIAN_FRONTEND=noninteractive
 ARG LANG=C.UTF-8
diff --git a/docker/armv7/mysql/Dockerfile b/docker/armv7/mysql/Dockerfile
index 5b8dc6c16fd9244d7a17a01ebecfa82ab50cdc6d..cf9e25c12f15e855dd28368ab9adae0fa02efe11 100644
--- a/docker/armv7/mysql/Dockerfile
+++ b/docker/armv7/mysql/Dockerfile
@@ -8,7 +8,6 @@ ENV VAULT_VERSION "v2.12.0b"
 
 ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz"
 
-
 # Build time options to avoid dpkg warnings and help with reproducible builds.
 ARG DEBIAN_FRONTEND=noninteractive
 ARG LANG=C.UTF-8
diff --git a/docker/armv7/sqlite/Dockerfile b/docker/armv7/sqlite/Dockerfile
index 15ec9a2b657324409da29fc2633efde169474d29..33b1bba48433c24636b5314d57cff84d3a93e64b 100644
--- a/docker/armv7/sqlite/Dockerfile
+++ b/docker/armv7/sqlite/Dockerfile
@@ -8,7 +8,6 @@ ENV VAULT_VERSION "v2.12.0b"
 
 ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz"
 
-
 # Build time options to avoid dpkg warnings and help with reproducible builds.
 ARG DEBIAN_FRONTEND=noninteractive
 ARG LANG=C.UTF-8