diff --git a/.env.scripts b/.env.scripts
index 898a4cf..c67890c 100644
--- a/.env.scripts
+++ b/.env.scripts
@@ -1,10 +1,10 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202607081834-git
+##@Version           :  202607131102-git
 # @@Author           :  CasjaysDev
 # @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
 # @@License          :  WTFPL
 # @@Copyright        :  Copyright 2026 CasjaysDev
-# @@Created          :  Wed Jul  8 06:34:40 PM EDT 2026
+# @@Created          :  Mon Jul 13 11:02:19 AM EDT 2026
 # @@File             :  .env.scripts
 # @@Description      :  Variables for gen-dockerfile and buildx scripts
 # @@Changelog        :  newScript
@@ -73,7 +73,7 @@ NODE_MANAGER="system"
 # Default directories
 WWW_ROOT_DIR="/usr/local/share/httpd/default"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates "
+ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc msmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # ex: ts=2 sw=2 et filetype=sh
 # - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/.env.scripts.3.14 b/.env.scripts.3.14
index deef757..d45fe96 100644
--- a/.env.scripts.3.14
+++ b/.env.scripts.3.14
@@ -1,10 +1,10 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202607081834-git
+##@Version           :  202607131102-git
 # @@Author           :  CasjaysDev
 # @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
 # @@License          :  WTFPL
 # @@Copyright        :  Copyright 2026 CasjaysDev
-# @@Created          :  Wed Jul  8 06:34:43 PM EDT 2026
+# @@Created          :  Mon Jul 13 11:02:27 AM EDT 2026
 # @@File             :  .env.scripts.3.14
 # @@Description      :  Variables for gen-dockerfile and buildx scripts
 # @@Changelog        :  newScript
@@ -73,7 +73,7 @@ NODE_MANAGER="system"
 # Default directories
 WWW_ROOT_DIR="/usr/local/share/httpd/default"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates "
+ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc msmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # ex: ts=2 sw=2 et filetype=sh
 # - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/.env.scripts.3.15 b/.env.scripts.3.15
index 1c61f98..2649345 100644
--- a/.env.scripts.3.15
+++ b/.env.scripts.3.15
@@ -1,10 +1,10 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202607081834-git
+##@Version           :  202607131102-git
 # @@Author           :  CasjaysDev
 # @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
 # @@License          :  WTFPL
 # @@Copyright        :  Copyright 2026 CasjaysDev
-# @@Created          :  Wed Jul  8 06:34:45 PM EDT 2026
+# @@Created          :  Mon Jul 13 11:02:33 AM EDT 2026
 # @@File             :  .env.scripts.3.15
 # @@Description      :  Variables for gen-dockerfile and buildx scripts
 # @@Changelog        :  newScript
@@ -73,7 +73,7 @@ NODE_MANAGER="system"
 # Default directories
 WWW_ROOT_DIR="/usr/local/share/httpd/default"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates "
+ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc msmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # ex: ts=2 sw=2 et filetype=sh
 # - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/.env.scripts.3.16 b/.env.scripts.3.16
index 9218e01..0a0fd67 100644
--- a/.env.scripts.3.16
+++ b/.env.scripts.3.16
@@ -1,10 +1,10 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202607081834-git
+##@Version           :  202607131102-git
 # @@Author           :  CasjaysDev
 # @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
 # @@License          :  WTFPL
 # @@Copyright        :  Copyright 2026 CasjaysDev
-# @@Created          :  Wed Jul  8 06:34:47 PM EDT 2026
+# @@Created          :  Mon Jul 13 11:02:39 AM EDT 2026
 # @@File             :  .env.scripts.3.16
 # @@Description      :  Variables for gen-dockerfile and buildx scripts
 # @@Changelog        :  newScript
@@ -73,7 +73,7 @@ NODE_MANAGER="system"
 # Default directories
 WWW_ROOT_DIR="/usr/local/share/httpd/default"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates "
+ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc msmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # ex: ts=2 sw=2 et filetype=sh
 # - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/.env.scripts.3.17 b/.env.scripts.3.17
index aba3761..38eb7f7 100644
--- a/.env.scripts.3.17
+++ b/.env.scripts.3.17
@@ -1,10 +1,10 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202607081834-git
+##@Version           :  202607131102-git
 # @@Author           :  CasjaysDev
 # @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
 # @@License          :  WTFPL
 # @@Copyright        :  Copyright 2026 CasjaysDev
-# @@Created          :  Wed Jul  8 06:34:50 PM EDT 2026
+# @@Created          :  Mon Jul 13 11:02:44 AM EDT 2026
 # @@File             :  .env.scripts.3.17
 # @@Description      :  Variables for gen-dockerfile and buildx scripts
 # @@Changelog        :  newScript
@@ -73,7 +73,7 @@ NODE_MANAGER="system"
 # Default directories
 WWW_ROOT_DIR="/usr/local/share/httpd/default"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates "
+ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc msmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # ex: ts=2 sw=2 et filetype=sh
 # - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/.env.scripts.3.18 b/.env.scripts.3.18
index 8bb18b0..89fe63c 100644
--- a/.env.scripts.3.18
+++ b/.env.scripts.3.18
@@ -1,10 +1,10 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202607081834-git
+##@Version           :  202607131102-git
 # @@Author           :  CasjaysDev
 # @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
 # @@License          :  WTFPL
 # @@Copyright        :  Copyright 2026 CasjaysDev
-# @@Created          :  Wed Jul  8 06:34:52 PM EDT 2026
+# @@Created          :  Mon Jul 13 11:02:47 AM EDT 2026
 # @@File             :  .env.scripts.3.18
 # @@Description      :  Variables for gen-dockerfile and buildx scripts
 # @@Changelog        :  newScript
@@ -73,7 +73,7 @@ NODE_MANAGER="system"
 # Default directories
 WWW_ROOT_DIR="/usr/local/share/httpd/default"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates "
+ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc msmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # ex: ts=2 sw=2 et filetype=sh
 # - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/.env.scripts.3.19 b/.env.scripts.3.19
index aa513eb..83d95cc 100644
--- a/.env.scripts.3.19
+++ b/.env.scripts.3.19
@@ -1,10 +1,10 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202607081834-git
+##@Version           :  202607131102-git
 # @@Author           :  CasjaysDev
 # @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
 # @@License          :  WTFPL
 # @@Copyright        :  Copyright 2026 CasjaysDev
-# @@Created          :  Wed Jul  8 06:34:55 PM EDT 2026
+# @@Created          :  Mon Jul 13 11:02:50 AM EDT 2026
 # @@File             :  .env.scripts.3.19
 # @@Description      :  Variables for gen-dockerfile and buildx scripts
 # @@Changelog        :  newScript
@@ -73,7 +73,7 @@ NODE_MANAGER="system"
 # Default directories
 WWW_ROOT_DIR="/usr/local/share/httpd/default"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates "
+ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc msmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # ex: ts=2 sw=2 et filetype=sh
 # - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/.env.scripts.3.20 b/.env.scripts.3.20
index 27958e5..65bd061 100644
--- a/.env.scripts.3.20
+++ b/.env.scripts.3.20
@@ -1,10 +1,10 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202607081834-git
+##@Version           :  202607131102-git
 # @@Author           :  CasjaysDev
 # @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
 # @@License          :  WTFPL
 # @@Copyright        :  Copyright 2026 CasjaysDev
-# @@Created          :  Wed Jul  8 06:34:58 PM EDT 2026
+# @@Created          :  Mon Jul 13 11:02:52 AM EDT 2026
 # @@File             :  .env.scripts.3.20
 # @@Description      :  Variables for gen-dockerfile and buildx scripts
 # @@Changelog        :  newScript
@@ -73,7 +73,7 @@ NODE_MANAGER="system"
 # Default directories
 WWW_ROOT_DIR="/usr/local/share/httpd/default"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates "
+ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc msmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # ex: ts=2 sw=2 et filetype=sh
 # - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/.env.scripts.3.21 b/.env.scripts.3.21
index ee16fca..017c91c 100644
--- a/.env.scripts.3.21
+++ b/.env.scripts.3.21
@@ -1,10 +1,10 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202607081835-git
+##@Version           :  202607131102-git
 # @@Author           :  CasjaysDev
 # @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
 # @@License          :  WTFPL
 # @@Copyright        :  Copyright 2026 CasjaysDev
-# @@Created          :  Wed Jul  8 06:35:05 PM EDT 2026
+# @@Created          :  Mon Jul 13 11:02:56 AM EDT 2026
 # @@File             :  .env.scripts.3.21
 # @@Description      :  Variables for gen-dockerfile and buildx scripts
 # @@Changelog        :  newScript
@@ -73,7 +73,7 @@ NODE_MANAGER="system"
 # Default directories
 WWW_ROOT_DIR="/usr/local/share/httpd/default"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates "
+ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc msmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # ex: ts=2 sw=2 et filetype=sh
 # - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/.env.scripts.3.22 b/.env.scripts.3.22
index f88c42b..747a3d0 100644
--- a/.env.scripts.3.22
+++ b/.env.scripts.3.22
@@ -1,10 +1,10 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202607081835-git
+##@Version           :  202607131103-git
 # @@Author           :  CasjaysDev
 # @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
 # @@License          :  WTFPL
 # @@Copyright        :  Copyright 2026 CasjaysDev
-# @@Created          :  Wed Jul  8 06:35:12 PM EDT 2026
+# @@Created          :  Mon Jul 13 11:03:00 AM EDT 2026
 # @@File             :  .env.scripts.3.22
 # @@Description      :  Variables for gen-dockerfile and buildx scripts
 # @@Changelog        :  newScript
@@ -73,7 +73,7 @@ NODE_MANAGER="system"
 # Default directories
 WWW_ROOT_DIR="/usr/local/share/httpd/default"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates "
+ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc msmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # ex: ts=2 sw=2 et filetype=sh
 # - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/.env.scripts.3.23 b/.env.scripts.3.23
index b3ed5d7..bc5b152 100644
--- a/.env.scripts.3.23
+++ b/.env.scripts.3.23
@@ -1,10 +1,10 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202607081835-git
+##@Version           :  202607131103-git
 # @@Author           :  CasjaysDev
 # @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
 # @@License          :  WTFPL
 # @@Copyright        :  Copyright 2026 CasjaysDev
-# @@Created          :  Wed Jul  8 06:35:17 PM EDT 2026
+# @@Created          :  Mon Jul 13 11:03:07 AM EDT 2026
 # @@File             :  .env.scripts.3.23
 # @@Description      :  Variables for gen-dockerfile and buildx scripts
 # @@Changelog        :  newScript
@@ -73,7 +73,7 @@ NODE_MANAGER="system"
 # Default directories
 WWW_ROOT_DIR="/usr/local/share/httpd/default"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates "
+ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc msmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # ex: ts=2 sw=2 et filetype=sh
 # - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/.env.scripts.edge b/.env.scripts.edge
index dd75642..c1b5e7d 100644
--- a/.env.scripts.edge
+++ b/.env.scripts.edge
@@ -1,10 +1,10 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202607081835-git
+##@Version           :  202607131103-git
 # @@Author           :  CasjaysDev
 # @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
 # @@License          :  WTFPL
 # @@Copyright        :  Copyright 2026 CasjaysDev
-# @@Created          :  Wed Jul  8 06:35:20 PM EDT 2026
+# @@Created          :  Mon Jul 13 11:03:13 AM EDT 2026
 # @@File             :  .env.scripts.edge
 # @@Description      :  Variables for gen-dockerfile and buildx scripts
 # @@Changelog        :  newScript
@@ -73,7 +73,7 @@ NODE_MANAGER="system"
 # Default directories
 WWW_ROOT_DIR="/usr/local/share/httpd/default"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates "
+ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc msmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # ex: ts=2 sw=2 et filetype=sh
 # - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/.env.scripts.testing b/.env.scripts.testing
index fa92057..982fdae 100644
--- a/.env.scripts.testing
+++ b/.env.scripts.testing
@@ -1,10 +1,10 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202607081835-git
+##@Version           :  202607131103-git
 # @@Author           :  CasjaysDev
 # @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
 # @@License          :  WTFPL
 # @@Copyright        :  Copyright 2026 CasjaysDev
-# @@Created          :  Wed Jul  8 06:35:24 PM EDT 2026
+# @@Created          :  Mon Jul 13 11:03:19 AM EDT 2026
 # @@File             :  .env.scripts.testing
 # @@Description      :  Variables for gen-dockerfile and buildx scripts
 # @@Changelog        :  newScript
@@ -73,7 +73,7 @@ NODE_MANAGER="system"
 # Default directories
 WWW_ROOT_DIR="/usr/local/share/httpd/default"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates tor"
+ENV_PACKAGES="bash tini bash-completion git curl wget sudo unzip iproute2 openrc msmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates tor"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # ex: ts=2 sw=2 et filetype=sh
 # - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/Dockerfile b/Dockerfile
index fba1218..90aee26 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,11 @@
+# syntax=docker/dockerfile:1
 # Docker image for alpine using the alpine template
 ARG IMAGE_NAME="alpine"
 ARG PHP_SERVER="alpine"
-ARG BUILD_DATE="202607111916"
+ARG BUILD_DATE="202408111050"
 ARG LANGUAGE="en_US.UTF-8"
 ARG TIMEZONE="America/New_York"
 ARG WWW_ROOT_DIR="/usr/local/share/httpd/default"
-ARG PATH="/usr/local/etc/docker/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 
 ARG USER="root"
 ARG SHELL_OPTS="set -e -o pipefail"
@@ -34,228 +34,77 @@ ARG LANGUAGE
 ARG IMAGE_NAME
 ARG BUILD_DATE
 ARG SERVICE_PORT
-ARG EXPOSE_PORTS
 ARG BUILD_VERSION
-ARG IMAGE_VERSION
-ARG WWW_ROOT_DIR
-ARG DISTRO_VERSION
-ARG NODE_VERSION
-ARG NODE_MANAGER
-ARG PHP_VERSION
-ARG PHP_SERVER
 ARG SHELL_OPTS
-ARG PATH
+ARG DISTRO_VERSION
+ARG CONTAINER_VERSION
 
-ARG PACK_LIST="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates "
+ARG PACK_LIST="bash tini bash-completion git curl wget sudo unzip iproute2 openrc msmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates "
 
 ENV ENV=~/.profile
 ENV SHELL="/bin/sh"
-ENV PATH="${PATH}"
 ENV TZ="${TIMEZONE}"
 ENV TIMEZONE="${TZ}"
 ENV LANG="${LANGUAGE}"
 ENV TERM="xterm-256color"
-ENV HOSTNAME="casjaysdevdocker-alpine"
-
-USER ${USER}
-WORKDIR /root
-
-RUN set -e; \
-  echo "Updating the system"; \
-  apk upgrade --no-cache
-
-COPY ./rootfs/. /
-
-RUN set -e; \
-  echo "Ensuring bash and system certs are installed"; \
-  pkmgr install bash ca-certificates; \
-  update-ca-certificates
-
-RUN set -e; \
-  echo "Setting up prerequisites"; \
-  apk --no-cache add bash; \
-  SH_CMD="$(which sh 2>/dev/null||command -v sh 2>/dev/null)"; \
-  BASH_CMD="$(which bash 2>/dev/null||command -v bash 2>/dev/null)"; \
-  [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/bin/sh" || true; \
-  [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/usr/bin/sh" || true; \
-  [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && symlink "$BASH_CMD" "$SH_CMD" || true; \
-  [ -n "$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'$BASH_CMD'|g' "/etc/passwd" || true
-
-ENV SHELL="/bin/bash"
-SHELL [ "/bin/bash", "-c" ]
-
-COPY --from=gosu /usr/local/bin/gosu /usr/local/bin/gosu
-
-RUN echo "Initializing the system"; \
-  $SHELL_OPTS; \
-  mkdir -p "/root/docker/setup" "/etc/profile.d"; \
-  if [ -f "/root/docker/setup/00-init.sh" ];then echo "Running the init script";/root/docker/setup/00-init.sh||{ echo "Failed to execute /root/docker/setup/00-init.sh" >&2 && exit 10; };echo "Done running the init script";fi; \
-  echo ""
-
-RUN echo "Creating and editing system files "; \
-  $SHELL_OPTS; \
-
-  rm -Rf "/etc/apk/repositories"; \
-  [ "$DISTRO_VERSION" = "latest" ] && DISTRO_VERSION="edge";[ "$DISTRO_VERSION" = "edge" ] || DISTRO_VERSION="v${DISTRO_VERSION}"; \
-  echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/main" >>"/etc/apk/repositories"; \
-  echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/community" >>"/etc/apk/repositories"; \
-  if [ "${DISTRO_VERSION}" = "edge" ]; then echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/testing" >>"/etc/apk/repositories";fi; \
-  apk update; apk upgrade --no-cache; \
-  if [ -f "/root/docker/setup/01-system.sh" ];then echo "Running the system script";/root/docker/setup/01-system.sh||{ echo "Failed to execute /root/docker/setup/01-system.sh" >&2 && exit 10; };echo "Done running the system script";fi; \
-  echo ""
-
-RUN echo "Running pre-package commands"; \
-  $SHELL_OPTS; \
-  echo ""
-
-RUN echo "Setting up and installing packages"; \
-  $SHELL_OPTS; \
-  if [ -n "${PACK_LIST}" ];then echo "Installing packages: $PACK_LIST";echo "${PACK_LIST}" >/root/docker/setup/packages.txt;pkmgr install ${PACK_LIST};fi; \
-  echo ""
-
-RUN echo "Initializing packages before copying files to image"; \
-  $SHELL_OPTS; \
-  if [ -f "/root/docker/setup/02-packages.sh" ];then echo "Running the packages script";/root/docker/setup/02-packages.sh||{ echo "Failed to execute /root/docker/setup/02-packages.sh" >&2 && exit 10; };echo "Done running the packages script";fi; \
-  echo ""
-
-COPY ./Dockerfile /root/docker/Dockerfile
-
-RUN echo "Updating system files "; \
-  $SHELL_OPTS; \
-  echo "$TIMEZONE" >"/etc/timezone"; \
-  touch "/etc/profile" "/root/.profile"; \
-  echo 'hosts: files dns' >"/etc/nsswitch.conf"; \
-  [ "$PHP_VERSION" = "system" ] && PHP_VERSION="php" || true; \
-  PHP_BIN="$(command -v ${PHP_VERSION} 2>/dev/null || true)"; \
-  set -- /usr/*bin/php*fpm*; [ -e "$1" ] && PHP_FPM="$1" || PHP_FPM=""; \
-  pip_bin="$(command -v python3 2>/dev/null || command -v python2 2>/dev/null || command -v python 2>/dev/null || true)"; \
-  py_version="$(command $pip_bin --version | sed 's|[pP]ython ||g' | awk -F '.' '{print $1$2}' | grep '[0-9]' || true)"; \
-  [ "$py_version" -gt "310" ] && pip_opts="--break-system-packages " || pip_opts=""; \
-  [ -f "/usr/share/zoneinfo/${TZ}" ] && ln -sf "/usr/share/zoneinfo/${TZ}" "/etc/localtime" || true; \
-  [ -n "$PHP_BIN" ] && [ -z "$(command -v php 2>/dev/null)" ] && ln -sf "$PHP_BIN" "/usr/bin/php" 2>/dev/null || true; \
-  [ -n "$PHP_FPM" ] && [ -z "$(command -v php-fpm 2>/dev/null)" ] && ln -sf "$PHP_FPM" "/usr/bin/php-fpm" 2>/dev/null || true; \
-  if [ -f "/etc/profile.d/color_prompt.sh.disabled" ]; then mv -f "/etc/profile.d/color_prompt.sh.disabled" "/etc/profile.d/color_prompt.sh";fi ; \
-  { [ -f "/etc/bash/bashrc" ] && cp -Rf "/etc/bash/bashrc" "/root/.bashrc"; } || { [ -f "/etc/bashrc" ] && cp -Rf "/etc/bashrc" "/root/.bashrc"; } || { [ -f "/etc/bash.bashrc" ] && cp -Rf "/etc/bash.bashrc" "/root/.bashrc"; } || true; \
-  if [ -z "$(command -v "apt-get" 2>/dev/null)" ];then grep -sh -q 'alias quit' "/root/.bashrc" || printf '# Profile\n\n%s\n%s\n%s\n' '. /etc/profile' '. /root/.profile' "alias quit='exit 0 2>/dev/null'" >>"/root/.bashrc"; fi; \
-  if [ "$PHP_VERSION" != "system" ] && [ -e "/etc/php" ] && [ -d "/etc/${PHP_VERSION}" ];then rm -Rf "/etc/php";fi; \
-  if [ "$PHP_VERSION" != "system" ] && [ -n "${PHP_VERSION}" ] && [ -d "/etc/${PHP_VERSION}" ];then ln -sf "/etc/${PHP_VERSION}" "/etc/php";fi; \
-  if [ -f "/root/docker/setup/03-files.sh" ];then echo "Running the files script";/root/docker/setup/03-files.sh||{ echo "Failed to execute /root/docker/setup/03-files.sh" >&2 && exit 10; };echo "Done running the files script";fi; \
-  echo ""
-
-RUN echo "Custom Settings"; \
-  $SHELL_OPTS; \
-echo ""
-
-RUN echo "Setting up users and scripts "; \
-  $SHELL_OPTS; \
-  if [ -f "/root/docker/setup/04-users.sh" ];then echo "Running the users script";/root/docker/setup/04-users.sh||{ echo "Failed to execute /root/docker/setup/04-users.sh" >&2 && exit 10; };echo "Done running the users script";fi; \
-  echo ""
-
-RUN echo "Running the user init commands"; \
-  $SHELL_OPTS; \
-  echo ""
-
-RUN echo "Setting OS Settings "; \
-  $SHELL_OPTS; \
-  echo ""
-
-RUN echo "Custom Applications"; \
-  $SHELL_OPTS; \
-echo ""
-
-RUN echo "Running custom commands"; \
-  if [ -f "/root/docker/setup/05-custom.sh" ];then echo "Running the custom script";/root/docker/setup/05-custom.sh||{ echo "Failed to execute /root/docker/setup/05-custom.sh" && exit 10; };echo "Done running the custom script";fi; \
-  echo ""
-
-RUN echo "Running final commands before cleanup"; \
-  $SHELL_OPTS; \
-  if [ -f "/root/docker/setup/06-post.sh" ];then echo "Running the post script";/root/docker/setup/06-post.sh||{ echo "Failed to execute /root/docker/setup/06-post.sh" >&2 && exit 10; };echo "Done running the post script";fi; \
-  echo ""
-
-RUN echo "Deleting unneeded files"; \
-  $SHELL_OPTS; \
-  pkmgr clean; \
-  rm -Rf "/config" "/data" || true; \
-  rm -rf /etc/systemd/system/*.wants/* || true; \
-  rm -rf /lib/systemd/system/systemd-update-utmp* || true; \
-  rm -rf /lib/systemd/system/anaconda.target.wants/* || true; \
-  rm -rf /lib/systemd/system/local-fs.target.wants/* || true; \
-  rm -rf /lib/systemd/system/multi-user.target.wants/* || true; \
-  rm -rf /lib/systemd/system/sockets.target.wants/*udev* || true; \
-  rm -rf /lib/systemd/system/sockets.target.wants/*initctl* || true; \
-  rm -Rf /usr/share/doc/* /var/tmp/* /var/cache/*/* /root/.cache/* /usr/share/info/* /tmp/* || true; \
-  if [ -d "/lib/systemd/system/sysinit.target.wants" ];then cd "/lib/systemd/system/sysinit.target.wants" && for want_file in *; do [ "$want_file" = "systemd-tmpfiles-setup" ] || rm -f "$want_file"; done; fi; \
-  if [ -f "/root/docker/setup/07-cleanup.sh" ];then echo "Running the cleanup script";/root/docker/setup/07-cleanup.sh||{ echo "Failed to execute /root/docker/setup/07-cleanup.sh" >&2 && exit 10; };echo "Done running the cleanup script";fi; \
-  echo ""
-
-RUN echo "Init done"
-FROM scratch
-ARG TZ
-ARG PATH
-ARG USER
-ARG TIMEZONE
-ARG LANGUAGE
-ARG IMAGE_NAME
-ARG BUILD_DATE
-ARG SERVICE_PORT
-ARG EXPOSE_PORTS
-ARG BUILD_VERSION
-ARG IMAGE_VERSION
-ARG GIT_COMMIT
-ARG WWW_ROOT_DIR
-ARG DISTRO_VERSION
-ARG NODE_VERSION
-ARG NODE_MANAGER
-ARG PHP_VERSION
-ARG PHP_SERVER
-ARG LICENSE="WTFPL"
-ARG ENV_PORTS="${EXPOSE_PORTS}"
-
-USER ${USER}
-WORKDIR /root
-
-LABEL maintainer="CasjaysDev <docker-admin@casjaysdev.pro>"
-LABEL org.opencontainers.image.vendor="CasjaysDev"
-LABEL org.opencontainers.image.authors="CasjaysDev"
-LABEL org.opencontainers.image.licenses="${LICENSE}"
-LABEL org.opencontainers.image.title="${IMAGE_NAME}"
-LABEL org.opencontainers.image.description="Containerized version of ${IMAGE_NAME}"
-LABEL org.opencontainers.image.created="${BUILD_DATE}"
-LABEL org.opencontainers.image.version="${BUILD_VERSION}"
-LABEL org.opencontainers.image.revision="${GIT_COMMIT}"
-LABEL org.opencontainers.image.url="https://docker.io/casjaysdev/alpine"
-LABEL org.opencontainers.image.source="https://docker.io/casjaysdev/alpine"
-LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/alpine"
-LABEL org.opencontainers.image.vcs-type="Git"
-LABEL com.github.containers.toolbox="false"
-
-ENV ENV=~/.bashrc
-ENV USER="${USER}"
-ENV PATH="${PATH}"
-ENV TZ="${TIMEZONE}"
-ENV SHELL="/bin/bash"
-ENV TIMEZONE="${TZ}"
-ENV LANG="${LANGUAGE}"
-ENV TERM="xterm-256color"
 ENV PORT="${SERVICE_PORT}"
-ENV ENV_PORTS="${ENV_PORTS}"
 ENV CONTAINER_NAME="${IMAGE_NAME}"
-ENV HOSTNAME="casjaysdevdocker-${IMAGE_NAME}"
-ENV PHP_SERVER="${PHP_SERVER}"
-ENV NODE_VERSION="${NODE_VERSION}"
-ENV NODE_MANAGER="${NODE_MANAGER}"
-ENV PHP_VERSION="${PHP_VERSION}"
-ENV DISTRO_VERSION="${IMAGE_VERSION}"
-ENV WWW_ROOT_DIR="${WWW_ROOT_DIR}"
+ENV HOSTNAME="${CONTAINER_NAME}"
+ENV USER="${USER}"
 
-COPY --from=build /. /
+USER ${USER}
+WORKDIR /root
 
-VOLUME [ "/config","/data" ]
+COPY ./rootfs/. /
 
-EXPOSE ${SERVICE_PORT} ${ENV_PORTS}
+RUN set -e; \
+  echo 'Installing packages' && \
+  apk update && apk upgrade --no-cache && apk add --no-cache ${PACK_LIST}
 
-STOPSIGNAL SIGRTMIN+3
+RUN set -e; \
+  echo 'Running initial scripts' && \
+  sh -c "INIT_DATE='${BUILD_DATE}' && export INIT_DATE && bash -c /root/docker/setup/00-init.sh" && \
+  echo 'Initial setup completed'
 
-ENTRYPOINT [ "tini", "-p", "SIGTERM","--", "/usr/local/bin/entrypoint.sh" ]
-HEALTHCHECK --start-period=10m --interval=5m --timeout=15s CMD [ "/usr/local/bin/entrypoint.sh", "healthcheck" ]
+RUN set -e; \
+  echo 'Running post install scripts' && \
+  if [ -f "/root/docker/setup/02-packages.sh" ]; then bash -c "/root/docker/setup/02-packages.sh"; fi && \
+  if [ -f "/root/docker/setup/03-files.sh" ]; then bash -c "/root/docker/setup/03-files.sh"; fi && \
+  if [ -f "/root/docker/setup/04-users.sh" ]; then bash -c "/root/docker/setup/04-users.sh"; fi && \
+  if [ -f "/root/docker/setup/05-custom.sh" ]; then bash -c "/root/docker/setup/05-custom.sh"; fi && \
+  echo 'Post install completed'
+
+FROM scratch
+ARG BUILD_DATE
+ARG IMAGE_NAME
+ARG TIMEZONE
+ARG LANGUAGE
+
+ENV ENV=~/.profile
+ENV SHELL="/bin/sh"
+ENV TZ="${TIMEZONE}"
+ENV TIMEZONE="${TZ}"
+ENV LANG="${LANGUAGE}"
+ENV TERM="xterm-256color"
+ENV CONTAINER_NAME="${IMAGE_NAME}"
+ENV HOSTNAME="${CONTAINER_NAME}"
+ENV USER="root"
+
+USER root
+WORKDIR /root
+
+LABEL org.opencontainers.image.vendor="CasjaysDev"
+LABEL org.opencontainers.image.title="${IMAGE_NAME}"
+LABEL org.opencontainers.image.base.name="${IMAGE_NAME}"
+LABEL org.opencontainers.image.description="Containerized version of ${IMAGE_NAME}"
+LABEL org.opencontainers.image.build-date="${BUILD_DATE}"
+LABEL org.opencontainers.image.authors="CasjaysDev <docker-admin@casjaysdev.pro>"
+
+COPY --from=gosu /usr/local/bin/gosu /usr/local/bin/gosu
+COPY --from=build / /
+
+VOLUME [ "/root","/data","/config" ]
+
+ENTRYPOINT [ "tini","--","/usr/local/bin/entrypoint.sh" ]
+HEALTHCHECK --interval=60s --timeout=30s --start-period=30s --retries=3 CMD [ "/usr/local/bin/entrypoint.sh", "healthcheck" ]
 
diff --git a/Dockerfile.3.14 b/Dockerfile.3.14
index 4ffb0be..5433034 100644
--- a/Dockerfile.3.14
+++ b/Dockerfile.3.14
@@ -1,11 +1,15 @@
+# syntax=docker/dockerfile:1
 # Docker image for alpine using the alpine template
 ARG IMAGE_NAME="alpine"
 ARG PHP_SERVER="alpine"
-ARG BUILD_DATE="202607111940"
+ARG BUILD_DATE="202408111050"
 ARG LANGUAGE="en_US.UTF-8"
 ARG TIMEZONE="America/New_York"
 ARG WWW_ROOT_DIR="/usr/local/share/httpd/default"
-ARG PATH="/usr/local/etc/docker/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+ARG DEFAULT_FILE_DIR="/usr/local/share/template-files"
+ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
+ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
+ARG DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults"
 
 ARG USER="root"
 ARG SHELL_OPTS="set -e -o pipefail"
@@ -21,7 +25,7 @@ ARG IMAGE_VERSION="3.14"
 ARG CONTAINER_VERSION=""
 
 ARG PULL_URL="alpine"
-ARG DISTRO_VERSION="3.14"
+ARG DISTRO_VERSION="${IMAGE_VERSION}"
 ARG BUILD_VERSION="${BUILD_DATE}"
 
 FROM tianon/gosu:latest AS gosu
@@ -38,47 +42,40 @@ ARG EXPOSE_PORTS
 ARG BUILD_VERSION
 ARG IMAGE_VERSION
 ARG WWW_ROOT_DIR
+ARG DEFAULT_FILE_DIR
+ARG DEFAULT_DATA_DIR
+ARG DEFAULT_CONF_DIR
+ARG DEFAULT_TEMPLATE_DIR
 ARG DISTRO_VERSION
 ARG NODE_VERSION
 ARG NODE_MANAGER
 ARG PHP_VERSION
 ARG PHP_SERVER
 ARG SHELL_OPTS
-ARG PATH
 
-ARG PACK_LIST="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates "
+ARG PACK_LIST="bash tini bash-completion git curl wget sudo unzip iproute2 openrc msmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates "
 
 ENV ENV=~/.profile
 ENV SHELL="/bin/sh"
-ENV PATH="${PATH}"
 ENV TZ="${TIMEZONE}"
 ENV TIMEZONE="${TZ}"
 ENV LANG="${LANGUAGE}"
 ENV TERM="xterm-256color"
-ENV HOSTNAME="casjaysdevdocker-alpine"
+ENV HOSTNAME="casjaysdev-alpine"
 
 USER ${USER}
 WORKDIR /root
 
-RUN set -e; \
-  echo "Updating the system"; \
-  apk upgrade --no-cache
-
-COPY ./rootfs/. /
-
-RUN set -e; \
-  echo "Ensuring bash and system certs are installed"; \
-  pkmgr install bash ca-certificates; \
-  update-ca-certificates
+COPY ./rootfs/usr/local/bin/. /usr/local/bin/
 
 RUN set -e; \
   echo "Setting up prerequisites"; \
   apk --no-cache add bash; \
   SH_CMD="$(which sh 2>/dev/null||command -v sh 2>/dev/null)"; \
   BASH_CMD="$(which bash 2>/dev/null||command -v bash 2>/dev/null)"; \
-  [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/bin/sh" || true; \
-  [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/usr/bin/sh" || true; \
-  [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && symlink "$BASH_CMD" "$SH_CMD" || true; \
+  [ -x "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/bin/sh" || true; \
+  [ -x "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/usr/bin/sh" || true; \
+  [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && ln -sf "$BASH_CMD" "$SH_CMD" || true; \
   [ -n "$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'$BASH_CMD'|g' "/etc/passwd" || true
 
 ENV SHELL="/bin/bash"
@@ -88,19 +85,19 @@ COPY --from=gosu /usr/local/bin/gosu /usr/local/bin/gosu
 
 RUN echo "Initializing the system"; \
   $SHELL_OPTS; \
-  mkdir -p "/root/docker/setup" "/etc/profile.d"; \
+  mkdir -p "${DEFAULT_DATA_DIR}" "${DEFAULT_CONF_DIR}" "${DEFAULT_TEMPLATE_DIR}" "/root/docker/setup" "/etc/profile.d"; \
   if [ -f "/root/docker/setup/00-init.sh" ];then echo "Running the init script";/root/docker/setup/00-init.sh||{ echo "Failed to execute /root/docker/setup/00-init.sh" >&2 && exit 10; };echo "Done running the init script";fi; \
   echo ""
 
 RUN echo "Creating and editing system files "; \
   $SHELL_OPTS; \
-
   rm -Rf "/etc/apk/repositories"; \
   [ "$DISTRO_VERSION" = "latest" ] && DISTRO_VERSION="edge";[ "$DISTRO_VERSION" = "edge" ] || DISTRO_VERSION="v${DISTRO_VERSION}"; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/main" >>"/etc/apk/repositories"; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/community" >>"/etc/apk/repositories"; \
   if [ "${DISTRO_VERSION}" = "edge" ]; then echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/testing" >>"/etc/apk/repositories";fi; \
-  apk update; apk upgrade --no-cache; \
+  apk update; \
+  apk upgrade --no-cache; \
   if [ -f "/root/docker/setup/01-system.sh" ];then echo "Running the system script";/root/docker/setup/01-system.sh||{ echo "Failed to execute /root/docker/setup/01-system.sh" >&2 && exit 10; };echo "Done running the system script";fi; \
   echo ""
 
@@ -118,6 +115,7 @@ RUN echo "Initializing packages before copying files to image"; \
   if [ -f "/root/docker/setup/02-packages.sh" ];then echo "Running the packages script";/root/docker/setup/02-packages.sh||{ echo "Failed to execute /root/docker/setup/02-packages.sh" >&2 && exit 10; };echo "Done running the packages script";fi; \
   echo ""
 
+COPY ./rootfs/. /
 COPY ./Dockerfile.3.14 /root/docker/Dockerfile
 
 RUN echo "Updating system files "; \
@@ -127,7 +125,7 @@ RUN echo "Updating system files "; \
   echo 'hosts: files dns' >"/etc/nsswitch.conf"; \
   [ "$PHP_VERSION" = "system" ] && PHP_VERSION="php" || true; \
   PHP_BIN="$(command -v ${PHP_VERSION} 2>/dev/null || true)"; \
-  set -- /usr/*bin/php*fpm*; [ -e "$1" ] && PHP_FPM="$1" || PHP_FPM=""; \
+  PHP_FPM="$(ls /usr/*bin/php*fpm* 2>/dev/null || true)"; \
   pip_bin="$(command -v python3 2>/dev/null || command -v python2 2>/dev/null || command -v python 2>/dev/null || true)"; \
   py_version="$(command $pip_bin --version | sed 's|[pP]ython ||g' | awk -F '.' '{print $1$2}' | grep '[0-9]' || true)"; \
   [ "$py_version" -gt "310" ] && pip_opts="--break-system-packages " || pip_opts=""; \
@@ -136,7 +134,7 @@ RUN echo "Updating system files "; \
   [ -n "$PHP_FPM" ] && [ -z "$(command -v php-fpm 2>/dev/null)" ] && ln -sf "$PHP_FPM" "/usr/bin/php-fpm" 2>/dev/null || true; \
   if [ -f "/etc/profile.d/color_prompt.sh.disabled" ]; then mv -f "/etc/profile.d/color_prompt.sh.disabled" "/etc/profile.d/color_prompt.sh";fi ; \
   { [ -f "/etc/bash/bashrc" ] && cp -Rf "/etc/bash/bashrc" "/root/.bashrc"; } || { [ -f "/etc/bashrc" ] && cp -Rf "/etc/bashrc" "/root/.bashrc"; } || { [ -f "/etc/bash.bashrc" ] && cp -Rf "/etc/bash.bashrc" "/root/.bashrc"; } || true; \
-  if [ -z "$(command -v "apt-get" 2>/dev/null)" ];then grep -sh -q 'alias quit' "/root/.bashrc" || printf '# Profile\n\n%s\n%s\n%s\n' '. /etc/profile' '. /root/.profile' "alias quit='exit 0 2>/dev/null'" >>"/root/.bashrc"; fi; \
+  if [ -z "$(command -v "apt-get" 2>/dev/null)" ];then grep -s -q 'alias quit' "/root/.bashrc" || printf '# Profile\n\n%s\n%s\n%s\n' '. /etc/profile' '. /root/.profile' "alias quit='exit 0 2>/dev/null'" >>"/root/.bashrc"; fi; \
   if [ "$PHP_VERSION" != "system" ] && [ -e "/etc/php" ] && [ -d "/etc/${PHP_VERSION}" ];then rm -Rf "/etc/php";fi; \
   if [ "$PHP_VERSION" != "system" ] && [ -n "${PHP_VERSION}" ] && [ -d "/etc/${PHP_VERSION}" ];then ln -sf "/etc/${PHP_VERSION}" "/etc/php";fi; \
   if [ -f "/root/docker/setup/03-files.sh" ];then echo "Running the files script";/root/docker/setup/03-files.sh||{ echo "Failed to execute /root/docker/setup/03-files.sh" >&2 && exit 10; };echo "Done running the files script";fi; \
@@ -144,7 +142,7 @@ RUN echo "Updating system files "; \
 
 RUN echo "Custom Settings"; \
   $SHELL_OPTS; \
-echo ""
+  echo ""
 
 RUN echo "Setting up users and scripts "; \
   $SHELL_OPTS; \
@@ -161,7 +159,7 @@ RUN echo "Setting OS Settings "; \
 
 RUN echo "Custom Applications"; \
   $SHELL_OPTS; \
-echo ""
+  echo ""
 
 RUN echo "Running custom commands"; \
   if [ -f "/root/docker/setup/05-custom.sh" ];then echo "Running the custom script";/root/docker/setup/05-custom.sh||{ echo "Failed to execute /root/docker/setup/05-custom.sh" && exit 10; };echo "Done running the custom script";fi; \
@@ -184,14 +182,13 @@ RUN echo "Deleting unneeded files"; \
   rm -rf /lib/systemd/system/sockets.target.wants/*udev* || true; \
   rm -rf /lib/systemd/system/sockets.target.wants/*initctl* || true; \
   rm -Rf /usr/share/doc/* /var/tmp/* /var/cache/*/* /root/.cache/* /usr/share/info/* /tmp/* || true; \
-  if [ -d "/lib/systemd/system/sysinit.target.wants" ];then cd "/lib/systemd/system/sysinit.target.wants" && for want_file in *; do [ "$want_file" = "systemd-tmpfiles-setup" ] || rm -f "$want_file"; done; fi; \
+  if [ -d "/lib/systemd/system/sysinit.target.wants" ];then cd "/lib/systemd/system/sysinit.target.wants" && rm -f $(ls | grep -v systemd-tmpfiles-setup);fi; \
   if [ -f "/root/docker/setup/07-cleanup.sh" ];then echo "Running the cleanup script";/root/docker/setup/07-cleanup.sh||{ echo "Failed to execute /root/docker/setup/07-cleanup.sh" >&2 && exit 10; };echo "Done running the cleanup script";fi; \
   echo ""
 
 RUN echo "Init done"
 FROM scratch
 ARG TZ
-ARG PATH
 ARG USER
 ARG TIMEZONE
 ARG LANGUAGE
@@ -201,46 +198,51 @@ ARG SERVICE_PORT
 ARG EXPOSE_PORTS
 ARG BUILD_VERSION
 ARG IMAGE_VERSION
-ARG GIT_COMMIT
 ARG WWW_ROOT_DIR
+ARG DEFAULT_FILE_DIR
+ARG DEFAULT_DATA_DIR
+ARG DEFAULT_CONF_DIR
+ARG DEFAULT_TEMPLATE_DIR
 ARG DISTRO_VERSION
 ARG NODE_VERSION
 ARG NODE_MANAGER
 ARG PHP_VERSION
 ARG PHP_SERVER
 ARG LICENSE="WTFPL"
-ARG ENV_PORTS="${EXPOSE_PORTS}"
+ARG ENV_PORTS=""
 
 USER ${USER}
 WORKDIR /root
 
 LABEL maintainer="CasjaysDev <docker-admin@casjaysdev.pro>"
 LABEL org.opencontainers.image.vendor="CasjaysDev"
-LABEL org.opencontainers.image.authors="CasjaysDev"
-LABEL org.opencontainers.image.licenses="${LICENSE}"
-LABEL org.opencontainers.image.title="${IMAGE_NAME}"
+LABEL org.opencontainers.image.authors="CasjaysDev <docker-admin@casjaysdev.pro"
 LABEL org.opencontainers.image.description="Containerized version of ${IMAGE_NAME}"
+LABEL org.opencontainers.image.title="${IMAGE_NAME}"
+LABEL org.opencontainers.image.base.name="${IMAGE_NAME}"
+LABEL org.opencontainers.image.authors="${LICENSE}"
 LABEL org.opencontainers.image.created="${BUILD_DATE}"
 LABEL org.opencontainers.image.version="${BUILD_VERSION}"
-LABEL org.opencontainers.image.revision="${GIT_COMMIT}"
+LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}"
 LABEL org.opencontainers.image.url="https://docker.io/casjaysdev/alpine"
 LABEL org.opencontainers.image.source="https://docker.io/casjaysdev/alpine"
-LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/alpine"
 LABEL org.opencontainers.image.vcs-type="Git"
+LABEL org.opencontainers.image.revision="${BUILD_VERSION}"
+LABEL org.opencontainers.image.source="https://github.com/dockersrc/alpine"
+LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/alpine"
 LABEL com.github.containers.toolbox="false"
 
 ENV ENV=~/.bashrc
 ENV USER="${USER}"
-ENV PATH="${PATH}"
-ENV TZ="${TIMEZONE}"
 ENV SHELL="/bin/bash"
+ENV TZ="${TIMEZONE}"
 ENV TIMEZONE="${TZ}"
 ENV LANG="${LANGUAGE}"
 ENV TERM="xterm-256color"
 ENV PORT="${SERVICE_PORT}"
 ENV ENV_PORTS="${ENV_PORTS}"
 ENV CONTAINER_NAME="${IMAGE_NAME}"
-ENV HOSTNAME="casjaysdevdocker-${IMAGE_NAME}"
+ENV HOSTNAME="casjaysdev-${IMAGE_NAME}"
 ENV PHP_SERVER="${PHP_SERVER}"
 ENV NODE_VERSION="${NODE_VERSION}"
 ENV NODE_MANAGER="${NODE_MANAGER}"
@@ -254,8 +256,6 @@ VOLUME [ "/config","/data" ]
 
 EXPOSE ${SERVICE_PORT} ${ENV_PORTS}
 
-STOPSIGNAL SIGRTMIN+3
-
-ENTRYPOINT [ "tini", "-p", "SIGTERM","--", "/usr/local/bin/entrypoint.sh" ]
+CMD [ "tail", "-f", "/dev/null" ]
+ENTRYPOINT [ "tini","--","/usr/local/bin/entrypoint.sh" ]
 HEALTHCHECK --start-period=10m --interval=5m --timeout=15s CMD [ "/usr/local/bin/entrypoint.sh", "healthcheck" ]
-
diff --git a/Dockerfile.3.15 b/Dockerfile.3.15
index f79158d..f1c7e58 100644
--- a/Dockerfile.3.15
+++ b/Dockerfile.3.15
@@ -1,11 +1,15 @@
+# syntax=docker/dockerfile:1
 # Docker image for alpine using the alpine template
 ARG IMAGE_NAME="alpine"
 ARG PHP_SERVER="alpine"
-ARG BUILD_DATE="202607111943"
+ARG BUILD_DATE="202408111050"
 ARG LANGUAGE="en_US.UTF-8"
 ARG TIMEZONE="America/New_York"
 ARG WWW_ROOT_DIR="/usr/local/share/httpd/default"
-ARG PATH="/usr/local/etc/docker/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+ARG DEFAULT_FILE_DIR="/usr/local/share/template-files"
+ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
+ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
+ARG DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults"
 
 ARG USER="root"
 ARG SHELL_OPTS="set -e -o pipefail"
@@ -21,7 +25,7 @@ ARG IMAGE_VERSION="3.15"
 ARG CONTAINER_VERSION=""
 
 ARG PULL_URL="alpine"
-ARG DISTRO_VERSION="3.15"
+ARG DISTRO_VERSION="${IMAGE_VERSION}"
 ARG BUILD_VERSION="${BUILD_DATE}"
 
 FROM tianon/gosu:latest AS gosu
@@ -38,47 +42,40 @@ ARG EXPOSE_PORTS
 ARG BUILD_VERSION
 ARG IMAGE_VERSION
 ARG WWW_ROOT_DIR
+ARG DEFAULT_FILE_DIR
+ARG DEFAULT_DATA_DIR
+ARG DEFAULT_CONF_DIR
+ARG DEFAULT_TEMPLATE_DIR
 ARG DISTRO_VERSION
 ARG NODE_VERSION
 ARG NODE_MANAGER
 ARG PHP_VERSION
 ARG PHP_SERVER
 ARG SHELL_OPTS
-ARG PATH
 
-ARG PACK_LIST="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates "
+ARG PACK_LIST="bash tini bash-completion git curl wget sudo unzip iproute2 openrc msmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates "
 
 ENV ENV=~/.profile
 ENV SHELL="/bin/sh"
-ENV PATH="${PATH}"
 ENV TZ="${TIMEZONE}"
 ENV TIMEZONE="${TZ}"
 ENV LANG="${LANGUAGE}"
 ENV TERM="xterm-256color"
-ENV HOSTNAME="casjaysdevdocker-alpine"
+ENV HOSTNAME="casjaysdev-alpine"
 
 USER ${USER}
 WORKDIR /root
 
-RUN set -e; \
-  echo "Updating the system"; \
-  apk upgrade --no-cache
-
-COPY ./rootfs/. /
-
-RUN set -e; \
-  echo "Ensuring bash and system certs are installed"; \
-  pkmgr install bash ca-certificates; \
-  update-ca-certificates
+COPY ./rootfs/usr/local/bin/. /usr/local/bin/
 
 RUN set -e; \
   echo "Setting up prerequisites"; \
   apk --no-cache add bash; \
   SH_CMD="$(which sh 2>/dev/null||command -v sh 2>/dev/null)"; \
   BASH_CMD="$(which bash 2>/dev/null||command -v bash 2>/dev/null)"; \
-  [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/bin/sh" || true; \
-  [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/usr/bin/sh" || true; \
-  [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && symlink "$BASH_CMD" "$SH_CMD" || true; \
+  [ -x "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/bin/sh" || true; \
+  [ -x "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/usr/bin/sh" || true; \
+  [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && ln -sf "$BASH_CMD" "$SH_CMD" || true; \
   [ -n "$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'$BASH_CMD'|g' "/etc/passwd" || true
 
 ENV SHELL="/bin/bash"
@@ -88,19 +85,19 @@ COPY --from=gosu /usr/local/bin/gosu /usr/local/bin/gosu
 
 RUN echo "Initializing the system"; \
   $SHELL_OPTS; \
-  mkdir -p "/root/docker/setup" "/etc/profile.d"; \
+  mkdir -p "${DEFAULT_DATA_DIR}" "${DEFAULT_CONF_DIR}" "${DEFAULT_TEMPLATE_DIR}" "/root/docker/setup" "/etc/profile.d"; \
   if [ -f "/root/docker/setup/00-init.sh" ];then echo "Running the init script";/root/docker/setup/00-init.sh||{ echo "Failed to execute /root/docker/setup/00-init.sh" >&2 && exit 10; };echo "Done running the init script";fi; \
   echo ""
 
 RUN echo "Creating and editing system files "; \
   $SHELL_OPTS; \
-
   rm -Rf "/etc/apk/repositories"; \
   [ "$DISTRO_VERSION" = "latest" ] && DISTRO_VERSION="edge";[ "$DISTRO_VERSION" = "edge" ] || DISTRO_VERSION="v${DISTRO_VERSION}"; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/main" >>"/etc/apk/repositories"; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/community" >>"/etc/apk/repositories"; \
   if [ "${DISTRO_VERSION}" = "edge" ]; then echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/testing" >>"/etc/apk/repositories";fi; \
-  apk update; apk upgrade --no-cache; \
+  apk update; \
+  apk upgrade --no-cache; \
   if [ -f "/root/docker/setup/01-system.sh" ];then echo "Running the system script";/root/docker/setup/01-system.sh||{ echo "Failed to execute /root/docker/setup/01-system.sh" >&2 && exit 10; };echo "Done running the system script";fi; \
   echo ""
 
@@ -118,6 +115,7 @@ RUN echo "Initializing packages before copying files to image"; \
   if [ -f "/root/docker/setup/02-packages.sh" ];then echo "Running the packages script";/root/docker/setup/02-packages.sh||{ echo "Failed to execute /root/docker/setup/02-packages.sh" >&2 && exit 10; };echo "Done running the packages script";fi; \
   echo ""
 
+COPY ./rootfs/. /
 COPY ./Dockerfile.3.15 /root/docker/Dockerfile
 
 RUN echo "Updating system files "; \
@@ -127,7 +125,7 @@ RUN echo "Updating system files "; \
   echo 'hosts: files dns' >"/etc/nsswitch.conf"; \
   [ "$PHP_VERSION" = "system" ] && PHP_VERSION="php" || true; \
   PHP_BIN="$(command -v ${PHP_VERSION} 2>/dev/null || true)"; \
-  set -- /usr/*bin/php*fpm*; [ -e "$1" ] && PHP_FPM="$1" || PHP_FPM=""; \
+  PHP_FPM="$(ls /usr/*bin/php*fpm* 2>/dev/null || true)"; \
   pip_bin="$(command -v python3 2>/dev/null || command -v python2 2>/dev/null || command -v python 2>/dev/null || true)"; \
   py_version="$(command $pip_bin --version | sed 's|[pP]ython ||g' | awk -F '.' '{print $1$2}' | grep '[0-9]' || true)"; \
   [ "$py_version" -gt "310" ] && pip_opts="--break-system-packages " || pip_opts=""; \
@@ -136,7 +134,7 @@ RUN echo "Updating system files "; \
   [ -n "$PHP_FPM" ] && [ -z "$(command -v php-fpm 2>/dev/null)" ] && ln -sf "$PHP_FPM" "/usr/bin/php-fpm" 2>/dev/null || true; \
   if [ -f "/etc/profile.d/color_prompt.sh.disabled" ]; then mv -f "/etc/profile.d/color_prompt.sh.disabled" "/etc/profile.d/color_prompt.sh";fi ; \
   { [ -f "/etc/bash/bashrc" ] && cp -Rf "/etc/bash/bashrc" "/root/.bashrc"; } || { [ -f "/etc/bashrc" ] && cp -Rf "/etc/bashrc" "/root/.bashrc"; } || { [ -f "/etc/bash.bashrc" ] && cp -Rf "/etc/bash.bashrc" "/root/.bashrc"; } || true; \
-  if [ -z "$(command -v "apt-get" 2>/dev/null)" ];then grep -sh -q 'alias quit' "/root/.bashrc" || printf '# Profile\n\n%s\n%s\n%s\n' '. /etc/profile' '. /root/.profile' "alias quit='exit 0 2>/dev/null'" >>"/root/.bashrc"; fi; \
+  if [ -z "$(command -v "apt-get" 2>/dev/null)" ];then grep -s -q 'alias quit' "/root/.bashrc" || printf '# Profile\n\n%s\n%s\n%s\n' '. /etc/profile' '. /root/.profile' "alias quit='exit 0 2>/dev/null'" >>"/root/.bashrc"; fi; \
   if [ "$PHP_VERSION" != "system" ] && [ -e "/etc/php" ] && [ -d "/etc/${PHP_VERSION}" ];then rm -Rf "/etc/php";fi; \
   if [ "$PHP_VERSION" != "system" ] && [ -n "${PHP_VERSION}" ] && [ -d "/etc/${PHP_VERSION}" ];then ln -sf "/etc/${PHP_VERSION}" "/etc/php";fi; \
   if [ -f "/root/docker/setup/03-files.sh" ];then echo "Running the files script";/root/docker/setup/03-files.sh||{ echo "Failed to execute /root/docker/setup/03-files.sh" >&2 && exit 10; };echo "Done running the files script";fi; \
@@ -144,7 +142,7 @@ RUN echo "Updating system files "; \
 
 RUN echo "Custom Settings"; \
   $SHELL_OPTS; \
-echo ""
+  echo ""
 
 RUN echo "Setting up users and scripts "; \
   $SHELL_OPTS; \
@@ -161,7 +159,7 @@ RUN echo "Setting OS Settings "; \
 
 RUN echo "Custom Applications"; \
   $SHELL_OPTS; \
-echo ""
+  echo ""
 
 RUN echo "Running custom commands"; \
   if [ -f "/root/docker/setup/05-custom.sh" ];then echo "Running the custom script";/root/docker/setup/05-custom.sh||{ echo "Failed to execute /root/docker/setup/05-custom.sh" && exit 10; };echo "Done running the custom script";fi; \
@@ -184,14 +182,13 @@ RUN echo "Deleting unneeded files"; \
   rm -rf /lib/systemd/system/sockets.target.wants/*udev* || true; \
   rm -rf /lib/systemd/system/sockets.target.wants/*initctl* || true; \
   rm -Rf /usr/share/doc/* /var/tmp/* /var/cache/*/* /root/.cache/* /usr/share/info/* /tmp/* || true; \
-  if [ -d "/lib/systemd/system/sysinit.target.wants" ];then cd "/lib/systemd/system/sysinit.target.wants" && for want_file in *; do [ "$want_file" = "systemd-tmpfiles-setup" ] || rm -f "$want_file"; done; fi; \
+  if [ -d "/lib/systemd/system/sysinit.target.wants" ];then cd "/lib/systemd/system/sysinit.target.wants" && rm -f $(ls | grep -v systemd-tmpfiles-setup);fi; \
   if [ -f "/root/docker/setup/07-cleanup.sh" ];then echo "Running the cleanup script";/root/docker/setup/07-cleanup.sh||{ echo "Failed to execute /root/docker/setup/07-cleanup.sh" >&2 && exit 10; };echo "Done running the cleanup script";fi; \
   echo ""
 
 RUN echo "Init done"
 FROM scratch
 ARG TZ
-ARG PATH
 ARG USER
 ARG TIMEZONE
 ARG LANGUAGE
@@ -201,46 +198,51 @@ ARG SERVICE_PORT
 ARG EXPOSE_PORTS
 ARG BUILD_VERSION
 ARG IMAGE_VERSION
-ARG GIT_COMMIT
 ARG WWW_ROOT_DIR
+ARG DEFAULT_FILE_DIR
+ARG DEFAULT_DATA_DIR
+ARG DEFAULT_CONF_DIR
+ARG DEFAULT_TEMPLATE_DIR
 ARG DISTRO_VERSION
 ARG NODE_VERSION
 ARG NODE_MANAGER
 ARG PHP_VERSION
 ARG PHP_SERVER
 ARG LICENSE="WTFPL"
-ARG ENV_PORTS="${EXPOSE_PORTS}"
+ARG ENV_PORTS=""
 
 USER ${USER}
 WORKDIR /root
 
 LABEL maintainer="CasjaysDev <docker-admin@casjaysdev.pro>"
 LABEL org.opencontainers.image.vendor="CasjaysDev"
-LABEL org.opencontainers.image.authors="CasjaysDev"
-LABEL org.opencontainers.image.licenses="${LICENSE}"
-LABEL org.opencontainers.image.title="${IMAGE_NAME}"
+LABEL org.opencontainers.image.authors="CasjaysDev <docker-admin@casjaysdev.pro"
 LABEL org.opencontainers.image.description="Containerized version of ${IMAGE_NAME}"
+LABEL org.opencontainers.image.title="${IMAGE_NAME}"
+LABEL org.opencontainers.image.base.name="${IMAGE_NAME}"
+LABEL org.opencontainers.image.authors="${LICENSE}"
 LABEL org.opencontainers.image.created="${BUILD_DATE}"
 LABEL org.opencontainers.image.version="${BUILD_VERSION}"
-LABEL org.opencontainers.image.revision="${GIT_COMMIT}"
+LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}"
 LABEL org.opencontainers.image.url="https://docker.io/casjaysdev/alpine"
 LABEL org.opencontainers.image.source="https://docker.io/casjaysdev/alpine"
-LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/alpine"
 LABEL org.opencontainers.image.vcs-type="Git"
+LABEL org.opencontainers.image.revision="${BUILD_VERSION}"
+LABEL org.opencontainers.image.source="https://github.com/dockersrc/alpine"
+LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/alpine"
 LABEL com.github.containers.toolbox="false"
 
 ENV ENV=~/.bashrc
 ENV USER="${USER}"
-ENV PATH="${PATH}"
-ENV TZ="${TIMEZONE}"
 ENV SHELL="/bin/bash"
+ENV TZ="${TIMEZONE}"
 ENV TIMEZONE="${TZ}"
 ENV LANG="${LANGUAGE}"
 ENV TERM="xterm-256color"
 ENV PORT="${SERVICE_PORT}"
 ENV ENV_PORTS="${ENV_PORTS}"
 ENV CONTAINER_NAME="${IMAGE_NAME}"
-ENV HOSTNAME="casjaysdevdocker-${IMAGE_NAME}"
+ENV HOSTNAME="casjaysdev-${IMAGE_NAME}"
 ENV PHP_SERVER="${PHP_SERVER}"
 ENV NODE_VERSION="${NODE_VERSION}"
 ENV NODE_MANAGER="${NODE_MANAGER}"
@@ -254,8 +256,6 @@ VOLUME [ "/config","/data" ]
 
 EXPOSE ${SERVICE_PORT} ${ENV_PORTS}
 
-STOPSIGNAL SIGRTMIN+3
-
-ENTRYPOINT [ "tini", "-p", "SIGTERM","--", "/usr/local/bin/entrypoint.sh" ]
+CMD [ "tail", "-f", "/dev/null" ]
+ENTRYPOINT [ "tini","--","/usr/local/bin/entrypoint.sh" ]
 HEALTHCHECK --start-period=10m --interval=5m --timeout=15s CMD [ "/usr/local/bin/entrypoint.sh", "healthcheck" ]
-
diff --git a/Dockerfile.3.16 b/Dockerfile.3.16
index db6988e..c65253c 100644
--- a/Dockerfile.3.16
+++ b/Dockerfile.3.16
@@ -1,11 +1,15 @@
+# syntax=docker/dockerfile:1
 # Docker image for alpine using the alpine template
 ARG IMAGE_NAME="alpine"
 ARG PHP_SERVER="alpine"
-ARG BUILD_DATE="202607111943"
+ARG BUILD_DATE="202408111050"
 ARG LANGUAGE="en_US.UTF-8"
 ARG TIMEZONE="America/New_York"
 ARG WWW_ROOT_DIR="/usr/local/share/httpd/default"
-ARG PATH="/usr/local/etc/docker/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+ARG DEFAULT_FILE_DIR="/usr/local/share/template-files"
+ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
+ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
+ARG DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults"
 
 ARG USER="root"
 ARG SHELL_OPTS="set -e -o pipefail"
@@ -21,7 +25,7 @@ ARG IMAGE_VERSION="3.16"
 ARG CONTAINER_VERSION=""
 
 ARG PULL_URL="alpine"
-ARG DISTRO_VERSION="3.16"
+ARG DISTRO_VERSION="${IMAGE_VERSION}"
 ARG BUILD_VERSION="${BUILD_DATE}"
 
 FROM tianon/gosu:latest AS gosu
@@ -38,47 +42,40 @@ ARG EXPOSE_PORTS
 ARG BUILD_VERSION
 ARG IMAGE_VERSION
 ARG WWW_ROOT_DIR
+ARG DEFAULT_FILE_DIR
+ARG DEFAULT_DATA_DIR
+ARG DEFAULT_CONF_DIR
+ARG DEFAULT_TEMPLATE_DIR
 ARG DISTRO_VERSION
 ARG NODE_VERSION
 ARG NODE_MANAGER
 ARG PHP_VERSION
 ARG PHP_SERVER
 ARG SHELL_OPTS
-ARG PATH
 
-ARG PACK_LIST="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates "
+ARG PACK_LIST="bash tini bash-completion git curl wget sudo unzip iproute2 openrc msmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates "
 
 ENV ENV=~/.profile
 ENV SHELL="/bin/sh"
-ENV PATH="${PATH}"
 ENV TZ="${TIMEZONE}"
 ENV TIMEZONE="${TZ}"
 ENV LANG="${LANGUAGE}"
 ENV TERM="xterm-256color"
-ENV HOSTNAME="casjaysdevdocker-alpine"
+ENV HOSTNAME="casjaysdev-alpine"
 
 USER ${USER}
 WORKDIR /root
 
-RUN set -e; \
-  echo "Updating the system"; \
-  apk upgrade --no-cache
-
-COPY ./rootfs/. /
-
-RUN set -e; \
-  echo "Ensuring bash and system certs are installed"; \
-  pkmgr install bash ca-certificates; \
-  update-ca-certificates
+COPY ./rootfs/usr/local/bin/. /usr/local/bin/
 
 RUN set -e; \
   echo "Setting up prerequisites"; \
   apk --no-cache add bash; \
   SH_CMD="$(which sh 2>/dev/null||command -v sh 2>/dev/null)"; \
   BASH_CMD="$(which bash 2>/dev/null||command -v bash 2>/dev/null)"; \
-  [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/bin/sh" || true; \
-  [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/usr/bin/sh" || true; \
-  [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && symlink "$BASH_CMD" "$SH_CMD" || true; \
+  [ -x "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/bin/sh" || true; \
+  [ -x "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/usr/bin/sh" || true; \
+  [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && ln -sf "$BASH_CMD" "$SH_CMD" || true; \
   [ -n "$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'$BASH_CMD'|g' "/etc/passwd" || true
 
 ENV SHELL="/bin/bash"
@@ -88,19 +85,19 @@ COPY --from=gosu /usr/local/bin/gosu /usr/local/bin/gosu
 
 RUN echo "Initializing the system"; \
   $SHELL_OPTS; \
-  mkdir -p "/root/docker/setup" "/etc/profile.d"; \
+  mkdir -p "${DEFAULT_DATA_DIR}" "${DEFAULT_CONF_DIR}" "${DEFAULT_TEMPLATE_DIR}" "/root/docker/setup" "/etc/profile.d"; \
   if [ -f "/root/docker/setup/00-init.sh" ];then echo "Running the init script";/root/docker/setup/00-init.sh||{ echo "Failed to execute /root/docker/setup/00-init.sh" >&2 && exit 10; };echo "Done running the init script";fi; \
   echo ""
 
 RUN echo "Creating and editing system files "; \
   $SHELL_OPTS; \
-
   rm -Rf "/etc/apk/repositories"; \
   [ "$DISTRO_VERSION" = "latest" ] && DISTRO_VERSION="edge";[ "$DISTRO_VERSION" = "edge" ] || DISTRO_VERSION="v${DISTRO_VERSION}"; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/main" >>"/etc/apk/repositories"; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/community" >>"/etc/apk/repositories"; \
   if [ "${DISTRO_VERSION}" = "edge" ]; then echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/testing" >>"/etc/apk/repositories";fi; \
-  apk update; apk upgrade --no-cache; \
+  apk update; \
+  apk upgrade --no-cache; \
   if [ -f "/root/docker/setup/01-system.sh" ];then echo "Running the system script";/root/docker/setup/01-system.sh||{ echo "Failed to execute /root/docker/setup/01-system.sh" >&2 && exit 10; };echo "Done running the system script";fi; \
   echo ""
 
@@ -118,6 +115,7 @@ RUN echo "Initializing packages before copying files to image"; \
   if [ -f "/root/docker/setup/02-packages.sh" ];then echo "Running the packages script";/root/docker/setup/02-packages.sh||{ echo "Failed to execute /root/docker/setup/02-packages.sh" >&2 && exit 10; };echo "Done running the packages script";fi; \
   echo ""
 
+COPY ./rootfs/. /
 COPY ./Dockerfile.3.16 /root/docker/Dockerfile
 
 RUN echo "Updating system files "; \
@@ -127,7 +125,7 @@ RUN echo "Updating system files "; \
   echo 'hosts: files dns' >"/etc/nsswitch.conf"; \
   [ "$PHP_VERSION" = "system" ] && PHP_VERSION="php" || true; \
   PHP_BIN="$(command -v ${PHP_VERSION} 2>/dev/null || true)"; \
-  set -- /usr/*bin/php*fpm*; [ -e "$1" ] && PHP_FPM="$1" || PHP_FPM=""; \
+  PHP_FPM="$(ls /usr/*bin/php*fpm* 2>/dev/null || true)"; \
   pip_bin="$(command -v python3 2>/dev/null || command -v python2 2>/dev/null || command -v python 2>/dev/null || true)"; \
   py_version="$(command $pip_bin --version | sed 's|[pP]ython ||g' | awk -F '.' '{print $1$2}' | grep '[0-9]' || true)"; \
   [ "$py_version" -gt "310" ] && pip_opts="--break-system-packages " || pip_opts=""; \
@@ -136,7 +134,7 @@ RUN echo "Updating system files "; \
   [ -n "$PHP_FPM" ] && [ -z "$(command -v php-fpm 2>/dev/null)" ] && ln -sf "$PHP_FPM" "/usr/bin/php-fpm" 2>/dev/null || true; \
   if [ -f "/etc/profile.d/color_prompt.sh.disabled" ]; then mv -f "/etc/profile.d/color_prompt.sh.disabled" "/etc/profile.d/color_prompt.sh";fi ; \
   { [ -f "/etc/bash/bashrc" ] && cp -Rf "/etc/bash/bashrc" "/root/.bashrc"; } || { [ -f "/etc/bashrc" ] && cp -Rf "/etc/bashrc" "/root/.bashrc"; } || { [ -f "/etc/bash.bashrc" ] && cp -Rf "/etc/bash.bashrc" "/root/.bashrc"; } || true; \
-  if [ -z "$(command -v "apt-get" 2>/dev/null)" ];then grep -sh -q 'alias quit' "/root/.bashrc" || printf '# Profile\n\n%s\n%s\n%s\n' '. /etc/profile' '. /root/.profile' "alias quit='exit 0 2>/dev/null'" >>"/root/.bashrc"; fi; \
+  if [ -z "$(command -v "apt-get" 2>/dev/null)" ];then grep -s -q 'alias quit' "/root/.bashrc" || printf '# Profile\n\n%s\n%s\n%s\n' '. /etc/profile' '. /root/.profile' "alias quit='exit 0 2>/dev/null'" >>"/root/.bashrc"; fi; \
   if [ "$PHP_VERSION" != "system" ] && [ -e "/etc/php" ] && [ -d "/etc/${PHP_VERSION}" ];then rm -Rf "/etc/php";fi; \
   if [ "$PHP_VERSION" != "system" ] && [ -n "${PHP_VERSION}" ] && [ -d "/etc/${PHP_VERSION}" ];then ln -sf "/etc/${PHP_VERSION}" "/etc/php";fi; \
   if [ -f "/root/docker/setup/03-files.sh" ];then echo "Running the files script";/root/docker/setup/03-files.sh||{ echo "Failed to execute /root/docker/setup/03-files.sh" >&2 && exit 10; };echo "Done running the files script";fi; \
@@ -144,7 +142,7 @@ RUN echo "Updating system files "; \
 
 RUN echo "Custom Settings"; \
   $SHELL_OPTS; \
-echo ""
+  echo ""
 
 RUN echo "Setting up users and scripts "; \
   $SHELL_OPTS; \
@@ -161,7 +159,7 @@ RUN echo "Setting OS Settings "; \
 
 RUN echo "Custom Applications"; \
   $SHELL_OPTS; \
-echo ""
+  echo ""
 
 RUN echo "Running custom commands"; \
   if [ -f "/root/docker/setup/05-custom.sh" ];then echo "Running the custom script";/root/docker/setup/05-custom.sh||{ echo "Failed to execute /root/docker/setup/05-custom.sh" && exit 10; };echo "Done running the custom script";fi; \
@@ -184,14 +182,13 @@ RUN echo "Deleting unneeded files"; \
   rm -rf /lib/systemd/system/sockets.target.wants/*udev* || true; \
   rm -rf /lib/systemd/system/sockets.target.wants/*initctl* || true; \
   rm -Rf /usr/share/doc/* /var/tmp/* /var/cache/*/* /root/.cache/* /usr/share/info/* /tmp/* || true; \
-  if [ -d "/lib/systemd/system/sysinit.target.wants" ];then cd "/lib/systemd/system/sysinit.target.wants" && for want_file in *; do [ "$want_file" = "systemd-tmpfiles-setup" ] || rm -f "$want_file"; done; fi; \
+  if [ -d "/lib/systemd/system/sysinit.target.wants" ];then cd "/lib/systemd/system/sysinit.target.wants" && rm -f $(ls | grep -v systemd-tmpfiles-setup);fi; \
   if [ -f "/root/docker/setup/07-cleanup.sh" ];then echo "Running the cleanup script";/root/docker/setup/07-cleanup.sh||{ echo "Failed to execute /root/docker/setup/07-cleanup.sh" >&2 && exit 10; };echo "Done running the cleanup script";fi; \
   echo ""
 
 RUN echo "Init done"
 FROM scratch
 ARG TZ
-ARG PATH
 ARG USER
 ARG TIMEZONE
 ARG LANGUAGE
@@ -201,46 +198,51 @@ ARG SERVICE_PORT
 ARG EXPOSE_PORTS
 ARG BUILD_VERSION
 ARG IMAGE_VERSION
-ARG GIT_COMMIT
 ARG WWW_ROOT_DIR
+ARG DEFAULT_FILE_DIR
+ARG DEFAULT_DATA_DIR
+ARG DEFAULT_CONF_DIR
+ARG DEFAULT_TEMPLATE_DIR
 ARG DISTRO_VERSION
 ARG NODE_VERSION
 ARG NODE_MANAGER
 ARG PHP_VERSION
 ARG PHP_SERVER
 ARG LICENSE="WTFPL"
-ARG ENV_PORTS="${EXPOSE_PORTS}"
+ARG ENV_PORTS=""
 
 USER ${USER}
 WORKDIR /root
 
 LABEL maintainer="CasjaysDev <docker-admin@casjaysdev.pro>"
 LABEL org.opencontainers.image.vendor="CasjaysDev"
-LABEL org.opencontainers.image.authors="CasjaysDev"
-LABEL org.opencontainers.image.licenses="${LICENSE}"
-LABEL org.opencontainers.image.title="${IMAGE_NAME}"
+LABEL org.opencontainers.image.authors="CasjaysDev <docker-admin@casjaysdev.pro"
 LABEL org.opencontainers.image.description="Containerized version of ${IMAGE_NAME}"
+LABEL org.opencontainers.image.title="${IMAGE_NAME}"
+LABEL org.opencontainers.image.base.name="${IMAGE_NAME}"
+LABEL org.opencontainers.image.authors="${LICENSE}"
 LABEL org.opencontainers.image.created="${BUILD_DATE}"
 LABEL org.opencontainers.image.version="${BUILD_VERSION}"
-LABEL org.opencontainers.image.revision="${GIT_COMMIT}"
+LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}"
 LABEL org.opencontainers.image.url="https://docker.io/casjaysdev/alpine"
 LABEL org.opencontainers.image.source="https://docker.io/casjaysdev/alpine"
-LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/alpine"
 LABEL org.opencontainers.image.vcs-type="Git"
+LABEL org.opencontainers.image.revision="${BUILD_VERSION}"
+LABEL org.opencontainers.image.source="https://github.com/dockersrc/alpine"
+LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/alpine"
 LABEL com.github.containers.toolbox="false"
 
 ENV ENV=~/.bashrc
 ENV USER="${USER}"
-ENV PATH="${PATH}"
-ENV TZ="${TIMEZONE}"
 ENV SHELL="/bin/bash"
+ENV TZ="${TIMEZONE}"
 ENV TIMEZONE="${TZ}"
 ENV LANG="${LANGUAGE}"
 ENV TERM="xterm-256color"
 ENV PORT="${SERVICE_PORT}"
 ENV ENV_PORTS="${ENV_PORTS}"
 ENV CONTAINER_NAME="${IMAGE_NAME}"
-ENV HOSTNAME="casjaysdevdocker-${IMAGE_NAME}"
+ENV HOSTNAME="casjaysdev-${IMAGE_NAME}"
 ENV PHP_SERVER="${PHP_SERVER}"
 ENV NODE_VERSION="${NODE_VERSION}"
 ENV NODE_MANAGER="${NODE_MANAGER}"
@@ -254,8 +256,6 @@ VOLUME [ "/config","/data" ]
 
 EXPOSE ${SERVICE_PORT} ${ENV_PORTS}
 
-STOPSIGNAL SIGRTMIN+3
-
-ENTRYPOINT [ "tini", "-p", "SIGTERM","--", "/usr/local/bin/entrypoint.sh" ]
+CMD [ "tail", "-f", "/dev/null" ]
+ENTRYPOINT [ "tini","--","/usr/local/bin/entrypoint.sh" ]
 HEALTHCHECK --start-period=10m --interval=5m --timeout=15s CMD [ "/usr/local/bin/entrypoint.sh", "healthcheck" ]
-
diff --git a/Dockerfile.3.17 b/Dockerfile.3.17
index 66b17ed..e91c71f 100644
--- a/Dockerfile.3.17
+++ b/Dockerfile.3.17
@@ -1,11 +1,15 @@
+# syntax=docker/dockerfile:1
 # Docker image for alpine using the alpine template
 ARG IMAGE_NAME="alpine"
 ARG PHP_SERVER="alpine"
-ARG BUILD_DATE="202607111946"
+ARG BUILD_DATE="202408111050"
 ARG LANGUAGE="en_US.UTF-8"
 ARG TIMEZONE="America/New_York"
 ARG WWW_ROOT_DIR="/usr/local/share/httpd/default"
-ARG PATH="/usr/local/etc/docker/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+ARG DEFAULT_FILE_DIR="/usr/local/share/template-files"
+ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
+ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
+ARG DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults"
 
 ARG USER="root"
 ARG SHELL_OPTS="set -e -o pipefail"
@@ -21,7 +25,7 @@ ARG IMAGE_VERSION="3.17"
 ARG CONTAINER_VERSION=""
 
 ARG PULL_URL="alpine"
-ARG DISTRO_VERSION="3.17"
+ARG DISTRO_VERSION="${IMAGE_VERSION}"
 ARG BUILD_VERSION="${BUILD_DATE}"
 
 FROM tianon/gosu:latest AS gosu
@@ -38,47 +42,40 @@ ARG EXPOSE_PORTS
 ARG BUILD_VERSION
 ARG IMAGE_VERSION
 ARG WWW_ROOT_DIR
+ARG DEFAULT_FILE_DIR
+ARG DEFAULT_DATA_DIR
+ARG DEFAULT_CONF_DIR
+ARG DEFAULT_TEMPLATE_DIR
 ARG DISTRO_VERSION
 ARG NODE_VERSION
 ARG NODE_MANAGER
 ARG PHP_VERSION
 ARG PHP_SERVER
 ARG SHELL_OPTS
-ARG PATH
 
-ARG PACK_LIST="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates "
+ARG PACK_LIST="bash tini bash-completion git curl wget sudo unzip iproute2 openrc msmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates "
 
 ENV ENV=~/.profile
 ENV SHELL="/bin/sh"
-ENV PATH="${PATH}"
 ENV TZ="${TIMEZONE}"
 ENV TIMEZONE="${TZ}"
 ENV LANG="${LANGUAGE}"
 ENV TERM="xterm-256color"
-ENV HOSTNAME="casjaysdevdocker-alpine"
+ENV HOSTNAME="casjaysdev-alpine"
 
 USER ${USER}
 WORKDIR /root
 
-RUN set -e; \
-  echo "Updating the system"; \
-  apk upgrade --no-cache
-
-COPY ./rootfs/. /
-
-RUN set -e; \
-  echo "Ensuring bash and system certs are installed"; \
-  pkmgr install bash ca-certificates; \
-  update-ca-certificates
+COPY ./rootfs/usr/local/bin/. /usr/local/bin/
 
 RUN set -e; \
   echo "Setting up prerequisites"; \
   apk --no-cache add bash; \
   SH_CMD="$(which sh 2>/dev/null||command -v sh 2>/dev/null)"; \
   BASH_CMD="$(which bash 2>/dev/null||command -v bash 2>/dev/null)"; \
-  [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/bin/sh" || true; \
-  [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/usr/bin/sh" || true; \
-  [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && symlink "$BASH_CMD" "$SH_CMD" || true; \
+  [ -x "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/bin/sh" || true; \
+  [ -x "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/usr/bin/sh" || true; \
+  [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && ln -sf "$BASH_CMD" "$SH_CMD" || true; \
   [ -n "$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'$BASH_CMD'|g' "/etc/passwd" || true
 
 ENV SHELL="/bin/bash"
@@ -88,19 +85,19 @@ COPY --from=gosu /usr/local/bin/gosu /usr/local/bin/gosu
 
 RUN echo "Initializing the system"; \
   $SHELL_OPTS; \
-  mkdir -p "/root/docker/setup" "/etc/profile.d"; \
+  mkdir -p "${DEFAULT_DATA_DIR}" "${DEFAULT_CONF_DIR}" "${DEFAULT_TEMPLATE_DIR}" "/root/docker/setup" "/etc/profile.d"; \
   if [ -f "/root/docker/setup/00-init.sh" ];then echo "Running the init script";/root/docker/setup/00-init.sh||{ echo "Failed to execute /root/docker/setup/00-init.sh" >&2 && exit 10; };echo "Done running the init script";fi; \
   echo ""
 
 RUN echo "Creating and editing system files "; \
   $SHELL_OPTS; \
-
   rm -Rf "/etc/apk/repositories"; \
   [ "$DISTRO_VERSION" = "latest" ] && DISTRO_VERSION="edge";[ "$DISTRO_VERSION" = "edge" ] || DISTRO_VERSION="v${DISTRO_VERSION}"; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/main" >>"/etc/apk/repositories"; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/community" >>"/etc/apk/repositories"; \
   if [ "${DISTRO_VERSION}" = "edge" ]; then echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/testing" >>"/etc/apk/repositories";fi; \
-  apk update; apk upgrade --no-cache; \
+  apk update; \
+  apk upgrade --no-cache; \
   if [ -f "/root/docker/setup/01-system.sh" ];then echo "Running the system script";/root/docker/setup/01-system.sh||{ echo "Failed to execute /root/docker/setup/01-system.sh" >&2 && exit 10; };echo "Done running the system script";fi; \
   echo ""
 
@@ -118,6 +115,7 @@ RUN echo "Initializing packages before copying files to image"; \
   if [ -f "/root/docker/setup/02-packages.sh" ];then echo "Running the packages script";/root/docker/setup/02-packages.sh||{ echo "Failed to execute /root/docker/setup/02-packages.sh" >&2 && exit 10; };echo "Done running the packages script";fi; \
   echo ""
 
+COPY ./rootfs/. /
 COPY ./Dockerfile.3.17 /root/docker/Dockerfile
 
 RUN echo "Updating system files "; \
@@ -127,7 +125,7 @@ RUN echo "Updating system files "; \
   echo 'hosts: files dns' >"/etc/nsswitch.conf"; \
   [ "$PHP_VERSION" = "system" ] && PHP_VERSION="php" || true; \
   PHP_BIN="$(command -v ${PHP_VERSION} 2>/dev/null || true)"; \
-  set -- /usr/*bin/php*fpm*; [ -e "$1" ] && PHP_FPM="$1" || PHP_FPM=""; \
+  PHP_FPM="$(ls /usr/*bin/php*fpm* 2>/dev/null || true)"; \
   pip_bin="$(command -v python3 2>/dev/null || command -v python2 2>/dev/null || command -v python 2>/dev/null || true)"; \
   py_version="$(command $pip_bin --version | sed 's|[pP]ython ||g' | awk -F '.' '{print $1$2}' | grep '[0-9]' || true)"; \
   [ "$py_version" -gt "310" ] && pip_opts="--break-system-packages " || pip_opts=""; \
@@ -136,7 +134,7 @@ RUN echo "Updating system files "; \
   [ -n "$PHP_FPM" ] && [ -z "$(command -v php-fpm 2>/dev/null)" ] && ln -sf "$PHP_FPM" "/usr/bin/php-fpm" 2>/dev/null || true; \
   if [ -f "/etc/profile.d/color_prompt.sh.disabled" ]; then mv -f "/etc/profile.d/color_prompt.sh.disabled" "/etc/profile.d/color_prompt.sh";fi ; \
   { [ -f "/etc/bash/bashrc" ] && cp -Rf "/etc/bash/bashrc" "/root/.bashrc"; } || { [ -f "/etc/bashrc" ] && cp -Rf "/etc/bashrc" "/root/.bashrc"; } || { [ -f "/etc/bash.bashrc" ] && cp -Rf "/etc/bash.bashrc" "/root/.bashrc"; } || true; \
-  if [ -z "$(command -v "apt-get" 2>/dev/null)" ];then grep -sh -q 'alias quit' "/root/.bashrc" || printf '# Profile\n\n%s\n%s\n%s\n' '. /etc/profile' '. /root/.profile' "alias quit='exit 0 2>/dev/null'" >>"/root/.bashrc"; fi; \
+  if [ -z "$(command -v "apt-get" 2>/dev/null)" ];then grep -s -q 'alias quit' "/root/.bashrc" || printf '# Profile\n\n%s\n%s\n%s\n' '. /etc/profile' '. /root/.profile' "alias quit='exit 0 2>/dev/null'" >>"/root/.bashrc"; fi; \
   if [ "$PHP_VERSION" != "system" ] && [ -e "/etc/php" ] && [ -d "/etc/${PHP_VERSION}" ];then rm -Rf "/etc/php";fi; \
   if [ "$PHP_VERSION" != "system" ] && [ -n "${PHP_VERSION}" ] && [ -d "/etc/${PHP_VERSION}" ];then ln -sf "/etc/${PHP_VERSION}" "/etc/php";fi; \
   if [ -f "/root/docker/setup/03-files.sh" ];then echo "Running the files script";/root/docker/setup/03-files.sh||{ echo "Failed to execute /root/docker/setup/03-files.sh" >&2 && exit 10; };echo "Done running the files script";fi; \
@@ -144,7 +142,7 @@ RUN echo "Updating system files "; \
 
 RUN echo "Custom Settings"; \
   $SHELL_OPTS; \
-echo ""
+  echo ""
 
 RUN echo "Setting up users and scripts "; \
   $SHELL_OPTS; \
@@ -161,7 +159,7 @@ RUN echo "Setting OS Settings "; \
 
 RUN echo "Custom Applications"; \
   $SHELL_OPTS; \
-echo ""
+  echo ""
 
 RUN echo "Running custom commands"; \
   if [ -f "/root/docker/setup/05-custom.sh" ];then echo "Running the custom script";/root/docker/setup/05-custom.sh||{ echo "Failed to execute /root/docker/setup/05-custom.sh" && exit 10; };echo "Done running the custom script";fi; \
@@ -184,14 +182,13 @@ RUN echo "Deleting unneeded files"; \
   rm -rf /lib/systemd/system/sockets.target.wants/*udev* || true; \
   rm -rf /lib/systemd/system/sockets.target.wants/*initctl* || true; \
   rm -Rf /usr/share/doc/* /var/tmp/* /var/cache/*/* /root/.cache/* /usr/share/info/* /tmp/* || true; \
-  if [ -d "/lib/systemd/system/sysinit.target.wants" ];then cd "/lib/systemd/system/sysinit.target.wants" && for want_file in *; do [ "$want_file" = "systemd-tmpfiles-setup" ] || rm -f "$want_file"; done; fi; \
+  if [ -d "/lib/systemd/system/sysinit.target.wants" ];then cd "/lib/systemd/system/sysinit.target.wants" && rm -f $(ls | grep -v systemd-tmpfiles-setup);fi; \
   if [ -f "/root/docker/setup/07-cleanup.sh" ];then echo "Running the cleanup script";/root/docker/setup/07-cleanup.sh||{ echo "Failed to execute /root/docker/setup/07-cleanup.sh" >&2 && exit 10; };echo "Done running the cleanup script";fi; \
   echo ""
 
 RUN echo "Init done"
 FROM scratch
 ARG TZ
-ARG PATH
 ARG USER
 ARG TIMEZONE
 ARG LANGUAGE
@@ -201,46 +198,51 @@ ARG SERVICE_PORT
 ARG EXPOSE_PORTS
 ARG BUILD_VERSION
 ARG IMAGE_VERSION
-ARG GIT_COMMIT
 ARG WWW_ROOT_DIR
+ARG DEFAULT_FILE_DIR
+ARG DEFAULT_DATA_DIR
+ARG DEFAULT_CONF_DIR
+ARG DEFAULT_TEMPLATE_DIR
 ARG DISTRO_VERSION
 ARG NODE_VERSION
 ARG NODE_MANAGER
 ARG PHP_VERSION
 ARG PHP_SERVER
 ARG LICENSE="WTFPL"
-ARG ENV_PORTS="${EXPOSE_PORTS}"
+ARG ENV_PORTS=""
 
 USER ${USER}
 WORKDIR /root
 
 LABEL maintainer="CasjaysDev <docker-admin@casjaysdev.pro>"
 LABEL org.opencontainers.image.vendor="CasjaysDev"
-LABEL org.opencontainers.image.authors="CasjaysDev"
-LABEL org.opencontainers.image.licenses="${LICENSE}"
-LABEL org.opencontainers.image.title="${IMAGE_NAME}"
+LABEL org.opencontainers.image.authors="CasjaysDev <docker-admin@casjaysdev.pro"
 LABEL org.opencontainers.image.description="Containerized version of ${IMAGE_NAME}"
+LABEL org.opencontainers.image.title="${IMAGE_NAME}"
+LABEL org.opencontainers.image.base.name="${IMAGE_NAME}"
+LABEL org.opencontainers.image.authors="${LICENSE}"
 LABEL org.opencontainers.image.created="${BUILD_DATE}"
 LABEL org.opencontainers.image.version="${BUILD_VERSION}"
-LABEL org.opencontainers.image.revision="${GIT_COMMIT}"
+LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}"
 LABEL org.opencontainers.image.url="https://docker.io/casjaysdev/alpine"
 LABEL org.opencontainers.image.source="https://docker.io/casjaysdev/alpine"
-LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/alpine"
 LABEL org.opencontainers.image.vcs-type="Git"
+LABEL org.opencontainers.image.revision="${BUILD_VERSION}"
+LABEL org.opencontainers.image.source="https://github.com/dockersrc/alpine"
+LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/alpine"
 LABEL com.github.containers.toolbox="false"
 
 ENV ENV=~/.bashrc
 ENV USER="${USER}"
-ENV PATH="${PATH}"
-ENV TZ="${TIMEZONE}"
 ENV SHELL="/bin/bash"
+ENV TZ="${TIMEZONE}"
 ENV TIMEZONE="${TZ}"
 ENV LANG="${LANGUAGE}"
 ENV TERM="xterm-256color"
 ENV PORT="${SERVICE_PORT}"
 ENV ENV_PORTS="${ENV_PORTS}"
 ENV CONTAINER_NAME="${IMAGE_NAME}"
-ENV HOSTNAME="casjaysdevdocker-${IMAGE_NAME}"
+ENV HOSTNAME="casjaysdev-${IMAGE_NAME}"
 ENV PHP_SERVER="${PHP_SERVER}"
 ENV NODE_VERSION="${NODE_VERSION}"
 ENV NODE_MANAGER="${NODE_MANAGER}"
@@ -254,8 +256,6 @@ VOLUME [ "/config","/data" ]
 
 EXPOSE ${SERVICE_PORT} ${ENV_PORTS}
 
-STOPSIGNAL SIGRTMIN+3
-
-ENTRYPOINT [ "tini", "-p", "SIGTERM","--", "/usr/local/bin/entrypoint.sh" ]
+CMD [ "tail", "-f", "/dev/null" ]
+ENTRYPOINT [ "tini","--","/usr/local/bin/entrypoint.sh" ]
 HEALTHCHECK --start-period=10m --interval=5m --timeout=15s CMD [ "/usr/local/bin/entrypoint.sh", "healthcheck" ]
-
diff --git a/Dockerfile.3.18 b/Dockerfile.3.18
index bac3d9a..cef7284 100644
--- a/Dockerfile.3.18
+++ b/Dockerfile.3.18
@@ -1,11 +1,15 @@
+# syntax=docker/dockerfile:1
 # Docker image for alpine using the alpine template
 ARG IMAGE_NAME="alpine"
 ARG PHP_SERVER="alpine"
-ARG BUILD_DATE="202607111956"
+ARG BUILD_DATE="202408111050"
 ARG LANGUAGE="en_US.UTF-8"
 ARG TIMEZONE="America/New_York"
 ARG WWW_ROOT_DIR="/usr/local/share/httpd/default"
-ARG PATH="/usr/local/etc/docker/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+ARG DEFAULT_FILE_DIR="/usr/local/share/template-files"
+ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
+ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
+ARG DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults"
 
 ARG USER="root"
 ARG SHELL_OPTS="set -e -o pipefail"
@@ -21,7 +25,7 @@ ARG IMAGE_VERSION="3.18"
 ARG CONTAINER_VERSION=""
 
 ARG PULL_URL="alpine"
-ARG DISTRO_VERSION="3.18"
+ARG DISTRO_VERSION="${IMAGE_VERSION}"
 ARG BUILD_VERSION="${BUILD_DATE}"
 
 FROM tianon/gosu:latest AS gosu
@@ -38,47 +42,40 @@ ARG EXPOSE_PORTS
 ARG BUILD_VERSION
 ARG IMAGE_VERSION
 ARG WWW_ROOT_DIR
+ARG DEFAULT_FILE_DIR
+ARG DEFAULT_DATA_DIR
+ARG DEFAULT_CONF_DIR
+ARG DEFAULT_TEMPLATE_DIR
 ARG DISTRO_VERSION
 ARG NODE_VERSION
 ARG NODE_MANAGER
 ARG PHP_VERSION
 ARG PHP_SERVER
 ARG SHELL_OPTS
-ARG PATH
 
-ARG PACK_LIST="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates "
+ARG PACK_LIST="bash tini bash-completion git curl wget sudo unzip iproute2 openrc msmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates "
 
 ENV ENV=~/.profile
 ENV SHELL="/bin/sh"
-ENV PATH="${PATH}"
 ENV TZ="${TIMEZONE}"
 ENV TIMEZONE="${TZ}"
 ENV LANG="${LANGUAGE}"
 ENV TERM="xterm-256color"
-ENV HOSTNAME="casjaysdevdocker-alpine"
+ENV HOSTNAME="casjaysdev-alpine"
 
 USER ${USER}
 WORKDIR /root
 
-RUN set -e; \
-  echo "Updating the system"; \
-  apk upgrade --no-cache
-
-COPY ./rootfs/. /
-
-RUN set -e; \
-  echo "Ensuring bash and system certs are installed"; \
-  pkmgr install bash ca-certificates; \
-  update-ca-certificates
+COPY ./rootfs/usr/local/bin/. /usr/local/bin/
 
 RUN set -e; \
   echo "Setting up prerequisites"; \
   apk --no-cache add bash; \
   SH_CMD="$(which sh 2>/dev/null||command -v sh 2>/dev/null)"; \
   BASH_CMD="$(which bash 2>/dev/null||command -v bash 2>/dev/null)"; \
-  [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/bin/sh" || true; \
-  [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/usr/bin/sh" || true; \
-  [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && symlink "$BASH_CMD" "$SH_CMD" || true; \
+  [ -x "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/bin/sh" || true; \
+  [ -x "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/usr/bin/sh" || true; \
+  [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && ln -sf "$BASH_CMD" "$SH_CMD" || true; \
   [ -n "$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'$BASH_CMD'|g' "/etc/passwd" || true
 
 ENV SHELL="/bin/bash"
@@ -88,19 +85,19 @@ COPY --from=gosu /usr/local/bin/gosu /usr/local/bin/gosu
 
 RUN echo "Initializing the system"; \
   $SHELL_OPTS; \
-  mkdir -p "/root/docker/setup" "/etc/profile.d"; \
+  mkdir -p "${DEFAULT_DATA_DIR}" "${DEFAULT_CONF_DIR}" "${DEFAULT_TEMPLATE_DIR}" "/root/docker/setup" "/etc/profile.d"; \
   if [ -f "/root/docker/setup/00-init.sh" ];then echo "Running the init script";/root/docker/setup/00-init.sh||{ echo "Failed to execute /root/docker/setup/00-init.sh" >&2 && exit 10; };echo "Done running the init script";fi; \
   echo ""
 
 RUN echo "Creating and editing system files "; \
   $SHELL_OPTS; \
-
   rm -Rf "/etc/apk/repositories"; \
   [ "$DISTRO_VERSION" = "latest" ] && DISTRO_VERSION="edge";[ "$DISTRO_VERSION" = "edge" ] || DISTRO_VERSION="v${DISTRO_VERSION}"; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/main" >>"/etc/apk/repositories"; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/community" >>"/etc/apk/repositories"; \
   if [ "${DISTRO_VERSION}" = "edge" ]; then echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/testing" >>"/etc/apk/repositories";fi; \
-  apk update; apk upgrade --no-cache; \
+  apk update; \
+  apk upgrade --no-cache; \
   if [ -f "/root/docker/setup/01-system.sh" ];then echo "Running the system script";/root/docker/setup/01-system.sh||{ echo "Failed to execute /root/docker/setup/01-system.sh" >&2 && exit 10; };echo "Done running the system script";fi; \
   echo ""
 
@@ -118,6 +115,7 @@ RUN echo "Initializing packages before copying files to image"; \
   if [ -f "/root/docker/setup/02-packages.sh" ];then echo "Running the packages script";/root/docker/setup/02-packages.sh||{ echo "Failed to execute /root/docker/setup/02-packages.sh" >&2 && exit 10; };echo "Done running the packages script";fi; \
   echo ""
 
+COPY ./rootfs/. /
 COPY ./Dockerfile.3.18 /root/docker/Dockerfile
 
 RUN echo "Updating system files "; \
@@ -127,7 +125,7 @@ RUN echo "Updating system files "; \
   echo 'hosts: files dns' >"/etc/nsswitch.conf"; \
   [ "$PHP_VERSION" = "system" ] && PHP_VERSION="php" || true; \
   PHP_BIN="$(command -v ${PHP_VERSION} 2>/dev/null || true)"; \
-  set -- /usr/*bin/php*fpm*; [ -e "$1" ] && PHP_FPM="$1" || PHP_FPM=""; \
+  PHP_FPM="$(ls /usr/*bin/php*fpm* 2>/dev/null || true)"; \
   pip_bin="$(command -v python3 2>/dev/null || command -v python2 2>/dev/null || command -v python 2>/dev/null || true)"; \
   py_version="$(command $pip_bin --version | sed 's|[pP]ython ||g' | awk -F '.' '{print $1$2}' | grep '[0-9]' || true)"; \
   [ "$py_version" -gt "310" ] && pip_opts="--break-system-packages " || pip_opts=""; \
@@ -136,7 +134,7 @@ RUN echo "Updating system files "; \
   [ -n "$PHP_FPM" ] && [ -z "$(command -v php-fpm 2>/dev/null)" ] && ln -sf "$PHP_FPM" "/usr/bin/php-fpm" 2>/dev/null || true; \
   if [ -f "/etc/profile.d/color_prompt.sh.disabled" ]; then mv -f "/etc/profile.d/color_prompt.sh.disabled" "/etc/profile.d/color_prompt.sh";fi ; \
   { [ -f "/etc/bash/bashrc" ] && cp -Rf "/etc/bash/bashrc" "/root/.bashrc"; } || { [ -f "/etc/bashrc" ] && cp -Rf "/etc/bashrc" "/root/.bashrc"; } || { [ -f "/etc/bash.bashrc" ] && cp -Rf "/etc/bash.bashrc" "/root/.bashrc"; } || true; \
-  if [ -z "$(command -v "apt-get" 2>/dev/null)" ];then grep -sh -q 'alias quit' "/root/.bashrc" || printf '# Profile\n\n%s\n%s\n%s\n' '. /etc/profile' '. /root/.profile' "alias quit='exit 0 2>/dev/null'" >>"/root/.bashrc"; fi; \
+  if [ -z "$(command -v "apt-get" 2>/dev/null)" ];then grep -s -q 'alias quit' "/root/.bashrc" || printf '# Profile\n\n%s\n%s\n%s\n' '. /etc/profile' '. /root/.profile' "alias quit='exit 0 2>/dev/null'" >>"/root/.bashrc"; fi; \
   if [ "$PHP_VERSION" != "system" ] && [ -e "/etc/php" ] && [ -d "/etc/${PHP_VERSION}" ];then rm -Rf "/etc/php";fi; \
   if [ "$PHP_VERSION" != "system" ] && [ -n "${PHP_VERSION}" ] && [ -d "/etc/${PHP_VERSION}" ];then ln -sf "/etc/${PHP_VERSION}" "/etc/php";fi; \
   if [ -f "/root/docker/setup/03-files.sh" ];then echo "Running the files script";/root/docker/setup/03-files.sh||{ echo "Failed to execute /root/docker/setup/03-files.sh" >&2 && exit 10; };echo "Done running the files script";fi; \
@@ -144,7 +142,7 @@ RUN echo "Updating system files "; \
 
 RUN echo "Custom Settings"; \
   $SHELL_OPTS; \
-echo ""
+  echo ""
 
 RUN echo "Setting up users and scripts "; \
   $SHELL_OPTS; \
@@ -161,7 +159,7 @@ RUN echo "Setting OS Settings "; \
 
 RUN echo "Custom Applications"; \
   $SHELL_OPTS; \
-echo ""
+  echo ""
 
 RUN echo "Running custom commands"; \
   if [ -f "/root/docker/setup/05-custom.sh" ];then echo "Running the custom script";/root/docker/setup/05-custom.sh||{ echo "Failed to execute /root/docker/setup/05-custom.sh" && exit 10; };echo "Done running the custom script";fi; \
@@ -184,14 +182,13 @@ RUN echo "Deleting unneeded files"; \
   rm -rf /lib/systemd/system/sockets.target.wants/*udev* || true; \
   rm -rf /lib/systemd/system/sockets.target.wants/*initctl* || true; \
   rm -Rf /usr/share/doc/* /var/tmp/* /var/cache/*/* /root/.cache/* /usr/share/info/* /tmp/* || true; \
-  if [ -d "/lib/systemd/system/sysinit.target.wants" ];then cd "/lib/systemd/system/sysinit.target.wants" && for want_file in *; do [ "$want_file" = "systemd-tmpfiles-setup" ] || rm -f "$want_file"; done; fi; \
+  if [ -d "/lib/systemd/system/sysinit.target.wants" ];then cd "/lib/systemd/system/sysinit.target.wants" && rm -f $(ls | grep -v systemd-tmpfiles-setup);fi; \
   if [ -f "/root/docker/setup/07-cleanup.sh" ];then echo "Running the cleanup script";/root/docker/setup/07-cleanup.sh||{ echo "Failed to execute /root/docker/setup/07-cleanup.sh" >&2 && exit 10; };echo "Done running the cleanup script";fi; \
   echo ""
 
 RUN echo "Init done"
 FROM scratch
 ARG TZ
-ARG PATH
 ARG USER
 ARG TIMEZONE
 ARG LANGUAGE
@@ -201,46 +198,51 @@ ARG SERVICE_PORT
 ARG EXPOSE_PORTS
 ARG BUILD_VERSION
 ARG IMAGE_VERSION
-ARG GIT_COMMIT
 ARG WWW_ROOT_DIR
+ARG DEFAULT_FILE_DIR
+ARG DEFAULT_DATA_DIR
+ARG DEFAULT_CONF_DIR
+ARG DEFAULT_TEMPLATE_DIR
 ARG DISTRO_VERSION
 ARG NODE_VERSION
 ARG NODE_MANAGER
 ARG PHP_VERSION
 ARG PHP_SERVER
 ARG LICENSE="WTFPL"
-ARG ENV_PORTS="${EXPOSE_PORTS}"
+ARG ENV_PORTS=""
 
 USER ${USER}
 WORKDIR /root
 
 LABEL maintainer="CasjaysDev <docker-admin@casjaysdev.pro>"
 LABEL org.opencontainers.image.vendor="CasjaysDev"
-LABEL org.opencontainers.image.authors="CasjaysDev"
-LABEL org.opencontainers.image.licenses="${LICENSE}"
-LABEL org.opencontainers.image.title="${IMAGE_NAME}"
+LABEL org.opencontainers.image.authors="CasjaysDev <docker-admin@casjaysdev.pro"
 LABEL org.opencontainers.image.description="Containerized version of ${IMAGE_NAME}"
+LABEL org.opencontainers.image.title="${IMAGE_NAME}"
+LABEL org.opencontainers.image.base.name="${IMAGE_NAME}"
+LABEL org.opencontainers.image.authors="${LICENSE}"
 LABEL org.opencontainers.image.created="${BUILD_DATE}"
 LABEL org.opencontainers.image.version="${BUILD_VERSION}"
-LABEL org.opencontainers.image.revision="${GIT_COMMIT}"
+LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}"
 LABEL org.opencontainers.image.url="https://docker.io/casjaysdev/alpine"
 LABEL org.opencontainers.image.source="https://docker.io/casjaysdev/alpine"
-LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/alpine"
 LABEL org.opencontainers.image.vcs-type="Git"
+LABEL org.opencontainers.image.revision="${BUILD_VERSION}"
+LABEL org.opencontainers.image.source="https://github.com/dockersrc/alpine"
+LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/alpine"
 LABEL com.github.containers.toolbox="false"
 
 ENV ENV=~/.bashrc
 ENV USER="${USER}"
-ENV PATH="${PATH}"
-ENV TZ="${TIMEZONE}"
 ENV SHELL="/bin/bash"
+ENV TZ="${TIMEZONE}"
 ENV TIMEZONE="${TZ}"
 ENV LANG="${LANGUAGE}"
 ENV TERM="xterm-256color"
 ENV PORT="${SERVICE_PORT}"
 ENV ENV_PORTS="${ENV_PORTS}"
 ENV CONTAINER_NAME="${IMAGE_NAME}"
-ENV HOSTNAME="casjaysdevdocker-${IMAGE_NAME}"
+ENV HOSTNAME="casjaysdev-${IMAGE_NAME}"
 ENV PHP_SERVER="${PHP_SERVER}"
 ENV NODE_VERSION="${NODE_VERSION}"
 ENV NODE_MANAGER="${NODE_MANAGER}"
@@ -254,8 +256,6 @@ VOLUME [ "/config","/data" ]
 
 EXPOSE ${SERVICE_PORT} ${ENV_PORTS}
 
-STOPSIGNAL SIGRTMIN+3
-
-ENTRYPOINT [ "tini", "-p", "SIGTERM","--", "/usr/local/bin/entrypoint.sh" ]
+CMD [ "tail", "-f", "/dev/null" ]
+ENTRYPOINT [ "tini","--","/usr/local/bin/entrypoint.sh" ]
 HEALTHCHECK --start-period=10m --interval=5m --timeout=15s CMD [ "/usr/local/bin/entrypoint.sh", "healthcheck" ]
-
diff --git a/Dockerfile.3.19 b/Dockerfile.3.19
index 9e5375b..0227077 100644
--- a/Dockerfile.3.19
+++ b/Dockerfile.3.19
@@ -1,11 +1,15 @@
+# syntax=docker/dockerfile:1
 # Docker image for alpine using the alpine template
 ARG IMAGE_NAME="alpine"
 ARG PHP_SERVER="alpine"
-ARG BUILD_DATE="202607111957"
+ARG BUILD_DATE="202408111050"
 ARG LANGUAGE="en_US.UTF-8"
 ARG TIMEZONE="America/New_York"
 ARG WWW_ROOT_DIR="/usr/local/share/httpd/default"
-ARG PATH="/usr/local/etc/docker/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+ARG DEFAULT_FILE_DIR="/usr/local/share/template-files"
+ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
+ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
+ARG DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults"
 
 ARG USER="root"
 ARG SHELL_OPTS="set -e -o pipefail"
@@ -21,7 +25,7 @@ ARG IMAGE_VERSION="3.19"
 ARG CONTAINER_VERSION=""
 
 ARG PULL_URL="alpine"
-ARG DISTRO_VERSION="3.19"
+ARG DISTRO_VERSION="${IMAGE_VERSION}"
 ARG BUILD_VERSION="${BUILD_DATE}"
 
 FROM tianon/gosu:latest AS gosu
@@ -38,47 +42,40 @@ ARG EXPOSE_PORTS
 ARG BUILD_VERSION
 ARG IMAGE_VERSION
 ARG WWW_ROOT_DIR
+ARG DEFAULT_FILE_DIR
+ARG DEFAULT_DATA_DIR
+ARG DEFAULT_CONF_DIR
+ARG DEFAULT_TEMPLATE_DIR
 ARG DISTRO_VERSION
 ARG NODE_VERSION
 ARG NODE_MANAGER
 ARG PHP_VERSION
 ARG PHP_SERVER
 ARG SHELL_OPTS
-ARG PATH
 
-ARG PACK_LIST="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates "
+ARG PACK_LIST="bash tini bash-completion git curl wget sudo unzip iproute2 openrc msmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates "
 
 ENV ENV=~/.profile
 ENV SHELL="/bin/sh"
-ENV PATH="${PATH}"
 ENV TZ="${TIMEZONE}"
 ENV TIMEZONE="${TZ}"
 ENV LANG="${LANGUAGE}"
 ENV TERM="xterm-256color"
-ENV HOSTNAME="casjaysdevdocker-alpine"
+ENV HOSTNAME="casjaysdev-alpine"
 
 USER ${USER}
 WORKDIR /root
 
-RUN set -e; \
-  echo "Updating the system"; \
-  apk upgrade --no-cache
-
-COPY ./rootfs/. /
-
-RUN set -e; \
-  echo "Ensuring bash and system certs are installed"; \
-  pkmgr install bash ca-certificates; \
-  update-ca-certificates
+COPY ./rootfs/usr/local/bin/. /usr/local/bin/
 
 RUN set -e; \
   echo "Setting up prerequisites"; \
   apk --no-cache add bash; \
   SH_CMD="$(which sh 2>/dev/null||command -v sh 2>/dev/null)"; \
   BASH_CMD="$(which bash 2>/dev/null||command -v bash 2>/dev/null)"; \
-  [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/bin/sh" || true; \
-  [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/usr/bin/sh" || true; \
-  [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && symlink "$BASH_CMD" "$SH_CMD" || true; \
+  [ -x "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/bin/sh" || true; \
+  [ -x "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/usr/bin/sh" || true; \
+  [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && ln -sf "$BASH_CMD" "$SH_CMD" || true; \
   [ -n "$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'$BASH_CMD'|g' "/etc/passwd" || true
 
 ENV SHELL="/bin/bash"
@@ -88,19 +85,19 @@ COPY --from=gosu /usr/local/bin/gosu /usr/local/bin/gosu
 
 RUN echo "Initializing the system"; \
   $SHELL_OPTS; \
-  mkdir -p "/root/docker/setup" "/etc/profile.d"; \
+  mkdir -p "${DEFAULT_DATA_DIR}" "${DEFAULT_CONF_DIR}" "${DEFAULT_TEMPLATE_DIR}" "/root/docker/setup" "/etc/profile.d"; \
   if [ -f "/root/docker/setup/00-init.sh" ];then echo "Running the init script";/root/docker/setup/00-init.sh||{ echo "Failed to execute /root/docker/setup/00-init.sh" >&2 && exit 10; };echo "Done running the init script";fi; \
   echo ""
 
 RUN echo "Creating and editing system files "; \
   $SHELL_OPTS; \
-
   rm -Rf "/etc/apk/repositories"; \
   [ "$DISTRO_VERSION" = "latest" ] && DISTRO_VERSION="edge";[ "$DISTRO_VERSION" = "edge" ] || DISTRO_VERSION="v${DISTRO_VERSION}"; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/main" >>"/etc/apk/repositories"; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/community" >>"/etc/apk/repositories"; \
   if [ "${DISTRO_VERSION}" = "edge" ]; then echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/testing" >>"/etc/apk/repositories";fi; \
-  apk update; apk upgrade --no-cache; \
+  apk update; \
+  apk upgrade --no-cache; \
   if [ -f "/root/docker/setup/01-system.sh" ];then echo "Running the system script";/root/docker/setup/01-system.sh||{ echo "Failed to execute /root/docker/setup/01-system.sh" >&2 && exit 10; };echo "Done running the system script";fi; \
   echo ""
 
@@ -118,6 +115,7 @@ RUN echo "Initializing packages before copying files to image"; \
   if [ -f "/root/docker/setup/02-packages.sh" ];then echo "Running the packages script";/root/docker/setup/02-packages.sh||{ echo "Failed to execute /root/docker/setup/02-packages.sh" >&2 && exit 10; };echo "Done running the packages script";fi; \
   echo ""
 
+COPY ./rootfs/. /
 COPY ./Dockerfile.3.19 /root/docker/Dockerfile
 
 RUN echo "Updating system files "; \
@@ -127,7 +125,7 @@ RUN echo "Updating system files "; \
   echo 'hosts: files dns' >"/etc/nsswitch.conf"; \
   [ "$PHP_VERSION" = "system" ] && PHP_VERSION="php" || true; \
   PHP_BIN="$(command -v ${PHP_VERSION} 2>/dev/null || true)"; \
-  set -- /usr/*bin/php*fpm*; [ -e "$1" ] && PHP_FPM="$1" || PHP_FPM=""; \
+  PHP_FPM="$(ls /usr/*bin/php*fpm* 2>/dev/null || true)"; \
   pip_bin="$(command -v python3 2>/dev/null || command -v python2 2>/dev/null || command -v python 2>/dev/null || true)"; \
   py_version="$(command $pip_bin --version | sed 's|[pP]ython ||g' | awk -F '.' '{print $1$2}' | grep '[0-9]' || true)"; \
   [ "$py_version" -gt "310" ] && pip_opts="--break-system-packages " || pip_opts=""; \
@@ -136,7 +134,7 @@ RUN echo "Updating system files "; \
   [ -n "$PHP_FPM" ] && [ -z "$(command -v php-fpm 2>/dev/null)" ] && ln -sf "$PHP_FPM" "/usr/bin/php-fpm" 2>/dev/null || true; \
   if [ -f "/etc/profile.d/color_prompt.sh.disabled" ]; then mv -f "/etc/profile.d/color_prompt.sh.disabled" "/etc/profile.d/color_prompt.sh";fi ; \
   { [ -f "/etc/bash/bashrc" ] && cp -Rf "/etc/bash/bashrc" "/root/.bashrc"; } || { [ -f "/etc/bashrc" ] && cp -Rf "/etc/bashrc" "/root/.bashrc"; } || { [ -f "/etc/bash.bashrc" ] && cp -Rf "/etc/bash.bashrc" "/root/.bashrc"; } || true; \
-  if [ -z "$(command -v "apt-get" 2>/dev/null)" ];then grep -sh -q 'alias quit' "/root/.bashrc" || printf '# Profile\n\n%s\n%s\n%s\n' '. /etc/profile' '. /root/.profile' "alias quit='exit 0 2>/dev/null'" >>"/root/.bashrc"; fi; \
+  if [ -z "$(command -v "apt-get" 2>/dev/null)" ];then grep -s -q 'alias quit' "/root/.bashrc" || printf '# Profile\n\n%s\n%s\n%s\n' '. /etc/profile' '. /root/.profile' "alias quit='exit 0 2>/dev/null'" >>"/root/.bashrc"; fi; \
   if [ "$PHP_VERSION" != "system" ] && [ -e "/etc/php" ] && [ -d "/etc/${PHP_VERSION}" ];then rm -Rf "/etc/php";fi; \
   if [ "$PHP_VERSION" != "system" ] && [ -n "${PHP_VERSION}" ] && [ -d "/etc/${PHP_VERSION}" ];then ln -sf "/etc/${PHP_VERSION}" "/etc/php";fi; \
   if [ -f "/root/docker/setup/03-files.sh" ];then echo "Running the files script";/root/docker/setup/03-files.sh||{ echo "Failed to execute /root/docker/setup/03-files.sh" >&2 && exit 10; };echo "Done running the files script";fi; \
@@ -144,7 +142,7 @@ RUN echo "Updating system files "; \
 
 RUN echo "Custom Settings"; \
   $SHELL_OPTS; \
-echo ""
+  echo ""
 
 RUN echo "Setting up users and scripts "; \
   $SHELL_OPTS; \
@@ -161,7 +159,7 @@ RUN echo "Setting OS Settings "; \
 
 RUN echo "Custom Applications"; \
   $SHELL_OPTS; \
-echo ""
+  echo ""
 
 RUN echo "Running custom commands"; \
   if [ -f "/root/docker/setup/05-custom.sh" ];then echo "Running the custom script";/root/docker/setup/05-custom.sh||{ echo "Failed to execute /root/docker/setup/05-custom.sh" && exit 10; };echo "Done running the custom script";fi; \
@@ -184,14 +182,13 @@ RUN echo "Deleting unneeded files"; \
   rm -rf /lib/systemd/system/sockets.target.wants/*udev* || true; \
   rm -rf /lib/systemd/system/sockets.target.wants/*initctl* || true; \
   rm -Rf /usr/share/doc/* /var/tmp/* /var/cache/*/* /root/.cache/* /usr/share/info/* /tmp/* || true; \
-  if [ -d "/lib/systemd/system/sysinit.target.wants" ];then cd "/lib/systemd/system/sysinit.target.wants" && for want_file in *; do [ "$want_file" = "systemd-tmpfiles-setup" ] || rm -f "$want_file"; done; fi; \
+  if [ -d "/lib/systemd/system/sysinit.target.wants" ];then cd "/lib/systemd/system/sysinit.target.wants" && rm -f $(ls | grep -v systemd-tmpfiles-setup);fi; \
   if [ -f "/root/docker/setup/07-cleanup.sh" ];then echo "Running the cleanup script";/root/docker/setup/07-cleanup.sh||{ echo "Failed to execute /root/docker/setup/07-cleanup.sh" >&2 && exit 10; };echo "Done running the cleanup script";fi; \
   echo ""
 
 RUN echo "Init done"
 FROM scratch
 ARG TZ
-ARG PATH
 ARG USER
 ARG TIMEZONE
 ARG LANGUAGE
@@ -201,46 +198,51 @@ ARG SERVICE_PORT
 ARG EXPOSE_PORTS
 ARG BUILD_VERSION
 ARG IMAGE_VERSION
-ARG GIT_COMMIT
 ARG WWW_ROOT_DIR
+ARG DEFAULT_FILE_DIR
+ARG DEFAULT_DATA_DIR
+ARG DEFAULT_CONF_DIR
+ARG DEFAULT_TEMPLATE_DIR
 ARG DISTRO_VERSION
 ARG NODE_VERSION
 ARG NODE_MANAGER
 ARG PHP_VERSION
 ARG PHP_SERVER
 ARG LICENSE="WTFPL"
-ARG ENV_PORTS="${EXPOSE_PORTS}"
+ARG ENV_PORTS=""
 
 USER ${USER}
 WORKDIR /root
 
 LABEL maintainer="CasjaysDev <docker-admin@casjaysdev.pro>"
 LABEL org.opencontainers.image.vendor="CasjaysDev"
-LABEL org.opencontainers.image.authors="CasjaysDev"
-LABEL org.opencontainers.image.licenses="${LICENSE}"
-LABEL org.opencontainers.image.title="${IMAGE_NAME}"
+LABEL org.opencontainers.image.authors="CasjaysDev <docker-admin@casjaysdev.pro"
 LABEL org.opencontainers.image.description="Containerized version of ${IMAGE_NAME}"
+LABEL org.opencontainers.image.title="${IMAGE_NAME}"
+LABEL org.opencontainers.image.base.name="${IMAGE_NAME}"
+LABEL org.opencontainers.image.authors="${LICENSE}"
 LABEL org.opencontainers.image.created="${BUILD_DATE}"
 LABEL org.opencontainers.image.version="${BUILD_VERSION}"
-LABEL org.opencontainers.image.revision="${GIT_COMMIT}"
+LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}"
 LABEL org.opencontainers.image.url="https://docker.io/casjaysdev/alpine"
 LABEL org.opencontainers.image.source="https://docker.io/casjaysdev/alpine"
-LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/alpine"
 LABEL org.opencontainers.image.vcs-type="Git"
+LABEL org.opencontainers.image.revision="${BUILD_VERSION}"
+LABEL org.opencontainers.image.source="https://github.com/dockersrc/alpine"
+LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/alpine"
 LABEL com.github.containers.toolbox="false"
 
 ENV ENV=~/.bashrc
 ENV USER="${USER}"
-ENV PATH="${PATH}"
-ENV TZ="${TIMEZONE}"
 ENV SHELL="/bin/bash"
+ENV TZ="${TIMEZONE}"
 ENV TIMEZONE="${TZ}"
 ENV LANG="${LANGUAGE}"
 ENV TERM="xterm-256color"
 ENV PORT="${SERVICE_PORT}"
 ENV ENV_PORTS="${ENV_PORTS}"
 ENV CONTAINER_NAME="${IMAGE_NAME}"
-ENV HOSTNAME="casjaysdevdocker-${IMAGE_NAME}"
+ENV HOSTNAME="casjaysdev-${IMAGE_NAME}"
 ENV PHP_SERVER="${PHP_SERVER}"
 ENV NODE_VERSION="${NODE_VERSION}"
 ENV NODE_MANAGER="${NODE_MANAGER}"
@@ -254,8 +256,6 @@ VOLUME [ "/config","/data" ]
 
 EXPOSE ${SERVICE_PORT} ${ENV_PORTS}
 
-STOPSIGNAL SIGRTMIN+3
-
-ENTRYPOINT [ "tini", "-p", "SIGTERM","--", "/usr/local/bin/entrypoint.sh" ]
+CMD [ "tail", "-f", "/dev/null" ]
+ENTRYPOINT [ "tini","--","/usr/local/bin/entrypoint.sh" ]
 HEALTHCHECK --start-period=10m --interval=5m --timeout=15s CMD [ "/usr/local/bin/entrypoint.sh", "healthcheck" ]
-
diff --git a/Dockerfile.3.20 b/Dockerfile.3.20
index 4b547e7..b7ab2a4 100644
--- a/Dockerfile.3.20
+++ b/Dockerfile.3.20
@@ -1,11 +1,15 @@
+# syntax=docker/dockerfile:1
 # Docker image for alpine using the alpine template
 ARG IMAGE_NAME="alpine"
 ARG PHP_SERVER="alpine"
-ARG BUILD_DATE="202607112006"
+ARG BUILD_DATE="202408111050"
 ARG LANGUAGE="en_US.UTF-8"
 ARG TIMEZONE="America/New_York"
 ARG WWW_ROOT_DIR="/usr/local/share/httpd/default"
-ARG PATH="/usr/local/etc/docker/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+ARG DEFAULT_FILE_DIR="/usr/local/share/template-files"
+ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
+ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
+ARG DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults"
 
 ARG USER="root"
 ARG SHELL_OPTS="set -e -o pipefail"
@@ -21,7 +25,7 @@ ARG IMAGE_VERSION="3.20"
 ARG CONTAINER_VERSION=""
 
 ARG PULL_URL="alpine"
-ARG DISTRO_VERSION="3.20"
+ARG DISTRO_VERSION="${IMAGE_VERSION}"
 ARG BUILD_VERSION="${BUILD_DATE}"
 
 FROM tianon/gosu:latest AS gosu
@@ -38,47 +42,40 @@ ARG EXPOSE_PORTS
 ARG BUILD_VERSION
 ARG IMAGE_VERSION
 ARG WWW_ROOT_DIR
+ARG DEFAULT_FILE_DIR
+ARG DEFAULT_DATA_DIR
+ARG DEFAULT_CONF_DIR
+ARG DEFAULT_TEMPLATE_DIR
 ARG DISTRO_VERSION
 ARG NODE_VERSION
 ARG NODE_MANAGER
 ARG PHP_VERSION
 ARG PHP_SERVER
 ARG SHELL_OPTS
-ARG PATH
 
-ARG PACK_LIST="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates "
+ARG PACK_LIST="bash tini bash-completion git curl wget sudo unzip iproute2 openrc msmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates "
 
 ENV ENV=~/.profile
 ENV SHELL="/bin/sh"
-ENV PATH="${PATH}"
 ENV TZ="${TIMEZONE}"
 ENV TIMEZONE="${TZ}"
 ENV LANG="${LANGUAGE}"
 ENV TERM="xterm-256color"
-ENV HOSTNAME="casjaysdevdocker-alpine"
+ENV HOSTNAME="casjaysdev-alpine"
 
 USER ${USER}
 WORKDIR /root
 
-RUN set -e; \
-  echo "Updating the system"; \
-  apk upgrade --no-cache
-
-COPY ./rootfs/. /
-
-RUN set -e; \
-  echo "Ensuring bash and system certs are installed"; \
-  pkmgr install bash ca-certificates; \
-  update-ca-certificates
+COPY ./rootfs/usr/local/bin/. /usr/local/bin/
 
 RUN set -e; \
   echo "Setting up prerequisites"; \
   apk --no-cache add bash; \
   SH_CMD="$(which sh 2>/dev/null||command -v sh 2>/dev/null)"; \
   BASH_CMD="$(which bash 2>/dev/null||command -v bash 2>/dev/null)"; \
-  [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/bin/sh" || true; \
-  [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/usr/bin/sh" || true; \
-  [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && symlink "$BASH_CMD" "$SH_CMD" || true; \
+  [ -x "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/bin/sh" || true; \
+  [ -x "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/usr/bin/sh" || true; \
+  [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && ln -sf "$BASH_CMD" "$SH_CMD" || true; \
   [ -n "$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'$BASH_CMD'|g' "/etc/passwd" || true
 
 ENV SHELL="/bin/bash"
@@ -88,19 +85,19 @@ COPY --from=gosu /usr/local/bin/gosu /usr/local/bin/gosu
 
 RUN echo "Initializing the system"; \
   $SHELL_OPTS; \
-  mkdir -p "/root/docker/setup" "/etc/profile.d"; \
+  mkdir -p "${DEFAULT_DATA_DIR}" "${DEFAULT_CONF_DIR}" "${DEFAULT_TEMPLATE_DIR}" "/root/docker/setup" "/etc/profile.d"; \
   if [ -f "/root/docker/setup/00-init.sh" ];then echo "Running the init script";/root/docker/setup/00-init.sh||{ echo "Failed to execute /root/docker/setup/00-init.sh" >&2 && exit 10; };echo "Done running the init script";fi; \
   echo ""
 
 RUN echo "Creating and editing system files "; \
   $SHELL_OPTS; \
-
   rm -Rf "/etc/apk/repositories"; \
   [ "$DISTRO_VERSION" = "latest" ] && DISTRO_VERSION="edge";[ "$DISTRO_VERSION" = "edge" ] || DISTRO_VERSION="v${DISTRO_VERSION}"; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/main" >>"/etc/apk/repositories"; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/community" >>"/etc/apk/repositories"; \
   if [ "${DISTRO_VERSION}" = "edge" ]; then echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/testing" >>"/etc/apk/repositories";fi; \
-  apk update; apk upgrade --no-cache; \
+  apk update; \
+  apk upgrade --no-cache; \
   if [ -f "/root/docker/setup/01-system.sh" ];then echo "Running the system script";/root/docker/setup/01-system.sh||{ echo "Failed to execute /root/docker/setup/01-system.sh" >&2 && exit 10; };echo "Done running the system script";fi; \
   echo ""
 
@@ -118,6 +115,7 @@ RUN echo "Initializing packages before copying files to image"; \
   if [ -f "/root/docker/setup/02-packages.sh" ];then echo "Running the packages script";/root/docker/setup/02-packages.sh||{ echo "Failed to execute /root/docker/setup/02-packages.sh" >&2 && exit 10; };echo "Done running the packages script";fi; \
   echo ""
 
+COPY ./rootfs/. /
 COPY ./Dockerfile.3.20 /root/docker/Dockerfile
 
 RUN echo "Updating system files "; \
@@ -127,7 +125,7 @@ RUN echo "Updating system files "; \
   echo 'hosts: files dns' >"/etc/nsswitch.conf"; \
   [ "$PHP_VERSION" = "system" ] && PHP_VERSION="php" || true; \
   PHP_BIN="$(command -v ${PHP_VERSION} 2>/dev/null || true)"; \
-  set -- /usr/*bin/php*fpm*; [ -e "$1" ] && PHP_FPM="$1" || PHP_FPM=""; \
+  PHP_FPM="$(ls /usr/*bin/php*fpm* 2>/dev/null || true)"; \
   pip_bin="$(command -v python3 2>/dev/null || command -v python2 2>/dev/null || command -v python 2>/dev/null || true)"; \
   py_version="$(command $pip_bin --version | sed 's|[pP]ython ||g' | awk -F '.' '{print $1$2}' | grep '[0-9]' || true)"; \
   [ "$py_version" -gt "310" ] && pip_opts="--break-system-packages " || pip_opts=""; \
@@ -136,7 +134,7 @@ RUN echo "Updating system files "; \
   [ -n "$PHP_FPM" ] && [ -z "$(command -v php-fpm 2>/dev/null)" ] && ln -sf "$PHP_FPM" "/usr/bin/php-fpm" 2>/dev/null || true; \
   if [ -f "/etc/profile.d/color_prompt.sh.disabled" ]; then mv -f "/etc/profile.d/color_prompt.sh.disabled" "/etc/profile.d/color_prompt.sh";fi ; \
   { [ -f "/etc/bash/bashrc" ] && cp -Rf "/etc/bash/bashrc" "/root/.bashrc"; } || { [ -f "/etc/bashrc" ] && cp -Rf "/etc/bashrc" "/root/.bashrc"; } || { [ -f "/etc/bash.bashrc" ] && cp -Rf "/etc/bash.bashrc" "/root/.bashrc"; } || true; \
-  if [ -z "$(command -v "apt-get" 2>/dev/null)" ];then grep -sh -q 'alias quit' "/root/.bashrc" || printf '# Profile\n\n%s\n%s\n%s\n' '. /etc/profile' '. /root/.profile' "alias quit='exit 0 2>/dev/null'" >>"/root/.bashrc"; fi; \
+  if [ -z "$(command -v "apt-get" 2>/dev/null)" ];then grep -s -q 'alias quit' "/root/.bashrc" || printf '# Profile\n\n%s\n%s\n%s\n' '. /etc/profile' '. /root/.profile' "alias quit='exit 0 2>/dev/null'" >>"/root/.bashrc"; fi; \
   if [ "$PHP_VERSION" != "system" ] && [ -e "/etc/php" ] && [ -d "/etc/${PHP_VERSION}" ];then rm -Rf "/etc/php";fi; \
   if [ "$PHP_VERSION" != "system" ] && [ -n "${PHP_VERSION}" ] && [ -d "/etc/${PHP_VERSION}" ];then ln -sf "/etc/${PHP_VERSION}" "/etc/php";fi; \
   if [ -f "/root/docker/setup/03-files.sh" ];then echo "Running the files script";/root/docker/setup/03-files.sh||{ echo "Failed to execute /root/docker/setup/03-files.sh" >&2 && exit 10; };echo "Done running the files script";fi; \
@@ -144,7 +142,7 @@ RUN echo "Updating system files "; \
 
 RUN echo "Custom Settings"; \
   $SHELL_OPTS; \
-echo ""
+  echo ""
 
 RUN echo "Setting up users and scripts "; \
   $SHELL_OPTS; \
@@ -161,7 +159,7 @@ RUN echo "Setting OS Settings "; \
 
 RUN echo "Custom Applications"; \
   $SHELL_OPTS; \
-echo ""
+  echo ""
 
 RUN echo "Running custom commands"; \
   if [ -f "/root/docker/setup/05-custom.sh" ];then echo "Running the custom script";/root/docker/setup/05-custom.sh||{ echo "Failed to execute /root/docker/setup/05-custom.sh" && exit 10; };echo "Done running the custom script";fi; \
@@ -184,14 +182,13 @@ RUN echo "Deleting unneeded files"; \
   rm -rf /lib/systemd/system/sockets.target.wants/*udev* || true; \
   rm -rf /lib/systemd/system/sockets.target.wants/*initctl* || true; \
   rm -Rf /usr/share/doc/* /var/tmp/* /var/cache/*/* /root/.cache/* /usr/share/info/* /tmp/* || true; \
-  if [ -d "/lib/systemd/system/sysinit.target.wants" ];then cd "/lib/systemd/system/sysinit.target.wants" && for want_file in *; do [ "$want_file" = "systemd-tmpfiles-setup" ] || rm -f "$want_file"; done; fi; \
+  if [ -d "/lib/systemd/system/sysinit.target.wants" ];then cd "/lib/systemd/system/sysinit.target.wants" && rm -f $(ls | grep -v systemd-tmpfiles-setup);fi; \
   if [ -f "/root/docker/setup/07-cleanup.sh" ];then echo "Running the cleanup script";/root/docker/setup/07-cleanup.sh||{ echo "Failed to execute /root/docker/setup/07-cleanup.sh" >&2 && exit 10; };echo "Done running the cleanup script";fi; \
   echo ""
 
 RUN echo "Init done"
 FROM scratch
 ARG TZ
-ARG PATH
 ARG USER
 ARG TIMEZONE
 ARG LANGUAGE
@@ -201,46 +198,51 @@ ARG SERVICE_PORT
 ARG EXPOSE_PORTS
 ARG BUILD_VERSION
 ARG IMAGE_VERSION
-ARG GIT_COMMIT
 ARG WWW_ROOT_DIR
+ARG DEFAULT_FILE_DIR
+ARG DEFAULT_DATA_DIR
+ARG DEFAULT_CONF_DIR
+ARG DEFAULT_TEMPLATE_DIR
 ARG DISTRO_VERSION
 ARG NODE_VERSION
 ARG NODE_MANAGER
 ARG PHP_VERSION
 ARG PHP_SERVER
 ARG LICENSE="WTFPL"
-ARG ENV_PORTS="${EXPOSE_PORTS}"
+ARG ENV_PORTS=""
 
 USER ${USER}
 WORKDIR /root
 
 LABEL maintainer="CasjaysDev <docker-admin@casjaysdev.pro>"
 LABEL org.opencontainers.image.vendor="CasjaysDev"
-LABEL org.opencontainers.image.authors="CasjaysDev"
-LABEL org.opencontainers.image.licenses="${LICENSE}"
-LABEL org.opencontainers.image.title="${IMAGE_NAME}"
+LABEL org.opencontainers.image.authors="CasjaysDev <docker-admin@casjaysdev.pro"
 LABEL org.opencontainers.image.description="Containerized version of ${IMAGE_NAME}"
+LABEL org.opencontainers.image.title="${IMAGE_NAME}"
+LABEL org.opencontainers.image.base.name="${IMAGE_NAME}"
+LABEL org.opencontainers.image.authors="${LICENSE}"
 LABEL org.opencontainers.image.created="${BUILD_DATE}"
 LABEL org.opencontainers.image.version="${BUILD_VERSION}"
-LABEL org.opencontainers.image.revision="${GIT_COMMIT}"
+LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}"
 LABEL org.opencontainers.image.url="https://docker.io/casjaysdev/alpine"
 LABEL org.opencontainers.image.source="https://docker.io/casjaysdev/alpine"
-LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/alpine"
 LABEL org.opencontainers.image.vcs-type="Git"
+LABEL org.opencontainers.image.revision="${BUILD_VERSION}"
+LABEL org.opencontainers.image.source="https://github.com/dockersrc/alpine"
+LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/alpine"
 LABEL com.github.containers.toolbox="false"
 
 ENV ENV=~/.bashrc
 ENV USER="${USER}"
-ENV PATH="${PATH}"
-ENV TZ="${TIMEZONE}"
 ENV SHELL="/bin/bash"
+ENV TZ="${TIMEZONE}"
 ENV TIMEZONE="${TZ}"
 ENV LANG="${LANGUAGE}"
 ENV TERM="xterm-256color"
 ENV PORT="${SERVICE_PORT}"
 ENV ENV_PORTS="${ENV_PORTS}"
 ENV CONTAINER_NAME="${IMAGE_NAME}"
-ENV HOSTNAME="casjaysdevdocker-${IMAGE_NAME}"
+ENV HOSTNAME="casjaysdev-${IMAGE_NAME}"
 ENV PHP_SERVER="${PHP_SERVER}"
 ENV NODE_VERSION="${NODE_VERSION}"
 ENV NODE_MANAGER="${NODE_MANAGER}"
@@ -254,8 +256,6 @@ VOLUME [ "/config","/data" ]
 
 EXPOSE ${SERVICE_PORT} ${ENV_PORTS}
 
-STOPSIGNAL SIGRTMIN+3
-
-ENTRYPOINT [ "tini", "-p", "SIGTERM","--", "/usr/local/bin/entrypoint.sh" ]
+CMD [ "tail", "-f", "/dev/null" ]
+ENTRYPOINT [ "tini","--","/usr/local/bin/entrypoint.sh" ]
 HEALTHCHECK --start-period=10m --interval=5m --timeout=15s CMD [ "/usr/local/bin/entrypoint.sh", "healthcheck" ]
-
diff --git a/Dockerfile.3.21 b/Dockerfile.3.21
index 53c5071..e9746cd 100644
--- a/Dockerfile.3.21
+++ b/Dockerfile.3.21
@@ -1,11 +1,15 @@
+# syntax=docker/dockerfile:1
 # Docker image for alpine using the alpine template
 ARG IMAGE_NAME="alpine"
 ARG PHP_SERVER="alpine"
-ARG BUILD_DATE="202607112007"
+ARG BUILD_DATE="202408111050"
 ARG LANGUAGE="en_US.UTF-8"
 ARG TIMEZONE="America/New_York"
 ARG WWW_ROOT_DIR="/usr/local/share/httpd/default"
-ARG PATH="/usr/local/etc/docker/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+ARG DEFAULT_FILE_DIR="/usr/local/share/template-files"
+ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
+ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
+ARG DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults"
 
 ARG USER="root"
 ARG SHELL_OPTS="set -e -o pipefail"
@@ -21,7 +25,7 @@ ARG IMAGE_VERSION="3.21"
 ARG CONTAINER_VERSION=""
 
 ARG PULL_URL="alpine"
-ARG DISTRO_VERSION="3.21"
+ARG DISTRO_VERSION="${IMAGE_VERSION}"
 ARG BUILD_VERSION="${BUILD_DATE}"
 
 FROM tianon/gosu:latest AS gosu
@@ -38,47 +42,40 @@ ARG EXPOSE_PORTS
 ARG BUILD_VERSION
 ARG IMAGE_VERSION
 ARG WWW_ROOT_DIR
+ARG DEFAULT_FILE_DIR
+ARG DEFAULT_DATA_DIR
+ARG DEFAULT_CONF_DIR
+ARG DEFAULT_TEMPLATE_DIR
 ARG DISTRO_VERSION
 ARG NODE_VERSION
 ARG NODE_MANAGER
 ARG PHP_VERSION
 ARG PHP_SERVER
 ARG SHELL_OPTS
-ARG PATH
 
-ARG PACK_LIST="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates "
+ARG PACK_LIST="bash tini bash-completion git curl wget sudo unzip iproute2 openrc msmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates "
 
 ENV ENV=~/.profile
 ENV SHELL="/bin/sh"
-ENV PATH="${PATH}"
 ENV TZ="${TIMEZONE}"
 ENV TIMEZONE="${TZ}"
 ENV LANG="${LANGUAGE}"
 ENV TERM="xterm-256color"
-ENV HOSTNAME="casjaysdevdocker-alpine"
+ENV HOSTNAME="casjaysdev-alpine"
 
 USER ${USER}
 WORKDIR /root
 
-RUN set -e; \
-  echo "Updating the system"; \
-  apk upgrade --no-cache
-
-COPY ./rootfs/. /
-
-RUN set -e; \
-  echo "Ensuring bash and system certs are installed"; \
-  pkmgr install bash ca-certificates; \
-  update-ca-certificates
+COPY ./rootfs/usr/local/bin/. /usr/local/bin/
 
 RUN set -e; \
   echo "Setting up prerequisites"; \
   apk --no-cache add bash; \
   SH_CMD="$(which sh 2>/dev/null||command -v sh 2>/dev/null)"; \
   BASH_CMD="$(which bash 2>/dev/null||command -v bash 2>/dev/null)"; \
-  [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/bin/sh" || true; \
-  [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/usr/bin/sh" || true; \
-  [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && symlink "$BASH_CMD" "$SH_CMD" || true; \
+  [ -x "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/bin/sh" || true; \
+  [ -x "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/usr/bin/sh" || true; \
+  [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && ln -sf "$BASH_CMD" "$SH_CMD" || true; \
   [ -n "$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'$BASH_CMD'|g' "/etc/passwd" || true
 
 ENV SHELL="/bin/bash"
@@ -88,19 +85,19 @@ COPY --from=gosu /usr/local/bin/gosu /usr/local/bin/gosu
 
 RUN echo "Initializing the system"; \
   $SHELL_OPTS; \
-  mkdir -p "/root/docker/setup" "/etc/profile.d"; \
+  mkdir -p "${DEFAULT_DATA_DIR}" "${DEFAULT_CONF_DIR}" "${DEFAULT_TEMPLATE_DIR}" "/root/docker/setup" "/etc/profile.d"; \
   if [ -f "/root/docker/setup/00-init.sh" ];then echo "Running the init script";/root/docker/setup/00-init.sh||{ echo "Failed to execute /root/docker/setup/00-init.sh" >&2 && exit 10; };echo "Done running the init script";fi; \
   echo ""
 
 RUN echo "Creating and editing system files "; \
   $SHELL_OPTS; \
-
   rm -Rf "/etc/apk/repositories"; \
   [ "$DISTRO_VERSION" = "latest" ] && DISTRO_VERSION="edge";[ "$DISTRO_VERSION" = "edge" ] || DISTRO_VERSION="v${DISTRO_VERSION}"; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/main" >>"/etc/apk/repositories"; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/community" >>"/etc/apk/repositories"; \
   if [ "${DISTRO_VERSION}" = "edge" ]; then echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/testing" >>"/etc/apk/repositories";fi; \
-  apk update; apk upgrade --no-cache; \
+  apk update; \
+  apk upgrade --no-cache; \
   if [ -f "/root/docker/setup/01-system.sh" ];then echo "Running the system script";/root/docker/setup/01-system.sh||{ echo "Failed to execute /root/docker/setup/01-system.sh" >&2 && exit 10; };echo "Done running the system script";fi; \
   echo ""
 
@@ -118,6 +115,7 @@ RUN echo "Initializing packages before copying files to image"; \
   if [ -f "/root/docker/setup/02-packages.sh" ];then echo "Running the packages script";/root/docker/setup/02-packages.sh||{ echo "Failed to execute /root/docker/setup/02-packages.sh" >&2 && exit 10; };echo "Done running the packages script";fi; \
   echo ""
 
+COPY ./rootfs/. /
 COPY ./Dockerfile.3.21 /root/docker/Dockerfile
 
 RUN echo "Updating system files "; \
@@ -127,7 +125,7 @@ RUN echo "Updating system files "; \
   echo 'hosts: files dns' >"/etc/nsswitch.conf"; \
   [ "$PHP_VERSION" = "system" ] && PHP_VERSION="php" || true; \
   PHP_BIN="$(command -v ${PHP_VERSION} 2>/dev/null || true)"; \
-  set -- /usr/*bin/php*fpm*; [ -e "$1" ] && PHP_FPM="$1" || PHP_FPM=""; \
+  PHP_FPM="$(ls /usr/*bin/php*fpm* 2>/dev/null || true)"; \
   pip_bin="$(command -v python3 2>/dev/null || command -v python2 2>/dev/null || command -v python 2>/dev/null || true)"; \
   py_version="$(command $pip_bin --version | sed 's|[pP]ython ||g' | awk -F '.' '{print $1$2}' | grep '[0-9]' || true)"; \
   [ "$py_version" -gt "310" ] && pip_opts="--break-system-packages " || pip_opts=""; \
@@ -136,7 +134,7 @@ RUN echo "Updating system files "; \
   [ -n "$PHP_FPM" ] && [ -z "$(command -v php-fpm 2>/dev/null)" ] && ln -sf "$PHP_FPM" "/usr/bin/php-fpm" 2>/dev/null || true; \
   if [ -f "/etc/profile.d/color_prompt.sh.disabled" ]; then mv -f "/etc/profile.d/color_prompt.sh.disabled" "/etc/profile.d/color_prompt.sh";fi ; \
   { [ -f "/etc/bash/bashrc" ] && cp -Rf "/etc/bash/bashrc" "/root/.bashrc"; } || { [ -f "/etc/bashrc" ] && cp -Rf "/etc/bashrc" "/root/.bashrc"; } || { [ -f "/etc/bash.bashrc" ] && cp -Rf "/etc/bash.bashrc" "/root/.bashrc"; } || true; \
-  if [ -z "$(command -v "apt-get" 2>/dev/null)" ];then grep -sh -q 'alias quit' "/root/.bashrc" || printf '# Profile\n\n%s\n%s\n%s\n' '. /etc/profile' '. /root/.profile' "alias quit='exit 0 2>/dev/null'" >>"/root/.bashrc"; fi; \
+  if [ -z "$(command -v "apt-get" 2>/dev/null)" ];then grep -s -q 'alias quit' "/root/.bashrc" || printf '# Profile\n\n%s\n%s\n%s\n' '. /etc/profile' '. /root/.profile' "alias quit='exit 0 2>/dev/null'" >>"/root/.bashrc"; fi; \
   if [ "$PHP_VERSION" != "system" ] && [ -e "/etc/php" ] && [ -d "/etc/${PHP_VERSION}" ];then rm -Rf "/etc/php";fi; \
   if [ "$PHP_VERSION" != "system" ] && [ -n "${PHP_VERSION}" ] && [ -d "/etc/${PHP_VERSION}" ];then ln -sf "/etc/${PHP_VERSION}" "/etc/php";fi; \
   if [ -f "/root/docker/setup/03-files.sh" ];then echo "Running the files script";/root/docker/setup/03-files.sh||{ echo "Failed to execute /root/docker/setup/03-files.sh" >&2 && exit 10; };echo "Done running the files script";fi; \
@@ -144,7 +142,7 @@ RUN echo "Updating system files "; \
 
 RUN echo "Custom Settings"; \
   $SHELL_OPTS; \
-echo ""
+  echo ""
 
 RUN echo "Setting up users and scripts "; \
   $SHELL_OPTS; \
@@ -161,7 +159,7 @@ RUN echo "Setting OS Settings "; \
 
 RUN echo "Custom Applications"; \
   $SHELL_OPTS; \
-echo ""
+  echo ""
 
 RUN echo "Running custom commands"; \
   if [ -f "/root/docker/setup/05-custom.sh" ];then echo "Running the custom script";/root/docker/setup/05-custom.sh||{ echo "Failed to execute /root/docker/setup/05-custom.sh" && exit 10; };echo "Done running the custom script";fi; \
@@ -184,14 +182,13 @@ RUN echo "Deleting unneeded files"; \
   rm -rf /lib/systemd/system/sockets.target.wants/*udev* || true; \
   rm -rf /lib/systemd/system/sockets.target.wants/*initctl* || true; \
   rm -Rf /usr/share/doc/* /var/tmp/* /var/cache/*/* /root/.cache/* /usr/share/info/* /tmp/* || true; \
-  if [ -d "/lib/systemd/system/sysinit.target.wants" ];then cd "/lib/systemd/system/sysinit.target.wants" && for want_file in *; do [ "$want_file" = "systemd-tmpfiles-setup" ] || rm -f "$want_file"; done; fi; \
+  if [ -d "/lib/systemd/system/sysinit.target.wants" ];then cd "/lib/systemd/system/sysinit.target.wants" && rm -f $(ls | grep -v systemd-tmpfiles-setup);fi; \
   if [ -f "/root/docker/setup/07-cleanup.sh" ];then echo "Running the cleanup script";/root/docker/setup/07-cleanup.sh||{ echo "Failed to execute /root/docker/setup/07-cleanup.sh" >&2 && exit 10; };echo "Done running the cleanup script";fi; \
   echo ""
 
 RUN echo "Init done"
 FROM scratch
 ARG TZ
-ARG PATH
 ARG USER
 ARG TIMEZONE
 ARG LANGUAGE
@@ -201,46 +198,51 @@ ARG SERVICE_PORT
 ARG EXPOSE_PORTS
 ARG BUILD_VERSION
 ARG IMAGE_VERSION
-ARG GIT_COMMIT
 ARG WWW_ROOT_DIR
+ARG DEFAULT_FILE_DIR
+ARG DEFAULT_DATA_DIR
+ARG DEFAULT_CONF_DIR
+ARG DEFAULT_TEMPLATE_DIR
 ARG DISTRO_VERSION
 ARG NODE_VERSION
 ARG NODE_MANAGER
 ARG PHP_VERSION
 ARG PHP_SERVER
 ARG LICENSE="WTFPL"
-ARG ENV_PORTS="${EXPOSE_PORTS}"
+ARG ENV_PORTS=""
 
 USER ${USER}
 WORKDIR /root
 
 LABEL maintainer="CasjaysDev <docker-admin@casjaysdev.pro>"
 LABEL org.opencontainers.image.vendor="CasjaysDev"
-LABEL org.opencontainers.image.authors="CasjaysDev"
-LABEL org.opencontainers.image.licenses="${LICENSE}"
-LABEL org.opencontainers.image.title="${IMAGE_NAME}"
+LABEL org.opencontainers.image.authors="CasjaysDev <docker-admin@casjaysdev.pro"
 LABEL org.opencontainers.image.description="Containerized version of ${IMAGE_NAME}"
+LABEL org.opencontainers.image.title="${IMAGE_NAME}"
+LABEL org.opencontainers.image.base.name="${IMAGE_NAME}"
+LABEL org.opencontainers.image.authors="${LICENSE}"
 LABEL org.opencontainers.image.created="${BUILD_DATE}"
 LABEL org.opencontainers.image.version="${BUILD_VERSION}"
-LABEL org.opencontainers.image.revision="${GIT_COMMIT}"
+LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}"
 LABEL org.opencontainers.image.url="https://docker.io/casjaysdev/alpine"
 LABEL org.opencontainers.image.source="https://docker.io/casjaysdev/alpine"
-LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/alpine"
 LABEL org.opencontainers.image.vcs-type="Git"
+LABEL org.opencontainers.image.revision="${BUILD_VERSION}"
+LABEL org.opencontainers.image.source="https://github.com/dockersrc/alpine"
+LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/alpine"
 LABEL com.github.containers.toolbox="false"
 
 ENV ENV=~/.bashrc
 ENV USER="${USER}"
-ENV PATH="${PATH}"
-ENV TZ="${TIMEZONE}"
 ENV SHELL="/bin/bash"
+ENV TZ="${TIMEZONE}"
 ENV TIMEZONE="${TZ}"
 ENV LANG="${LANGUAGE}"
 ENV TERM="xterm-256color"
 ENV PORT="${SERVICE_PORT}"
 ENV ENV_PORTS="${ENV_PORTS}"
 ENV CONTAINER_NAME="${IMAGE_NAME}"
-ENV HOSTNAME="casjaysdevdocker-${IMAGE_NAME}"
+ENV HOSTNAME="casjaysdev-${IMAGE_NAME}"
 ENV PHP_SERVER="${PHP_SERVER}"
 ENV NODE_VERSION="${NODE_VERSION}"
 ENV NODE_MANAGER="${NODE_MANAGER}"
@@ -254,8 +256,6 @@ VOLUME [ "/config","/data" ]
 
 EXPOSE ${SERVICE_PORT} ${ENV_PORTS}
 
-STOPSIGNAL SIGRTMIN+3
-
-ENTRYPOINT [ "tini", "-p", "SIGTERM","--", "/usr/local/bin/entrypoint.sh" ]
+CMD [ "tail", "-f", "/dev/null" ]
+ENTRYPOINT [ "tini","--","/usr/local/bin/entrypoint.sh" ]
 HEALTHCHECK --start-period=10m --interval=5m --timeout=15s CMD [ "/usr/local/bin/entrypoint.sh", "healthcheck" ]
-
diff --git a/Dockerfile.3.22 b/Dockerfile.3.22
index 7364cab..33b64b3 100644
--- a/Dockerfile.3.22
+++ b/Dockerfile.3.22
@@ -1,11 +1,15 @@
+# syntax=docker/dockerfile:1
 # Docker image for alpine using the alpine template
 ARG IMAGE_NAME="alpine"
 ARG PHP_SERVER="alpine"
-ARG BUILD_DATE="202607112212"
+ARG BUILD_DATE="202408111050"
 ARG LANGUAGE="en_US.UTF-8"
 ARG TIMEZONE="America/New_York"
 ARG WWW_ROOT_DIR="/usr/local/share/httpd/default"
-ARG PATH="/usr/local/etc/docker/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+ARG DEFAULT_FILE_DIR="/usr/local/share/template-files"
+ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
+ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
+ARG DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults"
 
 ARG USER="root"
 ARG SHELL_OPTS="set -e -o pipefail"
@@ -21,7 +25,7 @@ ARG IMAGE_VERSION="3.22"
 ARG CONTAINER_VERSION=""
 
 ARG PULL_URL="alpine"
-ARG DISTRO_VERSION="3.22"
+ARG DISTRO_VERSION="${IMAGE_VERSION}"
 ARG BUILD_VERSION="${BUILD_DATE}"
 
 FROM tianon/gosu:latest AS gosu
@@ -38,47 +42,40 @@ ARG EXPOSE_PORTS
 ARG BUILD_VERSION
 ARG IMAGE_VERSION
 ARG WWW_ROOT_DIR
+ARG DEFAULT_FILE_DIR
+ARG DEFAULT_DATA_DIR
+ARG DEFAULT_CONF_DIR
+ARG DEFAULT_TEMPLATE_DIR
 ARG DISTRO_VERSION
 ARG NODE_VERSION
 ARG NODE_MANAGER
 ARG PHP_VERSION
 ARG PHP_SERVER
 ARG SHELL_OPTS
-ARG PATH
 
-ARG PACK_LIST="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates "
+ARG PACK_LIST="bash tini bash-completion git curl wget sudo unzip iproute2 openrc msmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates "
 
 ENV ENV=~/.profile
 ENV SHELL="/bin/sh"
-ENV PATH="${PATH}"
 ENV TZ="${TIMEZONE}"
 ENV TIMEZONE="${TZ}"
 ENV LANG="${LANGUAGE}"
 ENV TERM="xterm-256color"
-ENV HOSTNAME="casjaysdevdocker-alpine"
+ENV HOSTNAME="casjaysdev-alpine"
 
 USER ${USER}
 WORKDIR /root
 
-RUN set -e; \
-  echo "Updating the system"; \
-  apk upgrade --no-cache
-
-COPY ./rootfs/. /
-
-RUN set -e; \
-  echo "Ensuring bash and system certs are installed"; \
-  pkmgr install bash ca-certificates; \
-  update-ca-certificates
+COPY ./rootfs/usr/local/bin/. /usr/local/bin/
 
 RUN set -e; \
   echo "Setting up prerequisites"; \
   apk --no-cache add bash; \
   SH_CMD="$(which sh 2>/dev/null||command -v sh 2>/dev/null)"; \
   BASH_CMD="$(which bash 2>/dev/null||command -v bash 2>/dev/null)"; \
-  [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/bin/sh" || true; \
-  [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/usr/bin/sh" || true; \
-  [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && symlink "$BASH_CMD" "$SH_CMD" || true; \
+  [ -x "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/bin/sh" || true; \
+  [ -x "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/usr/bin/sh" || true; \
+  [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && ln -sf "$BASH_CMD" "$SH_CMD" || true; \
   [ -n "$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'$BASH_CMD'|g' "/etc/passwd" || true
 
 ENV SHELL="/bin/bash"
@@ -88,19 +85,19 @@ COPY --from=gosu /usr/local/bin/gosu /usr/local/bin/gosu
 
 RUN echo "Initializing the system"; \
   $SHELL_OPTS; \
-  mkdir -p "/root/docker/setup" "/etc/profile.d"; \
+  mkdir -p "${DEFAULT_DATA_DIR}" "${DEFAULT_CONF_DIR}" "${DEFAULT_TEMPLATE_DIR}" "/root/docker/setup" "/etc/profile.d"; \
   if [ -f "/root/docker/setup/00-init.sh" ];then echo "Running the init script";/root/docker/setup/00-init.sh||{ echo "Failed to execute /root/docker/setup/00-init.sh" >&2 && exit 10; };echo "Done running the init script";fi; \
   echo ""
 
 RUN echo "Creating and editing system files "; \
   $SHELL_OPTS; \
-
   rm -Rf "/etc/apk/repositories"; \
   [ "$DISTRO_VERSION" = "latest" ] && DISTRO_VERSION="edge";[ "$DISTRO_VERSION" = "edge" ] || DISTRO_VERSION="v${DISTRO_VERSION}"; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/main" >>"/etc/apk/repositories"; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/community" >>"/etc/apk/repositories"; \
   if [ "${DISTRO_VERSION}" = "edge" ]; then echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/testing" >>"/etc/apk/repositories";fi; \
-  apk update; apk upgrade --no-cache; \
+  apk update; \
+  apk upgrade --no-cache; \
   if [ -f "/root/docker/setup/01-system.sh" ];then echo "Running the system script";/root/docker/setup/01-system.sh||{ echo "Failed to execute /root/docker/setup/01-system.sh" >&2 && exit 10; };echo "Done running the system script";fi; \
   echo ""
 
@@ -118,6 +115,7 @@ RUN echo "Initializing packages before copying files to image"; \
   if [ -f "/root/docker/setup/02-packages.sh" ];then echo "Running the packages script";/root/docker/setup/02-packages.sh||{ echo "Failed to execute /root/docker/setup/02-packages.sh" >&2 && exit 10; };echo "Done running the packages script";fi; \
   echo ""
 
+COPY ./rootfs/. /
 COPY ./Dockerfile.3.22 /root/docker/Dockerfile
 
 RUN echo "Updating system files "; \
@@ -127,7 +125,7 @@ RUN echo "Updating system files "; \
   echo 'hosts: files dns' >"/etc/nsswitch.conf"; \
   [ "$PHP_VERSION" = "system" ] && PHP_VERSION="php" || true; \
   PHP_BIN="$(command -v ${PHP_VERSION} 2>/dev/null || true)"; \
-  set -- /usr/*bin/php*fpm*; [ -e "$1" ] && PHP_FPM="$1" || PHP_FPM=""; \
+  PHP_FPM="$(ls /usr/*bin/php*fpm* 2>/dev/null || true)"; \
   pip_bin="$(command -v python3 2>/dev/null || command -v python2 2>/dev/null || command -v python 2>/dev/null || true)"; \
   py_version="$(command $pip_bin --version | sed 's|[pP]ython ||g' | awk -F '.' '{print $1$2}' | grep '[0-9]' || true)"; \
   [ "$py_version" -gt "310" ] && pip_opts="--break-system-packages " || pip_opts=""; \
@@ -136,7 +134,7 @@ RUN echo "Updating system files "; \
   [ -n "$PHP_FPM" ] && [ -z "$(command -v php-fpm 2>/dev/null)" ] && ln -sf "$PHP_FPM" "/usr/bin/php-fpm" 2>/dev/null || true; \
   if [ -f "/etc/profile.d/color_prompt.sh.disabled" ]; then mv -f "/etc/profile.d/color_prompt.sh.disabled" "/etc/profile.d/color_prompt.sh";fi ; \
   { [ -f "/etc/bash/bashrc" ] && cp -Rf "/etc/bash/bashrc" "/root/.bashrc"; } || { [ -f "/etc/bashrc" ] && cp -Rf "/etc/bashrc" "/root/.bashrc"; } || { [ -f "/etc/bash.bashrc" ] && cp -Rf "/etc/bash.bashrc" "/root/.bashrc"; } || true; \
-  if [ -z "$(command -v "apt-get" 2>/dev/null)" ];then grep -sh -q 'alias quit' "/root/.bashrc" || printf '# Profile\n\n%s\n%s\n%s\n' '. /etc/profile' '. /root/.profile' "alias quit='exit 0 2>/dev/null'" >>"/root/.bashrc"; fi; \
+  if [ -z "$(command -v "apt-get" 2>/dev/null)" ];then grep -s -q 'alias quit' "/root/.bashrc" || printf '# Profile\n\n%s\n%s\n%s\n' '. /etc/profile' '. /root/.profile' "alias quit='exit 0 2>/dev/null'" >>"/root/.bashrc"; fi; \
   if [ "$PHP_VERSION" != "system" ] && [ -e "/etc/php" ] && [ -d "/etc/${PHP_VERSION}" ];then rm -Rf "/etc/php";fi; \
   if [ "$PHP_VERSION" != "system" ] && [ -n "${PHP_VERSION}" ] && [ -d "/etc/${PHP_VERSION}" ];then ln -sf "/etc/${PHP_VERSION}" "/etc/php";fi; \
   if [ -f "/root/docker/setup/03-files.sh" ];then echo "Running the files script";/root/docker/setup/03-files.sh||{ echo "Failed to execute /root/docker/setup/03-files.sh" >&2 && exit 10; };echo "Done running the files script";fi; \
@@ -144,7 +142,7 @@ RUN echo "Updating system files "; \
 
 RUN echo "Custom Settings"; \
   $SHELL_OPTS; \
-echo ""
+  echo ""
 
 RUN echo "Setting up users and scripts "; \
   $SHELL_OPTS; \
@@ -161,7 +159,7 @@ RUN echo "Setting OS Settings "; \
 
 RUN echo "Custom Applications"; \
   $SHELL_OPTS; \
-echo ""
+  echo ""
 
 RUN echo "Running custom commands"; \
   if [ -f "/root/docker/setup/05-custom.sh" ];then echo "Running the custom script";/root/docker/setup/05-custom.sh||{ echo "Failed to execute /root/docker/setup/05-custom.sh" && exit 10; };echo "Done running the custom script";fi; \
@@ -184,14 +182,13 @@ RUN echo "Deleting unneeded files"; \
   rm -rf /lib/systemd/system/sockets.target.wants/*udev* || true; \
   rm -rf /lib/systemd/system/sockets.target.wants/*initctl* || true; \
   rm -Rf /usr/share/doc/* /var/tmp/* /var/cache/*/* /root/.cache/* /usr/share/info/* /tmp/* || true; \
-  if [ -d "/lib/systemd/system/sysinit.target.wants" ];then cd "/lib/systemd/system/sysinit.target.wants" && for want_file in *; do [ "$want_file" = "systemd-tmpfiles-setup" ] || rm -f "$want_file"; done; fi; \
+  if [ -d "/lib/systemd/system/sysinit.target.wants" ];then cd "/lib/systemd/system/sysinit.target.wants" && rm -f $(ls | grep -v systemd-tmpfiles-setup);fi; \
   if [ -f "/root/docker/setup/07-cleanup.sh" ];then echo "Running the cleanup script";/root/docker/setup/07-cleanup.sh||{ echo "Failed to execute /root/docker/setup/07-cleanup.sh" >&2 && exit 10; };echo "Done running the cleanup script";fi; \
   echo ""
 
 RUN echo "Init done"
 FROM scratch
 ARG TZ
-ARG PATH
 ARG USER
 ARG TIMEZONE
 ARG LANGUAGE
@@ -201,46 +198,51 @@ ARG SERVICE_PORT
 ARG EXPOSE_PORTS
 ARG BUILD_VERSION
 ARG IMAGE_VERSION
-ARG GIT_COMMIT
 ARG WWW_ROOT_DIR
+ARG DEFAULT_FILE_DIR
+ARG DEFAULT_DATA_DIR
+ARG DEFAULT_CONF_DIR
+ARG DEFAULT_TEMPLATE_DIR
 ARG DISTRO_VERSION
 ARG NODE_VERSION
 ARG NODE_MANAGER
 ARG PHP_VERSION
 ARG PHP_SERVER
 ARG LICENSE="WTFPL"
-ARG ENV_PORTS="${EXPOSE_PORTS}"
+ARG ENV_PORTS=""
 
 USER ${USER}
 WORKDIR /root
 
 LABEL maintainer="CasjaysDev <docker-admin@casjaysdev.pro>"
 LABEL org.opencontainers.image.vendor="CasjaysDev"
-LABEL org.opencontainers.image.authors="CasjaysDev"
-LABEL org.opencontainers.image.licenses="${LICENSE}"
-LABEL org.opencontainers.image.title="${IMAGE_NAME}"
+LABEL org.opencontainers.image.authors="CasjaysDev <docker-admin@casjaysdev.pro"
 LABEL org.opencontainers.image.description="Containerized version of ${IMAGE_NAME}"
+LABEL org.opencontainers.image.title="${IMAGE_NAME}"
+LABEL org.opencontainers.image.base.name="${IMAGE_NAME}"
+LABEL org.opencontainers.image.authors="${LICENSE}"
 LABEL org.opencontainers.image.created="${BUILD_DATE}"
 LABEL org.opencontainers.image.version="${BUILD_VERSION}"
-LABEL org.opencontainers.image.revision="${GIT_COMMIT}"
+LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}"
 LABEL org.opencontainers.image.url="https://docker.io/casjaysdev/alpine"
 LABEL org.opencontainers.image.source="https://docker.io/casjaysdev/alpine"
-LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/alpine"
 LABEL org.opencontainers.image.vcs-type="Git"
+LABEL org.opencontainers.image.revision="${BUILD_VERSION}"
+LABEL org.opencontainers.image.source="https://github.com/dockersrc/alpine"
+LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/alpine"
 LABEL com.github.containers.toolbox="false"
 
 ENV ENV=~/.bashrc
 ENV USER="${USER}"
-ENV PATH="${PATH}"
-ENV TZ="${TIMEZONE}"
 ENV SHELL="/bin/bash"
+ENV TZ="${TIMEZONE}"
 ENV TIMEZONE="${TZ}"
 ENV LANG="${LANGUAGE}"
 ENV TERM="xterm-256color"
 ENV PORT="${SERVICE_PORT}"
 ENV ENV_PORTS="${ENV_PORTS}"
 ENV CONTAINER_NAME="${IMAGE_NAME}"
-ENV HOSTNAME="casjaysdevdocker-${IMAGE_NAME}"
+ENV HOSTNAME="casjaysdev-${IMAGE_NAME}"
 ENV PHP_SERVER="${PHP_SERVER}"
 ENV NODE_VERSION="${NODE_VERSION}"
 ENV NODE_MANAGER="${NODE_MANAGER}"
@@ -254,8 +256,6 @@ VOLUME [ "/config","/data" ]
 
 EXPOSE ${SERVICE_PORT} ${ENV_PORTS}
 
-STOPSIGNAL SIGRTMIN+3
-
-ENTRYPOINT [ "tini", "-p", "SIGTERM","--", "/usr/local/bin/entrypoint.sh" ]
+CMD [ "tail", "-f", "/dev/null" ]
+ENTRYPOINT [ "tini","--","/usr/local/bin/entrypoint.sh" ]
 HEALTHCHECK --start-period=10m --interval=5m --timeout=15s CMD [ "/usr/local/bin/entrypoint.sh", "healthcheck" ]
-
diff --git a/Dockerfile.3.23 b/Dockerfile.3.23
index 1e7562c..007a6fb 100644
--- a/Dockerfile.3.23
+++ b/Dockerfile.3.23
@@ -1,11 +1,15 @@
+# syntax=docker/dockerfile:1
 # Docker image for alpine using the alpine template
 ARG IMAGE_NAME="alpine"
 ARG PHP_SERVER="alpine"
-ARG BUILD_DATE="202607111917"
+ARG BUILD_DATE="202408111050"
 ARG LANGUAGE="en_US.UTF-8"
 ARG TIMEZONE="America/New_York"
 ARG WWW_ROOT_DIR="/usr/local/share/httpd/default"
-ARG PATH="/usr/local/etc/docker/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+ARG DEFAULT_FILE_DIR="/usr/local/share/template-files"
+ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
+ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
+ARG DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults"
 
 ARG USER="root"
 ARG SHELL_OPTS="set -e -o pipefail"
@@ -21,7 +25,7 @@ ARG IMAGE_VERSION="3.23"
 ARG CONTAINER_VERSION=""
 
 ARG PULL_URL="alpine"
-ARG DISTRO_VERSION="3.23"
+ARG DISTRO_VERSION="${IMAGE_VERSION}"
 ARG BUILD_VERSION="${BUILD_DATE}"
 
 FROM tianon/gosu:latest AS gosu
@@ -34,228 +38,77 @@ ARG LANGUAGE
 ARG IMAGE_NAME
 ARG BUILD_DATE
 ARG SERVICE_PORT
-ARG EXPOSE_PORTS
 ARG BUILD_VERSION
-ARG IMAGE_VERSION
-ARG WWW_ROOT_DIR
-ARG DISTRO_VERSION
-ARG NODE_VERSION
-ARG NODE_MANAGER
-ARG PHP_VERSION
-ARG PHP_SERVER
 ARG SHELL_OPTS
-ARG PATH
+ARG DISTRO_VERSION
+ARG CONTAINER_VERSION
 
-ARG PACK_LIST="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates "
+ARG PACK_LIST="bash tini bash-completion git curl wget sudo unzip iproute2 openrc msmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates "
 
 ENV ENV=~/.profile
 ENV SHELL="/bin/sh"
-ENV PATH="${PATH}"
 ENV TZ="${TIMEZONE}"
 ENV TIMEZONE="${TZ}"
 ENV LANG="${LANGUAGE}"
 ENV TERM="xterm-256color"
-ENV HOSTNAME="casjaysdevdocker-alpine"
-
-USER ${USER}
-WORKDIR /root
-
-RUN set -e; \
-  echo "Updating the system"; \
-  apk upgrade --no-cache
-
-COPY ./rootfs/. /
-
-RUN set -e; \
-  echo "Ensuring bash and system certs are installed"; \
-  pkmgr install bash ca-certificates; \
-  update-ca-certificates
-
-RUN set -e; \
-  echo "Setting up prerequisites"; \
-  apk --no-cache add bash; \
-  SH_CMD="$(which sh 2>/dev/null||command -v sh 2>/dev/null)"; \
-  BASH_CMD="$(which bash 2>/dev/null||command -v bash 2>/dev/null)"; \
-  [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/bin/sh" || true; \
-  [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/usr/bin/sh" || true; \
-  [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && symlink "$BASH_CMD" "$SH_CMD" || true; \
-  [ -n "$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'$BASH_CMD'|g' "/etc/passwd" || true
-
-ENV SHELL="/bin/bash"
-SHELL [ "/bin/bash", "-c" ]
-
-COPY --from=gosu /usr/local/bin/gosu /usr/local/bin/gosu
-
-RUN echo "Initializing the system"; \
-  $SHELL_OPTS; \
-  mkdir -p "/root/docker/setup" "/etc/profile.d"; \
-  if [ -f "/root/docker/setup/00-init.sh" ];then echo "Running the init script";/root/docker/setup/00-init.sh||{ echo "Failed to execute /root/docker/setup/00-init.sh" >&2 && exit 10; };echo "Done running the init script";fi; \
-  echo ""
-
-RUN echo "Creating and editing system files "; \
-  $SHELL_OPTS; \
-
-  rm -Rf "/etc/apk/repositories"; \
-  [ "$DISTRO_VERSION" = "latest" ] && DISTRO_VERSION="edge";[ "$DISTRO_VERSION" = "edge" ] || DISTRO_VERSION="v${DISTRO_VERSION}"; \
-  echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/main" >>"/etc/apk/repositories"; \
-  echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/community" >>"/etc/apk/repositories"; \
-  if [ "${DISTRO_VERSION}" = "edge" ]; then echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/testing" >>"/etc/apk/repositories";fi; \
-  apk update; apk upgrade --no-cache; \
-  if [ -f "/root/docker/setup/01-system.sh" ];then echo "Running the system script";/root/docker/setup/01-system.sh||{ echo "Failed to execute /root/docker/setup/01-system.sh" >&2 && exit 10; };echo "Done running the system script";fi; \
-  echo ""
-
-RUN echo "Running pre-package commands"; \
-  $SHELL_OPTS; \
-  echo ""
-
-RUN echo "Setting up and installing packages"; \
-  $SHELL_OPTS; \
-  if [ -n "${PACK_LIST}" ];then echo "Installing packages: $PACK_LIST";echo "${PACK_LIST}" >/root/docker/setup/packages.txt;pkmgr install ${PACK_LIST};fi; \
-  echo ""
-
-RUN echo "Initializing packages before copying files to image"; \
-  $SHELL_OPTS; \
-  if [ -f "/root/docker/setup/02-packages.sh" ];then echo "Running the packages script";/root/docker/setup/02-packages.sh||{ echo "Failed to execute /root/docker/setup/02-packages.sh" >&2 && exit 10; };echo "Done running the packages script";fi; \
-  echo ""
-
-COPY ./Dockerfile.3.23 /root/docker/Dockerfile
-
-RUN echo "Updating system files "; \
-  $SHELL_OPTS; \
-  echo "$TIMEZONE" >"/etc/timezone"; \
-  touch "/etc/profile" "/root/.profile"; \
-  echo 'hosts: files dns' >"/etc/nsswitch.conf"; \
-  [ "$PHP_VERSION" = "system" ] && PHP_VERSION="php" || true; \
-  PHP_BIN="$(command -v ${PHP_VERSION} 2>/dev/null || true)"; \
-  set -- /usr/*bin/php*fpm*; [ -e "$1" ] && PHP_FPM="$1" || PHP_FPM=""; \
-  pip_bin="$(command -v python3 2>/dev/null || command -v python2 2>/dev/null || command -v python 2>/dev/null || true)"; \
-  py_version="$(command $pip_bin --version | sed 's|[pP]ython ||g' | awk -F '.' '{print $1$2}' | grep '[0-9]' || true)"; \
-  [ "$py_version" -gt "310" ] && pip_opts="--break-system-packages " || pip_opts=""; \
-  [ -f "/usr/share/zoneinfo/${TZ}" ] && ln -sf "/usr/share/zoneinfo/${TZ}" "/etc/localtime" || true; \
-  [ -n "$PHP_BIN" ] && [ -z "$(command -v php 2>/dev/null)" ] && ln -sf "$PHP_BIN" "/usr/bin/php" 2>/dev/null || true; \
-  [ -n "$PHP_FPM" ] && [ -z "$(command -v php-fpm 2>/dev/null)" ] && ln -sf "$PHP_FPM" "/usr/bin/php-fpm" 2>/dev/null || true; \
-  if [ -f "/etc/profile.d/color_prompt.sh.disabled" ]; then mv -f "/etc/profile.d/color_prompt.sh.disabled" "/etc/profile.d/color_prompt.sh";fi ; \
-  { [ -f "/etc/bash/bashrc" ] && cp -Rf "/etc/bash/bashrc" "/root/.bashrc"; } || { [ -f "/etc/bashrc" ] && cp -Rf "/etc/bashrc" "/root/.bashrc"; } || { [ -f "/etc/bash.bashrc" ] && cp -Rf "/etc/bash.bashrc" "/root/.bashrc"; } || true; \
-  if [ -z "$(command -v "apt-get" 2>/dev/null)" ];then grep -sh -q 'alias quit' "/root/.bashrc" || printf '# Profile\n\n%s\n%s\n%s\n' '. /etc/profile' '. /root/.profile' "alias quit='exit 0 2>/dev/null'" >>"/root/.bashrc"; fi; \
-  if [ "$PHP_VERSION" != "system" ] && [ -e "/etc/php" ] && [ -d "/etc/${PHP_VERSION}" ];then rm -Rf "/etc/php";fi; \
-  if [ "$PHP_VERSION" != "system" ] && [ -n "${PHP_VERSION}" ] && [ -d "/etc/${PHP_VERSION}" ];then ln -sf "/etc/${PHP_VERSION}" "/etc/php";fi; \
-  if [ -f "/root/docker/setup/03-files.sh" ];then echo "Running the files script";/root/docker/setup/03-files.sh||{ echo "Failed to execute /root/docker/setup/03-files.sh" >&2 && exit 10; };echo "Done running the files script";fi; \
-  echo ""
-
-RUN echo "Custom Settings"; \
-  $SHELL_OPTS; \
-echo ""
-
-RUN echo "Setting up users and scripts "; \
-  $SHELL_OPTS; \
-  if [ -f "/root/docker/setup/04-users.sh" ];then echo "Running the users script";/root/docker/setup/04-users.sh||{ echo "Failed to execute /root/docker/setup/04-users.sh" >&2 && exit 10; };echo "Done running the users script";fi; \
-  echo ""
-
-RUN echo "Running the user init commands"; \
-  $SHELL_OPTS; \
-  echo ""
-
-RUN echo "Setting OS Settings "; \
-  $SHELL_OPTS; \
-  echo ""
-
-RUN echo "Custom Applications"; \
-  $SHELL_OPTS; \
-echo ""
-
-RUN echo "Running custom commands"; \
-  if [ -f "/root/docker/setup/05-custom.sh" ];then echo "Running the custom script";/root/docker/setup/05-custom.sh||{ echo "Failed to execute /root/docker/setup/05-custom.sh" && exit 10; };echo "Done running the custom script";fi; \
-  echo ""
-
-RUN echo "Running final commands before cleanup"; \
-  $SHELL_OPTS; \
-  if [ -f "/root/docker/setup/06-post.sh" ];then echo "Running the post script";/root/docker/setup/06-post.sh||{ echo "Failed to execute /root/docker/setup/06-post.sh" >&2 && exit 10; };echo "Done running the post script";fi; \
-  echo ""
-
-RUN echo "Deleting unneeded files"; \
-  $SHELL_OPTS; \
-  pkmgr clean; \
-  rm -Rf "/config" "/data" || true; \
-  rm -rf /etc/systemd/system/*.wants/* || true; \
-  rm -rf /lib/systemd/system/systemd-update-utmp* || true; \
-  rm -rf /lib/systemd/system/anaconda.target.wants/* || true; \
-  rm -rf /lib/systemd/system/local-fs.target.wants/* || true; \
-  rm -rf /lib/systemd/system/multi-user.target.wants/* || true; \
-  rm -rf /lib/systemd/system/sockets.target.wants/*udev* || true; \
-  rm -rf /lib/systemd/system/sockets.target.wants/*initctl* || true; \
-  rm -Rf /usr/share/doc/* /var/tmp/* /var/cache/*/* /root/.cache/* /usr/share/info/* /tmp/* || true; \
-  if [ -d "/lib/systemd/system/sysinit.target.wants" ];then cd "/lib/systemd/system/sysinit.target.wants" && for want_file in *; do [ "$want_file" = "systemd-tmpfiles-setup" ] || rm -f "$want_file"; done; fi; \
-  if [ -f "/root/docker/setup/07-cleanup.sh" ];then echo "Running the cleanup script";/root/docker/setup/07-cleanup.sh||{ echo "Failed to execute /root/docker/setup/07-cleanup.sh" >&2 && exit 10; };echo "Done running the cleanup script";fi; \
-  echo ""
-
-RUN echo "Init done"
-FROM scratch
-ARG TZ
-ARG PATH
-ARG USER
-ARG TIMEZONE
-ARG LANGUAGE
-ARG IMAGE_NAME
-ARG BUILD_DATE
-ARG SERVICE_PORT
-ARG EXPOSE_PORTS
-ARG BUILD_VERSION
-ARG IMAGE_VERSION
-ARG GIT_COMMIT
-ARG WWW_ROOT_DIR
-ARG DISTRO_VERSION
-ARG NODE_VERSION
-ARG NODE_MANAGER
-ARG PHP_VERSION
-ARG PHP_SERVER
-ARG LICENSE="WTFPL"
-ARG ENV_PORTS="${EXPOSE_PORTS}"
-
-USER ${USER}
-WORKDIR /root
-
-LABEL maintainer="CasjaysDev <docker-admin@casjaysdev.pro>"
-LABEL org.opencontainers.image.vendor="CasjaysDev"
-LABEL org.opencontainers.image.authors="CasjaysDev"
-LABEL org.opencontainers.image.licenses="${LICENSE}"
-LABEL org.opencontainers.image.title="${IMAGE_NAME}"
-LABEL org.opencontainers.image.description="Containerized version of ${IMAGE_NAME}"
-LABEL org.opencontainers.image.created="${BUILD_DATE}"
-LABEL org.opencontainers.image.version="${BUILD_VERSION}"
-LABEL org.opencontainers.image.revision="${GIT_COMMIT}"
-LABEL org.opencontainers.image.url="https://docker.io/casjaysdev/alpine"
-LABEL org.opencontainers.image.source="https://docker.io/casjaysdev/alpine"
-LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/alpine"
-LABEL org.opencontainers.image.vcs-type="Git"
-LABEL com.github.containers.toolbox="false"
-
-ENV ENV=~/.bashrc
-ENV USER="${USER}"
-ENV PATH="${PATH}"
-ENV TZ="${TIMEZONE}"
-ENV SHELL="/bin/bash"
-ENV TIMEZONE="${TZ}"
-ENV LANG="${LANGUAGE}"
-ENV TERM="xterm-256color"
 ENV PORT="${SERVICE_PORT}"
-ENV ENV_PORTS="${ENV_PORTS}"
 ENV CONTAINER_NAME="${IMAGE_NAME}"
-ENV HOSTNAME="casjaysdevdocker-${IMAGE_NAME}"
-ENV PHP_SERVER="${PHP_SERVER}"
-ENV NODE_VERSION="${NODE_VERSION}"
-ENV NODE_MANAGER="${NODE_MANAGER}"
-ENV PHP_VERSION="${PHP_VERSION}"
-ENV DISTRO_VERSION="${IMAGE_VERSION}"
-ENV WWW_ROOT_DIR="${WWW_ROOT_DIR}"
+ENV HOSTNAME="${CONTAINER_NAME}"
+ENV USER="${USER}"
 
-COPY --from=build /. /
+USER ${USER}
+WORKDIR /root
 
-VOLUME [ "/config","/data" ]
+COPY ./rootfs/. /
 
-EXPOSE ${SERVICE_PORT} ${ENV_PORTS}
+RUN set -e; \
+  echo 'Installing packages' && \
+  apk update && apk upgrade --no-cache && apk add --no-cache ${PACK_LIST}
 
-STOPSIGNAL SIGRTMIN+3
+RUN set -e; \
+  echo 'Running initial scripts' && \
+  sh -c "INIT_DATE='${BUILD_DATE}' && export INIT_DATE && bash -c /root/docker/setup/00-init.sh" && \
+  echo 'Initial setup completed'
 
-ENTRYPOINT [ "tini", "-p", "SIGTERM","--", "/usr/local/bin/entrypoint.sh" ]
-HEALTHCHECK --start-period=10m --interval=5m --timeout=15s CMD [ "/usr/local/bin/entrypoint.sh", "healthcheck" ]
+RUN set -e; \
+  echo 'Running post install scripts' && \
+  if [ -f "/root/docker/setup/02-packages.sh" ]; then bash -c "/root/docker/setup/02-packages.sh"; fi && \
+  if [ -f "/root/docker/setup/03-files.sh" ]; then bash -c "/root/docker/setup/03-files.sh"; fi && \
+  if [ -f "/root/docker/setup/04-users.sh" ]; then bash -c "/root/docker/setup/04-users.sh"; fi && \
+  if [ -f "/root/docker/setup/05-custom.sh" ]; then bash -c "/root/docker/setup/05-custom.sh"; fi && \
+  echo 'Post install completed'
 
+FROM scratch
+ARG BUILD_DATE
+ARG IMAGE_NAME
+ARG TIMEZONE
+ARG LANGUAGE
+
+ENV ENV=~/.profile
+ENV SHELL="/bin/sh"
+ENV TZ="${TIMEZONE}"
+ENV TIMEZONE="${TZ}"
+ENV LANG="${LANGUAGE}"
+ENV TERM="xterm-256color"
+ENV CONTAINER_NAME="${IMAGE_NAME}"
+ENV HOSTNAME="${CONTAINER_NAME}"
+ENV USER="root"
+
+USER root
+WORKDIR /root
+
+LABEL org.opencontainers.image.vendor="CasjaysDev"
+LABEL org.opencontainers.image.title="${IMAGE_NAME}"
+LABEL org.opencontainers.image.base.name="${IMAGE_NAME}"
+LABEL org.opencontainers.image.description="Containerized version of ${IMAGE_NAME}"
+LABEL org.opencontainers.image.build-date="${BUILD_DATE}"
+LABEL org.opencontainers.image.authors="CasjaysDev <docker-admin@casjaysdev.pro>"
+
+COPY --from=gosu /usr/local/bin/gosu /usr/local/bin/gosu
+COPY --from=build / /
+
+VOLUME [ "/root","/data","/config" ]
+
+ENTRYPOINT [ "tini","--","/usr/local/bin/entrypoint.sh" ]
+HEALTHCHECK --interval=60s --timeout=30s --start-period=30s --retries=3 \
+  CMD [ "/usr/local/bin/entrypoint.sh", "healthcheck" ]
diff --git a/Dockerfile.edge b/Dockerfile.edge
index 35fc563..c0f8081 100644
--- a/Dockerfile.edge
+++ b/Dockerfile.edge
@@ -1,11 +1,15 @@
+# syntax=docker/dockerfile:1
 # Docker image for alpine using the alpine template
 ARG IMAGE_NAME="alpine"
 ARG PHP_SERVER="alpine"
-ARG BUILD_DATE="202607112310"
+ARG BUILD_DATE="202408111050"
 ARG LANGUAGE="en_US.UTF-8"
 ARG TIMEZONE="America/New_York"
 ARG WWW_ROOT_DIR="/usr/local/share/httpd/default"
-ARG PATH="/usr/local/etc/docker/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+ARG DEFAULT_FILE_DIR="/usr/local/share/template-files"
+ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
+ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
+ARG DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults"
 
 ARG USER="root"
 ARG SHELL_OPTS="set -e -o pipefail"
@@ -21,7 +25,7 @@ ARG IMAGE_VERSION="edge"
 ARG CONTAINER_VERSION=""
 
 ARG PULL_URL="alpine"
-ARG DISTRO_VERSION="edge"
+ARG DISTRO_VERSION="${IMAGE_VERSION}"
 ARG BUILD_VERSION="${BUILD_DATE}"
 
 FROM tianon/gosu:latest AS gosu
@@ -38,47 +42,40 @@ ARG EXPOSE_PORTS
 ARG BUILD_VERSION
 ARG IMAGE_VERSION
 ARG WWW_ROOT_DIR
+ARG DEFAULT_FILE_DIR
+ARG DEFAULT_DATA_DIR
+ARG DEFAULT_CONF_DIR
+ARG DEFAULT_TEMPLATE_DIR
 ARG DISTRO_VERSION
 ARG NODE_VERSION
 ARG NODE_MANAGER
 ARG PHP_VERSION
 ARG PHP_SERVER
 ARG SHELL_OPTS
-ARG PATH
 
-ARG PACK_LIST="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates "
+ARG PACK_LIST="bash tini bash-completion git curl wget sudo unzip iproute2 openrc msmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates "
 
 ENV ENV=~/.profile
 ENV SHELL="/bin/sh"
-ENV PATH="${PATH}"
 ENV TZ="${TIMEZONE}"
 ENV TIMEZONE="${TZ}"
 ENV LANG="${LANGUAGE}"
 ENV TERM="xterm-256color"
-ENV HOSTNAME="casjaysdevdocker-alpine"
+ENV HOSTNAME="casjaysdev-alpine"
 
 USER ${USER}
 WORKDIR /root
 
-RUN set -e; \
-  echo "Updating the system"; \
-  apk upgrade --no-cache
-
-COPY ./rootfs/. /
-
-RUN set -e; \
-  echo "Ensuring bash and system certs are installed"; \
-  pkmgr install bash ca-certificates; \
-  update-ca-certificates
+COPY ./rootfs/usr/local/bin/. /usr/local/bin/
 
 RUN set -e; \
   echo "Setting up prerequisites"; \
   apk --no-cache add bash; \
   SH_CMD="$(which sh 2>/dev/null||command -v sh 2>/dev/null)"; \
   BASH_CMD="$(which bash 2>/dev/null||command -v bash 2>/dev/null)"; \
-  [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/bin/sh" || true; \
-  [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/usr/bin/sh" || true; \
-  [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && symlink "$BASH_CMD" "$SH_CMD" || true; \
+  [ -x "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/bin/sh" || true; \
+  [ -x "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/usr/bin/sh" || true; \
+  [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && ln -sf "$BASH_CMD" "$SH_CMD" || true; \
   [ -n "$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'$BASH_CMD'|g' "/etc/passwd" || true
 
 ENV SHELL="/bin/bash"
@@ -88,19 +85,19 @@ COPY --from=gosu /usr/local/bin/gosu /usr/local/bin/gosu
 
 RUN echo "Initializing the system"; \
   $SHELL_OPTS; \
-  mkdir -p "/root/docker/setup" "/etc/profile.d"; \
+  mkdir -p "${DEFAULT_DATA_DIR}" "${DEFAULT_CONF_DIR}" "${DEFAULT_TEMPLATE_DIR}" "/root/docker/setup" "/etc/profile.d"; \
   if [ -f "/root/docker/setup/00-init.sh" ];then echo "Running the init script";/root/docker/setup/00-init.sh||{ echo "Failed to execute /root/docker/setup/00-init.sh" >&2 && exit 10; };echo "Done running the init script";fi; \
   echo ""
 
 RUN echo "Creating and editing system files "; \
   $SHELL_OPTS; \
-
   rm -Rf "/etc/apk/repositories"; \
   [ "$DISTRO_VERSION" = "latest" ] && DISTRO_VERSION="edge";[ "$DISTRO_VERSION" = "edge" ] || DISTRO_VERSION="v${DISTRO_VERSION}"; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/main" >>"/etc/apk/repositories"; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/community" >>"/etc/apk/repositories"; \
   if [ "${DISTRO_VERSION}" = "edge" ]; then echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/testing" >>"/etc/apk/repositories";fi; \
-  apk update; apk upgrade --no-cache; \
+  apk update; \
+  apk upgrade --no-cache; \
   if [ -f "/root/docker/setup/01-system.sh" ];then echo "Running the system script";/root/docker/setup/01-system.sh||{ echo "Failed to execute /root/docker/setup/01-system.sh" >&2 && exit 10; };echo "Done running the system script";fi; \
   echo ""
 
@@ -118,6 +115,7 @@ RUN echo "Initializing packages before copying files to image"; \
   if [ -f "/root/docker/setup/02-packages.sh" ];then echo "Running the packages script";/root/docker/setup/02-packages.sh||{ echo "Failed to execute /root/docker/setup/02-packages.sh" >&2 && exit 10; };echo "Done running the packages script";fi; \
   echo ""
 
+COPY ./rootfs/. /
 COPY ./Dockerfile.edge /root/docker/Dockerfile
 
 RUN echo "Updating system files "; \
@@ -127,7 +125,7 @@ RUN echo "Updating system files "; \
   echo 'hosts: files dns' >"/etc/nsswitch.conf"; \
   [ "$PHP_VERSION" = "system" ] && PHP_VERSION="php" || true; \
   PHP_BIN="$(command -v ${PHP_VERSION} 2>/dev/null || true)"; \
-  set -- /usr/*bin/php*fpm*; [ -e "$1" ] && PHP_FPM="$1" || PHP_FPM=""; \
+  PHP_FPM="$(ls /usr/*bin/php*fpm* 2>/dev/null || true)"; \
   pip_bin="$(command -v python3 2>/dev/null || command -v python2 2>/dev/null || command -v python 2>/dev/null || true)"; \
   py_version="$(command $pip_bin --version | sed 's|[pP]ython ||g' | awk -F '.' '{print $1$2}' | grep '[0-9]' || true)"; \
   [ "$py_version" -gt "310" ] && pip_opts="--break-system-packages " || pip_opts=""; \
@@ -136,7 +134,7 @@ RUN echo "Updating system files "; \
   [ -n "$PHP_FPM" ] && [ -z "$(command -v php-fpm 2>/dev/null)" ] && ln -sf "$PHP_FPM" "/usr/bin/php-fpm" 2>/dev/null || true; \
   if [ -f "/etc/profile.d/color_prompt.sh.disabled" ]; then mv -f "/etc/profile.d/color_prompt.sh.disabled" "/etc/profile.d/color_prompt.sh";fi ; \
   { [ -f "/etc/bash/bashrc" ] && cp -Rf "/etc/bash/bashrc" "/root/.bashrc"; } || { [ -f "/etc/bashrc" ] && cp -Rf "/etc/bashrc" "/root/.bashrc"; } || { [ -f "/etc/bash.bashrc" ] && cp -Rf "/etc/bash.bashrc" "/root/.bashrc"; } || true; \
-  if [ -z "$(command -v "apt-get" 2>/dev/null)" ];then grep -sh -q 'alias quit' "/root/.bashrc" || printf '# Profile\n\n%s\n%s\n%s\n' '. /etc/profile' '. /root/.profile' "alias quit='exit 0 2>/dev/null'" >>"/root/.bashrc"; fi; \
+  if [ -z "$(command -v "apt-get" 2>/dev/null)" ];then grep -s -q 'alias quit' "/root/.bashrc" || printf '# Profile\n\n%s\n%s\n%s\n' '. /etc/profile' '. /root/.profile' "alias quit='exit 0 2>/dev/null'" >>"/root/.bashrc"; fi; \
   if [ "$PHP_VERSION" != "system" ] && [ -e "/etc/php" ] && [ -d "/etc/${PHP_VERSION}" ];then rm -Rf "/etc/php";fi; \
   if [ "$PHP_VERSION" != "system" ] && [ -n "${PHP_VERSION}" ] && [ -d "/etc/${PHP_VERSION}" ];then ln -sf "/etc/${PHP_VERSION}" "/etc/php";fi; \
   if [ -f "/root/docker/setup/03-files.sh" ];then echo "Running the files script";/root/docker/setup/03-files.sh||{ echo "Failed to execute /root/docker/setup/03-files.sh" >&2 && exit 10; };echo "Done running the files script";fi; \
@@ -144,7 +142,7 @@ RUN echo "Updating system files "; \
 
 RUN echo "Custom Settings"; \
   $SHELL_OPTS; \
-echo ""
+  echo ""
 
 RUN echo "Setting up users and scripts "; \
   $SHELL_OPTS; \
@@ -161,7 +159,7 @@ RUN echo "Setting OS Settings "; \
 
 RUN echo "Custom Applications"; \
   $SHELL_OPTS; \
-echo ""
+  echo ""
 
 RUN echo "Running custom commands"; \
   if [ -f "/root/docker/setup/05-custom.sh" ];then echo "Running the custom script";/root/docker/setup/05-custom.sh||{ echo "Failed to execute /root/docker/setup/05-custom.sh" && exit 10; };echo "Done running the custom script";fi; \
@@ -184,14 +182,13 @@ RUN echo "Deleting unneeded files"; \
   rm -rf /lib/systemd/system/sockets.target.wants/*udev* || true; \
   rm -rf /lib/systemd/system/sockets.target.wants/*initctl* || true; \
   rm -Rf /usr/share/doc/* /var/tmp/* /var/cache/*/* /root/.cache/* /usr/share/info/* /tmp/* || true; \
-  if [ -d "/lib/systemd/system/sysinit.target.wants" ];then cd "/lib/systemd/system/sysinit.target.wants" && for want_file in *; do [ "$want_file" = "systemd-tmpfiles-setup" ] || rm -f "$want_file"; done; fi; \
+  if [ -d "/lib/systemd/system/sysinit.target.wants" ];then cd "/lib/systemd/system/sysinit.target.wants" && rm -f $(ls | grep -v systemd-tmpfiles-setup);fi; \
   if [ -f "/root/docker/setup/07-cleanup.sh" ];then echo "Running the cleanup script";/root/docker/setup/07-cleanup.sh||{ echo "Failed to execute /root/docker/setup/07-cleanup.sh" >&2 && exit 10; };echo "Done running the cleanup script";fi; \
   echo ""
 
 RUN echo "Init done"
 FROM scratch
 ARG TZ
-ARG PATH
 ARG USER
 ARG TIMEZONE
 ARG LANGUAGE
@@ -201,46 +198,51 @@ ARG SERVICE_PORT
 ARG EXPOSE_PORTS
 ARG BUILD_VERSION
 ARG IMAGE_VERSION
-ARG GIT_COMMIT
 ARG WWW_ROOT_DIR
+ARG DEFAULT_FILE_DIR
+ARG DEFAULT_DATA_DIR
+ARG DEFAULT_CONF_DIR
+ARG DEFAULT_TEMPLATE_DIR
 ARG DISTRO_VERSION
 ARG NODE_VERSION
 ARG NODE_MANAGER
 ARG PHP_VERSION
 ARG PHP_SERVER
 ARG LICENSE="WTFPL"
-ARG ENV_PORTS="${EXPOSE_PORTS}"
+ARG ENV_PORTS=""
 
 USER ${USER}
 WORKDIR /root
 
 LABEL maintainer="CasjaysDev <docker-admin@casjaysdev.pro>"
 LABEL org.opencontainers.image.vendor="CasjaysDev"
-LABEL org.opencontainers.image.authors="CasjaysDev"
-LABEL org.opencontainers.image.licenses="${LICENSE}"
-LABEL org.opencontainers.image.title="${IMAGE_NAME}"
+LABEL org.opencontainers.image.authors="CasjaysDev <docker-admin@casjaysdev.pro"
 LABEL org.opencontainers.image.description="Containerized version of ${IMAGE_NAME}"
+LABEL org.opencontainers.image.title="${IMAGE_NAME}"
+LABEL org.opencontainers.image.base.name="${IMAGE_NAME}"
+LABEL org.opencontainers.image.authors="${LICENSE}"
 LABEL org.opencontainers.image.created="${BUILD_DATE}"
 LABEL org.opencontainers.image.version="${BUILD_VERSION}"
-LABEL org.opencontainers.image.revision="${GIT_COMMIT}"
+LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}"
 LABEL org.opencontainers.image.url="https://docker.io/casjaysdev/alpine"
 LABEL org.opencontainers.image.source="https://docker.io/casjaysdev/alpine"
-LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/alpine"
 LABEL org.opencontainers.image.vcs-type="Git"
+LABEL org.opencontainers.image.revision="${BUILD_VERSION}"
+LABEL org.opencontainers.image.source="https://github.com/dockersrc/alpine"
+LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/alpine"
 LABEL com.github.containers.toolbox="false"
 
 ENV ENV=~/.bashrc
 ENV USER="${USER}"
-ENV PATH="${PATH}"
-ENV TZ="${TIMEZONE}"
 ENV SHELL="/bin/bash"
+ENV TZ="${TIMEZONE}"
 ENV TIMEZONE="${TZ}"
 ENV LANG="${LANGUAGE}"
 ENV TERM="xterm-256color"
 ENV PORT="${SERVICE_PORT}"
 ENV ENV_PORTS="${ENV_PORTS}"
 ENV CONTAINER_NAME="${IMAGE_NAME}"
-ENV HOSTNAME="casjaysdevdocker-${IMAGE_NAME}"
+ENV HOSTNAME="casjaysdev-${IMAGE_NAME}"
 ENV PHP_SERVER="${PHP_SERVER}"
 ENV NODE_VERSION="${NODE_VERSION}"
 ENV NODE_MANAGER="${NODE_MANAGER}"
@@ -254,8 +256,6 @@ VOLUME [ "/config","/data" ]
 
 EXPOSE ${SERVICE_PORT} ${ENV_PORTS}
 
-STOPSIGNAL SIGRTMIN+3
-
-ENTRYPOINT [ "tini", "-p", "SIGTERM","--", "/usr/local/bin/entrypoint.sh" ]
+CMD [ "tail", "-f", "/dev/null" ]
+ENTRYPOINT [ "tini","--","/usr/local/bin/entrypoint.sh" ]
 HEALTHCHECK --start-period=10m --interval=5m --timeout=15s CMD [ "/usr/local/bin/entrypoint.sh", "healthcheck" ]
-
diff --git a/Dockerfile.testing b/Dockerfile.testing
index 74d2562..bb36fc2 100644
--- a/Dockerfile.testing
+++ b/Dockerfile.testing
@@ -1,11 +1,15 @@
+# syntax=docker/dockerfile:1
 # Docker image for alpine using the alpine template
 ARG IMAGE_NAME="alpine"
 ARG PHP_SERVER="alpine"
-ARG BUILD_DATE="202607111917"
+ARG BUILD_DATE="202408111050"
 ARG LANGUAGE="en_US.UTF-8"
 ARG TIMEZONE="America/New_York"
 ARG WWW_ROOT_DIR="/usr/local/share/httpd/default"
-ARG PATH="/usr/local/etc/docker/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+ARG DEFAULT_FILE_DIR="/usr/local/share/template-files"
+ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
+ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
+ARG DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults"
 
 ARG USER="root"
 ARG SHELL_OPTS="set -e -o pipefail"
@@ -17,11 +21,11 @@ ARG NODE_VERSION="system"
 ARG NODE_MANAGER="system"
 
 ARG IMAGE_REPO="casjaysdev/alpine"
-ARG IMAGE_VERSION="testing"
+ARG IMAGE_VERSION="latest"
 ARG CONTAINER_VERSION=""
 
 ARG PULL_URL="alpine"
-ARG DISTRO_VERSION="testing"
+ARG DISTRO_VERSION="${IMAGE_VERSION}"
 ARG BUILD_VERSION="${BUILD_DATE}"
 
 FROM tianon/gosu:latest AS gosu
@@ -34,228 +38,77 @@ ARG LANGUAGE
 ARG IMAGE_NAME
 ARG BUILD_DATE
 ARG SERVICE_PORT
-ARG EXPOSE_PORTS
 ARG BUILD_VERSION
-ARG IMAGE_VERSION
-ARG WWW_ROOT_DIR
-ARG DISTRO_VERSION
-ARG NODE_VERSION
-ARG NODE_MANAGER
-ARG PHP_VERSION
-ARG PHP_SERVER
 ARG SHELL_OPTS
-ARG PATH
+ARG DISTRO_VERSION
+ARG CONTAINER_VERSION
 
-ARG PACK_LIST="bash tini bash-completion git curl wget sudo unzip iproute2 openrc ssmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates tor "
+ARG PACK_LIST="bash tini bash-completion git curl wget sudo unzip iproute2 openrc msmtp openssl jq tzdata mailcap ncurses util-linux pciutils usbutils coreutils binutils findutils grep rsync zip py3-pip procps net-tools sed gawk attr readline lsof less shadow ca-certificates tor "
 
 ENV ENV=~/.profile
 ENV SHELL="/bin/sh"
-ENV PATH="${PATH}"
 ENV TZ="${TIMEZONE}"
 ENV TIMEZONE="${TZ}"
 ENV LANG="${LANGUAGE}"
 ENV TERM="xterm-256color"
-ENV HOSTNAME="casjaysdevdocker-alpine"
-
-USER ${USER}
-WORKDIR /root
-
-RUN set -e; \
-  echo "Updating the system"; \
-  apk upgrade --no-cache
-
-COPY ./rootfs/. /
-
-RUN set -e; \
-  echo "Ensuring bash and system certs are installed"; \
-  pkmgr install bash ca-certificates; \
-  update-ca-certificates
-
-RUN set -e; \
-  echo "Setting up prerequisites"; \
-  apk --no-cache add bash; \
-  SH_CMD="$(which sh 2>/dev/null||command -v sh 2>/dev/null)"; \
-  BASH_CMD="$(which bash 2>/dev/null||command -v bash 2>/dev/null)"; \
-  [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/bin/sh" || true; \
-  [ -x "$BASH_CMD" ] && symlink "$BASH_CMD" "/usr/bin/sh" || true; \
-  [ -x "$BASH_CMD" ] && [ "$SH_CMD" != "/bin/sh" ] && symlink "$BASH_CMD" "$SH_CMD" || true; \
-  [ -n "$BASH_CMD" ] && sed -i 's|root:x:.*|root:x:0:0:root:/root:'$BASH_CMD'|g' "/etc/passwd" || true
-
-ENV SHELL="/bin/bash"
-SHELL [ "/bin/bash", "-c" ]
-
-COPY --from=gosu /usr/local/bin/gosu /usr/local/bin/gosu
-
-RUN echo "Initializing the system"; \
-  $SHELL_OPTS; \
-  mkdir -p "/root/docker/setup" "/etc/profile.d"; \
-  if [ -f "/root/docker/setup/00-init.sh" ];then echo "Running the init script";/root/docker/setup/00-init.sh||{ echo "Failed to execute /root/docker/setup/00-init.sh" >&2 && exit 10; };echo "Done running the init script";fi; \
-  echo ""
-
-RUN echo "Creating and editing system files "; \
-  $SHELL_OPTS; \
-
-  rm -Rf "/etc/apk/repositories"; \
-  [ "$DISTRO_VERSION" = "latest" ] && DISTRO_VERSION="edge";[ "$DISTRO_VERSION" = "edge" ] || DISTRO_VERSION="v${DISTRO_VERSION}"; \
-  echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/main" >>"/etc/apk/repositories"; \
-  echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/community" >>"/etc/apk/repositories"; \
-  if [ "${DISTRO_VERSION}" = "edge" ]; then echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/testing" >>"/etc/apk/repositories";fi; \
-  apk update; apk upgrade --no-cache; \
-  if [ -f "/root/docker/setup/01-system.sh" ];then echo "Running the system script";/root/docker/setup/01-system.sh||{ echo "Failed to execute /root/docker/setup/01-system.sh" >&2 && exit 10; };echo "Done running the system script";fi; \
-  echo ""
-
-RUN echo "Running pre-package commands"; \
-  $SHELL_OPTS; \
-  echo ""
-
-RUN echo "Setting up and installing packages"; \
-  $SHELL_OPTS; \
-  if [ -n "${PACK_LIST}" ];then echo "Installing packages: $PACK_LIST";echo "${PACK_LIST}" >/root/docker/setup/packages.txt;pkmgr install ${PACK_LIST};fi; \
-  echo ""
-
-RUN echo "Initializing packages before copying files to image"; \
-  $SHELL_OPTS; \
-  if [ -f "/root/docker/setup/02-packages.sh" ];then echo "Running the packages script";/root/docker/setup/02-packages.sh||{ echo "Failed to execute /root/docker/setup/02-packages.sh" >&2 && exit 10; };echo "Done running the packages script";fi; \
-  echo ""
-
-COPY ./Dockerfile.testing /root/docker/Dockerfile
-
-RUN echo "Updating system files "; \
-  $SHELL_OPTS; \
-  echo "$TIMEZONE" >"/etc/timezone"; \
-  touch "/etc/profile" "/root/.profile"; \
-  echo 'hosts: files dns' >"/etc/nsswitch.conf"; \
-  [ "$PHP_VERSION" = "system" ] && PHP_VERSION="php" || true; \
-  PHP_BIN="$(command -v ${PHP_VERSION} 2>/dev/null || true)"; \
-  set -- /usr/*bin/php*fpm*; [ -e "$1" ] && PHP_FPM="$1" || PHP_FPM=""; \
-  pip_bin="$(command -v python3 2>/dev/null || command -v python2 2>/dev/null || command -v python 2>/dev/null || true)"; \
-  py_version="$(command $pip_bin --version | sed 's|[pP]ython ||g' | awk -F '.' '{print $1$2}' | grep '[0-9]' || true)"; \
-  [ "$py_version" -gt "310" ] && pip_opts="--break-system-packages " || pip_opts=""; \
-  [ -f "/usr/share/zoneinfo/${TZ}" ] && ln -sf "/usr/share/zoneinfo/${TZ}" "/etc/localtime" || true; \
-  [ -n "$PHP_BIN" ] && [ -z "$(command -v php 2>/dev/null)" ] && ln -sf "$PHP_BIN" "/usr/bin/php" 2>/dev/null || true; \
-  [ -n "$PHP_FPM" ] && [ -z "$(command -v php-fpm 2>/dev/null)" ] && ln -sf "$PHP_FPM" "/usr/bin/php-fpm" 2>/dev/null || true; \
-  if [ -f "/etc/profile.d/color_prompt.sh.disabled" ]; then mv -f "/etc/profile.d/color_prompt.sh.disabled" "/etc/profile.d/color_prompt.sh";fi ; \
-  { [ -f "/etc/bash/bashrc" ] && cp -Rf "/etc/bash/bashrc" "/root/.bashrc"; } || { [ -f "/etc/bashrc" ] && cp -Rf "/etc/bashrc" "/root/.bashrc"; } || { [ -f "/etc/bash.bashrc" ] && cp -Rf "/etc/bash.bashrc" "/root/.bashrc"; } || true; \
-  if [ -z "$(command -v "apt-get" 2>/dev/null)" ];then grep -sh -q 'alias quit' "/root/.bashrc" || printf '# Profile\n\n%s\n%s\n%s\n' '. /etc/profile' '. /root/.profile' "alias quit='exit 0 2>/dev/null'" >>"/root/.bashrc"; fi; \
-  if [ "$PHP_VERSION" != "system" ] && [ -e "/etc/php" ] && [ -d "/etc/${PHP_VERSION}" ];then rm -Rf "/etc/php";fi; \
-  if [ "$PHP_VERSION" != "system" ] && [ -n "${PHP_VERSION}" ] && [ -d "/etc/${PHP_VERSION}" ];then ln -sf "/etc/${PHP_VERSION}" "/etc/php";fi; \
-  if [ -f "/root/docker/setup/03-files.sh" ];then echo "Running the files script";/root/docker/setup/03-files.sh||{ echo "Failed to execute /root/docker/setup/03-files.sh" >&2 && exit 10; };echo "Done running the files script";fi; \
-  echo ""
-
-RUN echo "Custom Settings"; \
-  $SHELL_OPTS; \
-echo ""
-
-RUN echo "Setting up users and scripts "; \
-  $SHELL_OPTS; \
-  if [ -f "/root/docker/setup/04-users.sh" ];then echo "Running the users script";/root/docker/setup/04-users.sh||{ echo "Failed to execute /root/docker/setup/04-users.sh" >&2 && exit 10; };echo "Done running the users script";fi; \
-  echo ""
-
-RUN echo "Running the user init commands"; \
-  $SHELL_OPTS; \
-  echo ""
-
-RUN echo "Setting OS Settings "; \
-  $SHELL_OPTS; \
-  echo ""
-
-RUN echo "Custom Applications"; \
-  $SHELL_OPTS; \
-echo ""
-
-RUN echo "Running custom commands"; \
-  if [ -f "/root/docker/setup/05-custom.sh" ];then echo "Running the custom script";/root/docker/setup/05-custom.sh||{ echo "Failed to execute /root/docker/setup/05-custom.sh" && exit 10; };echo "Done running the custom script";fi; \
-  echo ""
-
-RUN echo "Running final commands before cleanup"; \
-  $SHELL_OPTS; \
-  if [ -f "/root/docker/setup/06-post.sh" ];then echo "Running the post script";/root/docker/setup/06-post.sh||{ echo "Failed to execute /root/docker/setup/06-post.sh" >&2 && exit 10; };echo "Done running the post script";fi; \
-  echo ""
-
-RUN echo "Deleting unneeded files"; \
-  $SHELL_OPTS; \
-  pkmgr clean; \
-  rm -Rf "/config" "/data" || true; \
-  rm -rf /etc/systemd/system/*.wants/* || true; \
-  rm -rf /lib/systemd/system/systemd-update-utmp* || true; \
-  rm -rf /lib/systemd/system/anaconda.target.wants/* || true; \
-  rm -rf /lib/systemd/system/local-fs.target.wants/* || true; \
-  rm -rf /lib/systemd/system/multi-user.target.wants/* || true; \
-  rm -rf /lib/systemd/system/sockets.target.wants/*udev* || true; \
-  rm -rf /lib/systemd/system/sockets.target.wants/*initctl* || true; \
-  rm -Rf /usr/share/doc/* /var/tmp/* /var/cache/*/* /root/.cache/* /usr/share/info/* /tmp/* || true; \
-  if [ -d "/lib/systemd/system/sysinit.target.wants" ];then cd "/lib/systemd/system/sysinit.target.wants" && for want_file in *; do [ "$want_file" = "systemd-tmpfiles-setup" ] || rm -f "$want_file"; done; fi; \
-  if [ -f "/root/docker/setup/07-cleanup.sh" ];then echo "Running the cleanup script";/root/docker/setup/07-cleanup.sh||{ echo "Failed to execute /root/docker/setup/07-cleanup.sh" >&2 && exit 10; };echo "Done running the cleanup script";fi; \
-  echo ""
-
-RUN echo "Init done"
-FROM scratch
-ARG TZ
-ARG PATH
-ARG USER
-ARG TIMEZONE
-ARG LANGUAGE
-ARG IMAGE_NAME
-ARG BUILD_DATE
-ARG SERVICE_PORT
-ARG EXPOSE_PORTS
-ARG BUILD_VERSION
-ARG IMAGE_VERSION
-ARG GIT_COMMIT
-ARG WWW_ROOT_DIR
-ARG DISTRO_VERSION
-ARG NODE_VERSION
-ARG NODE_MANAGER
-ARG PHP_VERSION
-ARG PHP_SERVER
-ARG LICENSE="WTFPL"
-ARG ENV_PORTS="${EXPOSE_PORTS}"
-
-USER ${USER}
-WORKDIR /root
-
-LABEL maintainer="CasjaysDev <docker-admin@casjaysdev.pro>"
-LABEL org.opencontainers.image.vendor="CasjaysDev"
-LABEL org.opencontainers.image.authors="CasjaysDev"
-LABEL org.opencontainers.image.licenses="${LICENSE}"
-LABEL org.opencontainers.image.title="${IMAGE_NAME}"
-LABEL org.opencontainers.image.description="Containerized version of ${IMAGE_NAME}"
-LABEL org.opencontainers.image.created="${BUILD_DATE}"
-LABEL org.opencontainers.image.version="${BUILD_VERSION}"
-LABEL org.opencontainers.image.revision="${GIT_COMMIT}"
-LABEL org.opencontainers.image.url="https://docker.io/casjaysdev/alpine"
-LABEL org.opencontainers.image.source="https://docker.io/casjaysdev/alpine"
-LABEL org.opencontainers.image.documentation="https://github.com/dockersrc/alpine"
-LABEL org.opencontainers.image.vcs-type="Git"
-LABEL com.github.containers.toolbox="false"
-
-ENV ENV=~/.bashrc
-ENV USER="${USER}"
-ENV PATH="${PATH}"
-ENV TZ="${TIMEZONE}"
-ENV SHELL="/bin/bash"
-ENV TIMEZONE="${TZ}"
-ENV LANG="${LANGUAGE}"
-ENV TERM="xterm-256color"
 ENV PORT="${SERVICE_PORT}"
-ENV ENV_PORTS="${ENV_PORTS}"
 ENV CONTAINER_NAME="${IMAGE_NAME}"
-ENV HOSTNAME="casjaysdevdocker-${IMAGE_NAME}"
-ENV PHP_SERVER="${PHP_SERVER}"
-ENV NODE_VERSION="${NODE_VERSION}"
-ENV NODE_MANAGER="${NODE_MANAGER}"
-ENV PHP_VERSION="${PHP_VERSION}"
-ENV DISTRO_VERSION="${IMAGE_VERSION}"
-ENV WWW_ROOT_DIR="${WWW_ROOT_DIR}"
+ENV HOSTNAME="${CONTAINER_NAME}"
+ENV USER="${USER}"
 
-COPY --from=build /. /
+USER ${USER}
+WORKDIR /root
 
-VOLUME [ "/config","/data" ]
+COPY ./rootfs/. /
 
-EXPOSE ${SERVICE_PORT} ${ENV_PORTS}
+RUN set -e; \
+  echo 'Installing packages' && \
+  apk update && apk upgrade --no-cache && apk add --no-cache ${PACK_LIST}
 
-STOPSIGNAL SIGRTMIN+3
+RUN set -e; \
+  echo 'Running initial scripts' && \
+  sh -c "INIT_DATE='${BUILD_DATE}' && export INIT_DATE && bash -c /root/docker/setup/00-init.sh" && \
+  echo 'Initial setup completed'
 
-ENTRYPOINT [ "tini", "-p", "SIGTERM","--", "/usr/local/bin/entrypoint.sh" ]
-HEALTHCHECK --start-period=10m --interval=5m --timeout=15s CMD [ "/usr/local/bin/entrypoint.sh", "healthcheck" ]
+RUN set -e; \
+  echo 'Running post install scripts' && \
+  if [ -f "/root/docker/setup/02-packages.sh" ]; then bash -c "/root/docker/setup/02-packages.sh"; fi && \
+  if [ -f "/root/docker/setup/03-files.sh" ]; then bash -c "/root/docker/setup/03-files.sh"; fi && \
+  if [ -f "/root/docker/setup/04-users.sh" ]; then bash -c "/root/docker/setup/04-users.sh"; fi && \
+  if [ -f "/root/docker/setup/05-custom.sh" ]; then bash -c "/root/docker/setup/05-custom.sh"; fi && \
+  echo 'Post install completed'
 
+FROM scratch
+ARG BUILD_DATE
+ARG IMAGE_NAME
+ARG TIMEZONE
+ARG LANGUAGE
+
+ENV ENV=~/.profile
+ENV SHELL="/bin/sh"
+ENV TZ="${TIMEZONE}"
+ENV TIMEZONE="${TZ}"
+ENV LANG="${LANGUAGE}"
+ENV TERM="xterm-256color"
+ENV CONTAINER_NAME="${IMAGE_NAME}"
+ENV HOSTNAME="${CONTAINER_NAME}"
+ENV USER="root"
+
+USER root
+WORKDIR /root
+
+LABEL org.opencontainers.image.vendor="CasjaysDev"
+LABEL org.opencontainers.image.title="${IMAGE_NAME}"
+LABEL org.opencontainers.image.base.name="${IMAGE_NAME}"
+LABEL org.opencontainers.image.description="Containerized version of ${IMAGE_NAME}"
+LABEL org.opencontainers.image.build-date="${BUILD_DATE}"
+LABEL org.opencontainers.image.authors="CasjaysDev <docker-admin@casjaysdev.pro>"
+
+COPY --from=gosu /usr/local/bin/gosu /usr/local/bin/gosu
+COPY --from=build / /
+
+VOLUME [ "/root","/data","/config" ]
+
+ENTRYPOINT [ "tini","--","/usr/local/bin/entrypoint.sh" ]
+HEALTHCHECK --interval=60s --timeout=30s --start-period=30s --retries=3 \
+  CMD [ "/usr/local/bin/entrypoint.sh", "healthcheck" ]
diff --git a/rootfs/usr/local/etc/docker/functions/entrypoint.sh b/rootfs/usr/local/etc/docker/functions/entrypoint.sh
index c917d98..eebaf00 100644
--- a/rootfs/usr/local/etc/docker/functions/entrypoint.sh
+++ b/rootfs/usr/local/etc/docker/functions/entrypoint.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # shellcheck shell=bash
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202606261430-git
+##@Version           :  202607271325-git
 # @@Author           :  Jason Hempstead
 # @@Contact          :  git-admin@casjaysdev.pro
 # @@License          :  LICENSE.md
@@ -10,7 +10,7 @@
 # @@Created          :  Sunday, Sep 03, 2023 01:40 EDT
 # @@File             :  docker-entrypoint
 # @@Description      :  functions for my docker containers
-# @@Changelog        :  newScript
+# @@Changelog        :  fix __setup_mta calling __symlink with from/to swapped, which no-op'd the symlink and broke msmtp/ssmtp/postfix config on container start
 # @@TODO             :  Refactor code
 # @@Other            :
 # @@Resource         :
@@ -93,7 +93,11 @@ __is_in_file() { [ -e "$2" ] && grep -Rsq "$1" "$2" 2>/dev/null; }
 __curl() { curl -q -sfI --max-time 3 -k -o /dev/null "$@" 2>/dev/null || return 10; }
 __find() {
   local result
-  result=$(find "$1" -mindepth 1 -type "${2:-f,d}" 2>/dev/null)
+  if [ -n "$2" ]; then
+    result=$(find "$1" -mindepth 1 -type "$2" 2>/dev/null)
+  else
+    result=$(find "$1" -mindepth 1 \( -type f -o -type d \) 2>/dev/null)
+  fi
   [ -n "$result" ] || return 10
   printf '%s\n' "$result"
 }
@@ -371,17 +375,23 @@ __init_working_dir() {
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 __exec_service() {
   local count=6
+  local bgpid
   [ "$DEBUGGER" = "on" ] && echo "Starting $1"
-  eval "$@" 2>>/dev/stderr >>/data/logs/start.log &
+  eval "$@" &
+  bgpid=$!
   while [ $count -ne 0 ]; do
     sleep 3
+    if ! kill -0 "$bgpid" 2>/dev/null; then
+      wait "$bgpid"
+      return $?
+    fi
     if __pgrep "$1"; then
       touch "/run/init.d/$1.pid"
-      break
-    else
-      count=$((count - 1))
+      return 0
     fi
+    count=$((count - 1))
   done
+  return 1
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 __update_ssl_certs() {
@@ -791,26 +801,24 @@ __proc_check() {
 
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 __set_user_group_id() {
-  local exitStatus=0
   local set_user="${1:-$SERVICE_USER}"
   local set_uid="${2:-${SERVICE_UID:-1000}}"
   local set_gid="${3:-${SERVICE_GID:-1000}}"
-  local random_id="$(__generate_random_uids)"
-  set_uid="$(__get_uid "$set_user" || echo "$set_uid")"
-  set_gid="$(__get_gid "$set_user" || echo "$set_gid")"
-  if ! grep -shq "^$set_user:" "/etc/passwd" "/etc/group"; then
-    return 0
-  fi
+  # Nothing to do for root or unset
   if [ -z "$set_user" ] || [ "$set_user" = "root" ]; then
     return 0
   fi
-  if grep -shq "^$set_user:" "/etc/passwd" "/etc/group"; then
-    if __check_for_guid "$set_gid"; then
-      groupmod -g "${set_gid}" $set_user 2>/dev/stderr | tee -p -a "/data/logs/init.txt" >/dev/null
-    fi
-    if __check_for_uid "$set_uid"; then
-      usermod -u "${set_uid}" -g "${set_gid}" $set_user 2>/dev/stderr | tee -p -a "/data/logs/init.txt" >/dev/null
-    fi
+  # Nothing to do if the user does not exist yet
+  if ! grep -shq "^$set_user:" "/etc/passwd" "/etc/group"; then
+    return 0
+  fi
+  set_uid="$(__get_uid "$set_user" || echo "$set_uid")"
+  set_gid="$(__get_gid "$set_user" || echo "$set_gid")"
+  if __check_for_guid "$set_gid"; then
+    groupmod -g "${set_gid}" "$set_user" 2>/dev/stderr | tee -a "/data/logs/init.txt" >/dev/null
+  fi
+  if __check_for_uid "$set_uid"; then
+    usermod -u "${set_uid}" -g "${set_gid}" "$set_user" 2>/dev/stderr | tee -a "/data/logs/init.txt" >/dev/null
   fi
   export SERVICE_UID="$set_uid"
   export SERVICE_GID="$set_gid"
@@ -826,15 +834,14 @@ __create_service_user() {
   local create_uid="${4:-${SERVICE_UID:-$USER_UID}}"
   local create_gid="${5:-${SERVICE_GID:-$USER_GID}}"
   local random_id="$(__generate_random_uids)"
-  local create_home_dir="${create_home_dir:-/home/$create_user}"
   local log_file="/data/logs/init.txt"
-  # Ensure log directory exists
-  [ -d "$(dirname "$log_file")" ] || mkdir -p "$(dirname "$log_file")" 2>/dev/null
-  # Validate that we have at least a user or group to create
-  if [ -z "$create_user" ] && [ -z "$create_group" ]; then
-    echo "No user or group specified to create" >&2
+  # Nothing to do for unset or root user — return silently
+  create_home_dir="${create_home_dir:-/home/$create_user}"
+  if [ -z "$create_user" ] || [ "$create_user" = "root" ]; then
     return 0
   fi
+  # Ensure log directory exists
+  [ -d "$(dirname "$log_file")" ] || mkdir -p "$(dirname "$log_file")" 2>/dev/null
   # Validate user/group name format (alphanumeric, underscore, hyphen; must start with letter or underscore)
   if [ -n "$create_user" ] && [[ ! "$create_user" =~ ^[a-z_][a-z0-9_-]*$ ]]; then
     echo "Error: Invalid username format '$create_user' - must start with letter/underscore, contain only lowercase alphanumeric, underscore, or hyphen" >&2
@@ -848,10 +855,6 @@ __create_service_user() {
   if grep -shq "^$create_user:" "/etc/passwd" && grep -shq "^$create_group:" "/etc/group"; then
     return 0
   fi
-  # Root user/group - nothing to create
-  if [ "$create_user" = "root" ] && [ "$create_group" = "root" ]; then
-    return 0
-  fi
   # Override with RUNAS_USER if specified and not root
   if [ -n "$RUNAS_USER" ] && [ "$RUNAS_USER" != "root" ]; then
     create_user="$RUNAS_USER"
@@ -968,7 +971,6 @@ __create_env_file() {
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 __exec_command() {
-  local exitCode=0
   if [ $# -eq 0 ]; then
     exec bash -l
   fi
@@ -1071,7 +1073,7 @@ __start_init_scripts() {
                   __service_banner "✅" "Service $service started successfully -" "PID: ${retPID} ($found_process)"
                 elif [ -f "$expected_pid_file" ]; then
                   # No running process but PID file exists - verify PID is valid
-                  file_pid=$(<"$expected_pid_file") 2>/dev/null
+                  file_pid=$(cat "$expected_pid_file" 2>/dev/null)
                   if [ -n "$file_pid" ] && kill -0 "$file_pid" 2>/dev/null; then
                     initStatus="0"
                     __service_banner "✅" "Service $service started successfully -" "PID: $file_pid (from file)"
@@ -1122,16 +1124,67 @@ __start_init_scripts() {
 __setup_mta() {
   # Check for an installed MTA binary — directories alone cannot be trusted because
   # /etc/postfix ships in some base images (casjaysdev/alpine) even without postfix.
-  command -v ssmtp &>/dev/null || command -v postfix &>/dev/null || return 0
+  command -v msmtp &>/dev/null || command -v ssmtp &>/dev/null || command -v postfix &>/dev/null || return 0
   local exitCode=0
-  local relay_port="${EMAIL_RELAY//*:/}"
-  local relay_server="${EMAIL_RELAY//:*/}"
+  # Extract server and port only when EMAIL_RELAY contains a colon
+  local relay_server="" relay_port=""
+  if [[ "$EMAIL_RELAY" == *:* ]]; then
+    relay_server="${EMAIL_RELAY%%:*}"
+    relay_port="${EMAIL_RELAY##*:}"
+  else
+    relay_server="$EMAIL_RELAY"
+  fi
   local local_hostname="${FULL_DOMAIN_NAME:-}"
   local account_user="${SERVER_ADMIN//@*/}"
   local account_domain="${EMAIL_DOMAIN//*@/}"
-  [[ $EMAIL_RELAY == *[0-9][0-9]* ]] || relay_port="465"
+  # Default to port 25 — plain SMTP, no cert validation required
+  relay_port="${relay_port:-25}"
+  # Autodetect Docker host gateway as SMTP relay when EMAIL_RELAY is unset
+  if [ -z "$EMAIL_RELAY" ] && timeout 2 bash -c 'echo >/dev/tcp/172.17.0.1/25' 2>/dev/null; then
+    relay_server="172.17.0.1"
+    relay_port="25"
+  fi
+  # Port 25 is plain SMTP — no TLS; anything else defaults to TLS on
+  local relay_use_tls="Yes"
+  local relay_smtp_tls="yes"
+  [ "$relay_port" = "25" ] && relay_use_tls="No" && relay_smtp_tls="no"
+  ################# msmtp relay setup
+  if command -v msmtp &>/dev/null; then
+    [ -d "/config/msmtp" ] || mkdir -p "/config/msmtp"
+    [ -f "/etc/msmtprc" ] && __rm "/etc/msmtprc"
+    if [ ! -f "/config/msmtp/msmtprc" ]; then
+      cat >"/config/msmtp/msmtprc" <<EOF
+# msmtp configuration.
+defaults
+auth           on
+tls            ${relay_use_tls,,}
+tls_trust_file /etc/ssl/certs/ca-certificates.crt
+logfile        /var/log/msmtp.log
+
+account        default
+host           ${relay_server:-172.17.0.1}
+port           $relay_port
+from           ${account_user:-root}@${account_domain:-$HOSTNAME}
+#user          username
+#password      password
+
+EOF
+    fi
+    if [ -f "/config/msmtp/msmtprc" ]; then
+      # __symlink(from, to) requires the "to" (config) side to already exist
+      # and creates "from" (etc) as a symlink to it — arguments were reversed here
+      __symlink "/etc/msmtprc" "/config/msmtp/msmtprc"
+      __initialize_replace_variables "/etc/msmtprc"
+      chmod 600 "/etc/msmtprc" 2>/dev/null || true
+      # sendmail compat symlink
+      if [ ! -e "/usr/sbin/sendmail" ] && command -v msmtp &>/dev/null; then
+        __symlink "/usr/sbin/sendmail" "$(command -v msmtp)"
+      fi
+      [ "$DEBUGGER" = "on" ] && echo "Done setting up msmtp"
+    fi
+
   ################# sSMTP relay setup
-  if command -v ssmtp &>/dev/null; then
+  elif command -v ssmtp &>/dev/null; then
     [ -d "/config/ssmtp" ] || mkdir -p "/config/ssmtp"
     [ -f "/etc/ssmtp/ssmtp.conf" ] && __rm "/etc/ssmtp/ssmtp.conf"
     symlink_files="$(__find_file_relative "/config/ssmtp")"
@@ -1143,7 +1196,7 @@ mailhub=${relay_server:-172.17.0.1}:$relay_port
 rewriteDomain=$local_hostname
 hostname=$local_hostname
 TLS_CA_FILE=/etc/ssl/certs/ca-certificates.crt
-UseTLS=Yes
+UseTLS=${relay_use_tls}
 UseSTARTTLS=No
 AuthMethod=LOGIN
 FromLineOverride=yes
@@ -1153,17 +1206,19 @@ FromLineOverride=yes
 EOF
     fi
     if [ -f "/config/ssmtp/ssmtp.conf" ]; then
+      # __symlink(from, to) requires the "to" (config) side to already exist
+      # and creates "from" (etc) as a symlink to it — arguments were reversed here
       for file in $symlink_files; do
-        __symlink "/config/ssmtp/$file" "/etc/ssmtp/$file"
+        __symlink "/etc/ssmtp/$file" "/config/ssmtp/$file"
         __initialize_replace_variables "/etc/ssmtp/$file"
       done
       if [ -f "/etc/ssmtp/revaliases" ] && [ ! -f "/config/ssmtp/revaliases" ]; then
         mv -f "/etc/ssmtp/revaliases" "/config/ssmtp/revaliases"
-        __symlink "/config/ssmtp/revaliases" "/etc/ssmtp/revaliases"
+        __symlink "/etc/ssmtp/revaliases" "/config/ssmtp/revaliases"
         __initialize_replace_variables "/etc/ssmtp/revaliases"
       else
         touch "/config/ssmtp/revaliases"
-        __symlink "/config/ssmtp/revaliases" "/etc/ssmtp/revaliases"
+        __symlink "/etc/ssmtp/revaliases" "/config/ssmtp/revaliases"
         __initialize_replace_variables "/etc/ssmtp/revaliases"
       fi
       [ "$DEBUGGER" = "on" ] && echo "Done setting up ssmtp"
@@ -1191,7 +1246,7 @@ transport_maps = hash:/etc/postfix/transport
 virtual_alias_maps = hash:/etc/postfix/virtual
 relay_domains = hash:/etc/postfix/mydomains, regexp:/etc/postfix/mydomains.pcre
 tls_random_source = dev:/dev/urandom
-smtp_use_tls = yes
+smtp_use_tls = ${relay_smtp_tls}
 smtpd_use_tls = yes
 smtpd_tls_session_cache_database = btree:/etc/postfix/smtpd_scache
 smtpd_tls_exclude_ciphers = aNULL, eNULL, EXPORT, DES, RC4, MD5, PSK, aECDH, EDH-DSS-DES-CBC3-SHA, EDH-RSA-DES-CBC3-SHA, KRB5-DES, CBC3-SHA
@@ -1204,8 +1259,10 @@ relayhost = [$relay_server]:$relay_port
 EOF
     fi
     if [ -d "/config/postfix" ]; then
+      # __symlink(from, to) requires the "to" (config) side to already exist
+      # and creates "from" (etc) as a symlink to it — arguments were reversed here
       for f in $symlink_files; do
-        __symlink "/config/postfix/$f" "/etc/postfix/$f"
+        __symlink "/etc/postfix/$f" "/config/postfix/$f"
       done
       __initialize_replace_variables "/etc/postfix"
       touch "/config/postfix/aliases" "/config/postfix/mynetworks" "/config/postfix/transport"
@@ -1432,16 +1489,18 @@ __initialize_ssl_certs() {
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 __start_php_dev_server() {
-  if [ "$2" = "yes" ]; then
-    if [ -d "/usr/local/share/httpd" ]; then
-      find "/usr/local/share/httpd" -type f -not -path '.git*' -iname '*.php' -exec sed -i 's|[<].*SERVER_ADDR.*[>]|'${CONTAINER_IP4_ADDRESS:-127.0.0.1}'|g' {} \; 2>/dev/null
-      php -S 0.0.0.0:$PHP_DEV_SERVER_PORT -t "/usr/local/share/httpd"
-    fi
-    if [[ "$1" != "/usr/local/share/httpd"* ]]; then
-      find "$1" -type f -not -path '.git*' -iname '*.php' -exec sed -i 's|[<].*SERVER_ADDR.*[>]|'${CONTAINER_IP4_ADDRESS:-127.0.0.1}'|g' {} \; 2>/dev/null
-      php -S 0.0.0.0:$PHP_DEV_SERVER_PORT -t "$1"
-    fi
+  [ "$2" = "yes" ] || return 0
+  local docroot=""
+  # Prefer a custom doc root when it differs from the default share path
+  if [ -n "$1" ] && [[ "$1" != "/usr/local/share/httpd"* ]]; then
+    docroot="$1"
+  elif [ -d "/usr/local/share/httpd" ]; then
+    docroot="/usr/local/share/httpd"
   fi
+  [ -n "$docroot" ] || return 0
+  find "$docroot" -type f -not -path '.git*' -iname '*.php' \
+    -exec sed -i 's|[<].*SERVER_ADDR.*[>]|'"${CONTAINER_IP4_ADDRESS:-127.0.0.1}"'|g' {} \; 2>/dev/null
+  php -S "0.0.0.0:${PHP_DEV_SERVER_PORT}" -t "$docroot"
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 __check_service() {
@@ -1484,7 +1543,7 @@ __switch_to_user() {
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # usage backup "days" "hours"
 __backup() {
-  local dirs="" backup_dir backup_name backup_exclude runTime cronTime maxDays
+  local dirs=() backup_dir backup_name backup_exclude runTime cronTime maxDays
   if test -n "$1" && test -z "${1//[0-9]/}"; then
     maxDays="$1"
     shift 1
@@ -1506,11 +1565,11 @@ __backup() {
   backup_dir="$BACKUP_DIR/$(date +'%y/%m')"
   backup_name="$(date +'%d_%H-%M').tar.gz"
   backup_exclude="/data/logs $BACKUP_DIR $BACK_EXCLUDE_DIR"
-  [ -d "/data" ] && dirs+="/data "
-  [ -d "/config" ] && dirs+="/config "
+  [ -d "/data" ] && dirs+=("/data")
+  [ -d "/config" ] && dirs+=("/config")
   [ -d "$logDir" ] || mkdir -p "$logDir"
   [ -d "$backup_dir" ] || mkdir -p "$backup_dir"
-  [ -z "$dirs" ] && echo "BACKUP_DIR is unset" >&2 && return 1
+  [ "${#dirs[@]}" -eq 0 ] && echo "BACKUP_DIR is unset" >&2 && return 1
   [ -f "$pidFile" ] && echo "A backup job is already running" >&2 && return 1
   echo "$$" >"$pidFile"
   trap "rm -f '$pidFile'" EXIT INT TERM
@@ -1519,7 +1578,7 @@ __backup() {
   for excl in $backup_exclude; do
     tar_excludes+=("--exclude=$excl")
   done
-  tar "${tar_excludes[@]}" -cfvz "$backup_dir/$backup_name" $dirs 2>/dev/stderr >>"$logDir/$CONTAINER_NAME" || exitCodeP=1
+  tar "${tar_excludes[@]}" -cfvz "$backup_dir/$backup_name" "${dirs[@]}" 2>/dev/stderr >>"$logDir/$CONTAINER_NAME" || exitCodeP=1
   if [ $exitCodeP -eq 0 ]; then
     echo "Backup has completed and saved to: $backup_dir/$backup_name"
     printf '%s\n\n' "Backup has completed on $(date)" >>"$logDir/$CONTAINER_NAME"
@@ -1536,7 +1595,11 @@ __backup() {
   else
     return $exitStatus
   fi
-  sleep $runTime && __backup "$maxDays" "$cronTime"
+  # Loop instead of recurse — recursion adds a stack frame every interval
+  while true; do
+    sleep "$runTime"
+    __backup "$maxDays"
+  done
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # set variables from function calls