diff --git a/.env.scripts b/.env.scripts
index 37d6e84..ed8c30d 100644
--- a/.env.scripts
+++ b/.env.scripts
@@ -1,4 +1,4 @@
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 ##@Version           :  202509161146-git
 # @@Author           :  CasjaysDev
 # @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
@@ -7,57 +7,80 @@
 # @@Created          :  Tue Sep 16 11:46:30 AM EDT 2025
 # @@File             :  .env.scripts
 # @@Description      :  Variables for gen-dockerfile and buildx scripts
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# @@Changelog        :  newScript
+# @@TODO             :  Refactor code
+# @@Other            :  N/A
+# @@Resource         :  N/A
+# @@Terminal App     :  yes
+# @@sudo/root        :  yes
+# @@Template         :  templates/dockerfiles/dotenv.template
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2090,SC2115,SC2120,SC2155,SC2199,SC2229,SC2317,SC2329
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # entrypoint Settings
 DOCKER_ENTYPOINT_PORTS_WEB="${DOCKER_ENTYPOINT_PORTS_WEB}"
 DOCKER_ENTYPOINT_PORTS_SRV="${DOCKER_ENTYPOINT_PORTS_SRV}"
 DOCKER_ENTYPOINT_HEALTH_APPS="$DOCKER_ENTYPOINT_HEALTH_APPS"
 DOCKER_ENTYPOINT_HEALTH_ENDPOINTS="$DOCKER_ENTYPOINT_HEALTH_ENDPOINTS"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Dockerfile info
 ENV_DOCKERFILE="Dockerfile"
-ENV_IMAGE_NAME="blueonyx"
+# ENV_REGISTRY_REPO: Registry repository/image name
+ENV_REGISTRY_REPO="blueonyx"
 ENV_USE_TEMPLATE="almalinux"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Maintainer info
-ENV_ORG_NAME="casjaysdevdocker"
+ENV_REGISTRY_ORG="casjaysdevdocker"
 ENV_VENDOR="CasjaysDev"
 ENV_AUTHOR="CasjaysDev"
 ENV_MAINTAINER="CasjaysDev <docker-admin@casjaysdev.pro>"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# REPO info
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Repository URLs (Full URLs)
+# ENV_GIT_REPO_URL: Complete Git repository URL for source code
 ENV_GIT_REPO_URL="https://github.com/casjaysdevdocker/blueonyx"
-ENV_REGISTRY_URL="docker.io"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Push image info
-ENV_IMAGE_PUSH="casjaysdevdocker/blueonyx"
+# ENV_REGISTRY_URL: Registry provider base URL (for example https://docker.io)
+ENV_REGISTRY_URL="https://docker.io"
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Push Configuration
+# ENV_REGISTRY_PUSH: Complete push destination derived from registry/org/repo
+ENV_REGISTRY_PUSH="casjaysdevdocker/blueonyx"
+# ENV_IMAGE_TAG: Default tag for the image
 ENV_IMAGE_TAG="latest"
+# ENV_ADD_TAGS: Additional tags, comma-separated (USE_DATE = auto date tag)
 ENV_ADD_TAGS=""
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Additional push destinations (if needed)
 ENV_ADD_IMAGE_PUSH=""
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Pull image info
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Pull Configuration
+# ENV_PULL_URL: Source image to pull from (base image)
 ENV_PULL_URL="almalinux/10-init"
+# ENV_DISTRO_TAG: Tag for the pull source image
 ENV_DISTRO_TAG="${IMAGE_VERSION}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Platform support (BlueOnyx only supports amd64)
 ENV_PLATFORMS="linux/amd64"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Env
-SERVICE_PORT=""
-EXPOSE_PORTS=""
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+SERVICE_PORT="444"
+EXPOSE_PORTS="81 444 80 443 20 21 22 25 587 465 110 995 143 993 53"
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# IF using a lanuage such as go, php, rust, ruby, etc set the version here.
+LANG_VERSION=""
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Versions
 PHP_VERSION="system"
 NODE_VERSION="system"
 NODE_MANAGER="system"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # Default directories
 WWW_ROOT_DIR="/usr/local/share/httpd/default"
 DEFAULT_FILE_DIR="/usr/local/share/template-files"
 DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
 DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
 DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-ENV_PACKAGES="bash bash-completion git curl wget sudo unzip tini iproute net-tools glibc-langpack-en pinentry nail postfix python3-pip certbot ca-certificates "
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+ENV_PACKAGES="bash bash-completion git curl wget sudo unzip iproute net-tools glibc-langpack-en pinentry python3-pip ca-certificates systemd systemd-libs NetworkManager valkey valkey-compat-redis certbot python3-certbot-apache python3-certbot-nginx cronie mod_authnz_external"
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+# ex: ts=2 sw=2 et filetype=sh
+# - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/.gitattributes b/.gitattributes
index 4a549a9..07f3b95 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,4 @@
-# Template generated on Thu Sep  4 10:41:50 PM EDT 2025 from https://github.com/alexkaratarakis/gitattributes"
+# Template generated on Sat Nov 29 11:57:12 AM EST 2025 from https://github.com/alexkaratarakis/gitattributes"
 # Common settings that generally should always be used with your language specific settings
 # Auto detect text files and perform LF normalization
 *          text=auto
diff --git a/.gitea/workflows/docker.yaml b/.gitea/workflows/docker.yaml
index 9102595..13fbec0 100644
--- a/.gitea/workflows/docker.yaml
+++ b/.gitea/workflows/docker.yaml
@@ -1,9 +1,9 @@
-name: release-tag
+name: blueonyx
 
 on: push
 
 jobs:
-  release-image:
+  release-blueonyx:
     runs-on: act_runner
     container:
       image: catthehacker/ubuntu:act-latest
@@ -19,13 +19,20 @@ jobs:
       - name: Get Meta
         id: meta
         run: |
-          echo DATE_TAG=$(date +'%y%m') >> $GITHUB_OUTPUT
-          echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT
-          echo DOCKER_ORG=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $1}') >> $GITHUB_OUTPUT
-          echo DOCKER_TAG=$([ -n "$DOCKER_TAG" ] && echo ${DOCKER_TAG} || echo "latest") >> $GITHUB_OUTPUT
-          echo DOCKER_HUB=$([ -n "$DOCKER_HUB" ] && echo ${DOCKER_HUB} || echo "docker.io") >> $GITHUB_OUTPUT
-          echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}' | sed 's|^docker-||g') >> $GITHUB_OUTPUT
-          echo "$DOCKER_HUB/$DOCKER_ORG/$REPO_NAME:$DOCKER_TAG"
+          repo_version="$(git describe --tags --always)"
+          repo_version="${repo_version#v}"
+          docker_org="${GITHUB_REPOSITORY%%/*}"
+          repo_name="${GITHUB_REPOSITORY#*/}"
+          repo_name="${repo_name#docker-}"
+          docker_tag="${DOCKER_TAG:-latest}"
+          docker_hub="${DOCKER_HUB:-docker.io}"
+          printf 'DATE_TAG=%s\n' "$(date +'%y%m')" >> "$GITHUB_OUTPUT"
+          printf 'REPO_VERSION=%s\n' "$repo_version" >> "$GITHUB_OUTPUT"
+          printf 'DOCKER_ORG=%s\n' "$docker_org" >> "$GITHUB_OUTPUT"
+          printf 'DOCKER_TAG=%s\n' "$docker_tag" >> "$GITHUB_OUTPUT"
+          printf 'DOCKER_HUB=%s\n' "$docker_hub" >> "$GITHUB_OUTPUT"
+          printf 'REPO_NAME=%s\n' "$repo_name" >> "$GITHUB_OUTPUT"
+          printf '%s\n' "$docker_hub/$docker_org/$repo_name:$docker_tag"
 
       - name: Set up Docker BuildX
         uses: docker/setup-buildx-action@v2
@@ -46,7 +53,16 @@ jobs:
             linux/amd64
             linux/arm64
           push: true
-          tags: | # replace it with your local IP and tags
+          build-args: |
+            IMAGE_NAME=${{ steps.meta.outputs.REPO_NAME }}
+            BUILD_DATE=$(date -u +'%Y%m%d%H%M')
+            BUILD_VERSION=$(date -u +'%Y%m%d%H%M')
+            GIT_COMMIT=${{ github.sha }}
+            TIMEZONE=America/New_York
+            LANGUAGE=en_US.UTF-8
+            LICENSE=WTFPL
+            TZ=America/New_York
+          tags: |
             ${{ steps.meta.outputs.DOCKER_HUB }}/${{ steps.meta.outputs.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.DATE_TAG }}
             ${{ steps.meta.outputs.DOCKER_HUB }}/${{ steps.meta.outputs.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.DOCKER_TAG }}
 
diff --git a/.gitignore b/.gitignore
index 3b58a10..5a64209 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,10 @@
-# gitignore created on 05/22/25 at 21:00
+# gitignore created on 05/06/26 at 23:32
 # Disable reminder in prompt
 ignoredirmessage
 
+# ignore .build_failed files
+**/.build_failed*
+
 # OS generated files
 ### Linux ###
 *~
@@ -99,17 +102,3 @@ $RECYCLE.BIN/
 **/*.rewrite.sh
 **/*.refactor.sh
 
-# ignore dotenv files
-.env
-
-# Ignore the file: app.env
-app.env
-
-# Ignore the file: compose.default.yaml
-compose.default.yaml
-# ignore the default dotenv file
-default.env
-
-# Exclude compose.yaml just in case it has sensitive data
-compose.yaml
-
diff --git a/Dockerfile b/Dockerfile
index cf0e9a8..2a22620 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -28,7 +28,8 @@ ARG PULL_URL="almalinux/10-init"
 ARG DISTRO_VERSION="latest"
 ARG BUILD_VERSION="${BUILD_DATE}"
 
-FROM almalinux/10-init
+FROM tianon/gosu:latest AS gosu
+FROM ${PULL_URL}:${DISTRO_VERSION}
 ARG TZ
 ARG PATH
 ARG USER
@@ -41,6 +42,7 @@ 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
@@ -52,6 +54,8 @@ ARG NODE_MANAGER
 ARG PHP_VERSION
 ARG PHP_SERVER
 ARG SHELL_OPTS
+ARG ENV_PORTS="${EXPOSE_PORTS}"
+ARG LICENSE="WTFPL"
 
 ARG PACK_LIST="bash bash-completion git curl wget sudo unzip iproute net-tools glibc-langpack-en pinentry python3-pip ca-certificates systemd systemd-libs NetworkManager valkey valkey-compat-redis certbot python3-certbot-apache python3-certbot-nginx cronie mod_authnz_external "
 
@@ -67,7 +71,7 @@ ENV HOSTNAME="casjaysdevdocker-blueonyx"
 USER ${USER}
 WORKDIR /root
 
-COPY ./rootfs/usr/local/bin/. /usr/local/bin/
+COPY ./rootfs/. /
 
 RUN set -e; \
   echo "Updating the system and ensuring bash is installed"; \
@@ -75,11 +79,19 @@ RUN set -e; \
 
 RUN set -e; \
   echo "Setting up prerequisites"; \
-  true
+  yum makecache && yum install -yy 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 "${DEFAULT_DATA_DIR}" "${DEFAULT_CONF_DIR}" "${DEFAULT_TEMPLATE_DIR}" "/root/docker/setup" "/etc/profile.d"; \
@@ -88,7 +100,8 @@ RUN echo "Initializing the system"; \
 
 RUN echo "Creating and editing system files "; \
   $SHELL_OPTS; \
-  [ -f "/root/.profile" ] || touch "/root/.profile"; \
+  touch "/etc/profile" "/root/.profile"; \
+  pkmgr update && pkmgr install epel-release; crb enable || true; \
   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 ""
 
@@ -106,7 +119,6 @@ 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 /root/docker/Dockerfile
 
 RUN echo "Updating system files "; \
@@ -116,7 +128,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)"; \
-  PHP_FPM="$(ls /usr/*bin/php*fpm* 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=""; \
@@ -168,6 +180,7 @@ RUN echo "Deleting unneeded files"; \
   rm -Rf /usr/share/doc/* /usr/share/info/* /tmp/* || true; \
   rm -Rf /var/cache/*/* /root/.cache/* || true; \
   find /var/tmp -mindepth 1 -delete 2>/dev/null || 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 ""
 
@@ -176,6 +189,43 @@ RUN echo "Init done"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Final configuration (no separate stage for systemd containers)
 
+LABEL maintainer="CasjaysDev <docker-admin@casjaysdev.pro>"
+LABEL org.opencontainers.image.vendor="CasjaysDev"
+LABEL org.opencontainers.image.authors="CasjaysDev"
+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.schema-version="${BUILD_VERSION}"
+LABEL org.opencontainers.image.url="https://docker.io/casjaysdevdocker/blueonyx"
+LABEL org.opencontainers.image.source="https://docker.io/casjaysdevdocker/blueonyx"
+LABEL org.opencontainers.image.vcs-type="Git"
+LABEL org.opencontainers.image.revision="${GIT_COMMIT}"
+LABEL org.opencontainers.image.source="https://github.com/casjaysdevdocker/blueonyx"
+LABEL org.opencontainers.image.documentation="https://github.com/casjaysdevdocker/blueonyx"
+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="casjaysdev-${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}"
+
 VOLUME [ "/config","/data" ]
 
 EXPOSE ${SERVICE_PORT} ${ENV_PORTS}
diff --git a/LICENSE.md b/LICENSE.md
index c76e83f..27b62a2 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,7 +1,7 @@
             DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE  
                     Version 2, December 2004  
 
- Copyright (C) 2024 casjay <git-admin@casjaysdev.pro>  
+ Copyright (C) 2026 casjay <git-admin@casjaysdev.pro>  
   
  Everyone is permitted to copy and distribute verbatim or modified  
  copies of this license document, and changing it is allowed as long  
diff --git a/rootfs/usr/local/bin/entrypoint.sh b/rootfs/usr/local/bin/entrypoint.sh
index ee20440..f8ee44a 100755
--- a/rootfs/usr/local/bin/entrypoint.sh
+++ b/rootfs/usr/local/bin/entrypoint.sh
@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 # shellcheck shell=bash
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202511301623-git
+##@Version           :  202605052024-git
 # @@Author           :  Jason Hempstead
 # @@Contact          :  jason@casjaysdev.pro
 # @@License          :  WTFPL
 # @@ReadME           :  entrypoint.sh --help
-# @@Copyright        :  Copyright: (c) 2025 Jason Hempstead, Casjays Developments
-# @@Created          :  Sunday, Nov 30, 2025 16:23 EST
+# @@Copyright        :  Copyright: (c) 2026 Jason Hempstead, Casjays Developments
+# @@Created          :  Wednesday, May 06, 2026 23:32 EDT
 # @@File             :  entrypoint.sh
 # @@Description      :  Entrypoint file for blueonyx
 # @@Changelog        :  New script
@@ -25,14 +25,20 @@ trap 'retVal=$?;[ "$SERVICE_IS_RUNNING" != "yes" ] && [ -f "$SERVICE_PID_FILE" ]
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # setup debugging - https://www.gnu.org/software/bash/manual/html_node/The-Set-Builtin.html
 [ -f "/config/.debug" ] && [ -z "$DEBUGGER_OPTIONS" ] && export DEBUGGER_OPTIONS="$(<"/config/.debug")" || DEBUGGER_OPTIONS="${DEBUGGER_OPTIONS:-}"
-{ [ "$DEBUGGER" = "on" ] || [ -f "/config/.debug" ]; } && echo "Enabling debugging" && set -o pipefail -x$DEBUGGER_OPTIONS && export DEBUGGER="on" || set -o pipefail
+if [ "$DEBUGGER" = "on" ] || [ -f "/config/.debug" ]; then
+  echo "Enabling debugging"
+  set -o pipefail -x$DEBUGGER_OPTIONS
+  export DEBUGGER="on"
+else
+  set -o pipefail
+fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 PATH="/usr/local/etc/docker/bin:/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set bash options
 SCRIPT_FILE="$0"
 CONTAINER_NAME="blueonyx"
-SCRIPT_NAME="$(basename -- "$SCRIPT_FILE" 2>/dev/null)"
+SCRIPT_NAME="${SCRIPT_FILE##*/}"
 CONTAINER_NAME="${ENV_CONTAINER_NAME:-$CONTAINER_NAME}"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # remove whitespaces from beginning argument
@@ -73,30 +79,38 @@ done
 unset set_env
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # User to use to launch service - IE: postgres
-RUNAS_USER="root" # normally root
+# normally root
+RUNAS_USER="root"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set user and group from env
 SERVICE_USER="${PUID:-$SERVICE_USER}"
 SERVICE_GROUP="${PGID:-$SERVICE_GROUP}"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set user and group ID
-SERVICE_UID="${SERVICE_UID:-0}" # set the user id
-SERVICE_GID="${SERVICE_GID:-0}" # set the group id
+# set the user id
+SERVICE_UID="${SERVICE_UID:-0}"
+# set the group id
+SERVICE_GID="${SERVICE_GID:-0}"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # User and group in which the service switches to - IE: nginx,apache,mysql,postgres
 #SERVICE_USER="${SERVICE_USER:-blueonyx}"   # execute command as another user
 #SERVICE_GROUP="${SERVICE_GROUP:-blueonyx}" # Set the service group
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Secondary ports
-SERVER_PORTS="" # specifiy other ports
+# specifiy other ports
+SERVER_PORTS=""
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Primary server port- will be added to server ports
-WEB_SERVER_PORT="" # port : 80,443
+# port : 80,443
+WEB_SERVER_PORT=""
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Healthcheck variables
-HEALTH_ENABLED="yes" # enable healthcheck [yes/no]
-SERVICES_LIST="tini" # comma separated list of processes for the healthcheck
-HEALTH_ENDPOINTS=""  # url endpoints: [http://localhost/health,http://localhost/test]
+# enable healthcheck [yes/no]
+HEALTH_ENABLED="yes"
+# comma separated list of processes for the healthcheck
+SERVICES_LIST="tini"
+# url endpoints: [http://localhost/health,http://localhost/test]
+HEALTH_ENDPOINTS=""
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Update path var
 export PATH RUNAS_USER SERVICE_USER SERVICE_GROUP SERVICE_UID SERVICE_GID WWW_ROOT_DIR DATABASE_DIR
@@ -162,28 +176,40 @@ export ENTRYPOINT_DATA_INIT_FILE="${ENTRYPOINT_DATA_INIT_FILE:-/data/.docker_has
 export ENTRYPOINT_CONFIG_INIT_FILE="${ENTRYPOINT_CONFIG_INIT_FILE:-/config/.docker_has_run}"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 if [ -n "$CONTAINER_WEB_SERVER_WWW_REPO" ]; then
-  www_temp_dir="/tmp/git/$(basename -- "$CONTAINER_WEB_SERVER_WWW_REPO")"
-  rm -Rf "${WWW_ROOT_DIR:?}"/* "${www_temp_dir:?}"/*
-  mkdir -p "$WWW_ROOT_DIR" "$www_temp_dir"
-  git clone -q "$CONTAINER_WEB_SERVER_WWW_REPO" "$www_temp_dir" 2>/dev/null
-  rm -Rf "$www_temp_dir/.git" "$www_temp_dir"/.git*
-  rsync -ra "$www_temp_dir/" "$WWW_ROOT_DIR" --delete >/dev/null 2>&1
-  rm -Rf "$www_temp_dir"
+  www_temp_dir="/tmp/git/${CONTAINER_WEB_SERVER_WWW_REPO##*/}"
+  rm -Rf "${WWW_ROOT_DIR:?}"/* "${www_temp_dir:?}"/* 2>/dev/null || true
+  mkdir -p "$WWW_ROOT_DIR" "$www_temp_dir" 2>/dev/null || true
+  git clone -q "$CONTAINER_WEB_SERVER_WWW_REPO" "$www_temp_dir" 2>/dev/null || true
+  rm -Rf "$www_temp_dir/.git" "$www_temp_dir"/.git* 2>/dev/null || true
+  rsync -ra "$www_temp_dir/" "$WWW_ROOT_DIR" --delete 2>/dev/null || true
+  rm -Rf "$www_temp_dir" 2>/dev/null || true
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # variables based on env/files
-[ -f "/config/enable/ssl" ] && SSL_ENABLED="yes"
-[ -f "/config/enable/ssh" ] && SSH_ENABLED="yes"
-[ "$WEB_SERVER_PORT" = "443" ] && SSL_ENABLED="yes"
-[ "$CONTAINER_WEB_SERVER_PROTOCOL" = "https" ] && SSL_ENABLED="yes"
+if [ -f "/config/enable/ssl" ]; then SSL_ENABLED="yes"; fi
+if [ -f "/config/enable/ssh" ]; then SSH_ENABLED="yes"; fi
+if [ "$WEB_SERVER_PORT" = "443" ]; then SSL_ENABLED="yes"; fi
+if [ "$CONTAINER_WEB_SERVER_PROTOCOL" = "https" ]; then SSL_ENABLED="yes"; fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # export variables
 
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # is already Initialized
-[ -f "$ENTRYPOINT_DATA_INIT_FILE" ] && DATA_DIR_INITIALIZED="yes" || DATA_DIR_INITIALIZED="no"
-[ -f "$ENTRYPOINT_CONFIG_INIT_FILE" ] && CONFIG_DIR_INITIALIZED="yes" || CONFIG_DIR_INITIALIZED="no"
-{ [ -f "$ENTRYPOINT_PID_FILE" ] || [ -f "$ENTRYPOINT_INIT_FILE" ]; } && ENTRYPOINT_FIRST_RUN="no" || ENTRYPOINT_FIRST_RUN="yes"
+if [ -f "$ENTRYPOINT_DATA_INIT_FILE" ]; then
+  DATA_DIR_INITIALIZED="yes"
+else
+  DATA_DIR_INITIALIZED="no"
+fi
+if [ -f "$ENTRYPOINT_CONFIG_INIT_FILE" ]; then
+  CONFIG_DIR_INITIALIZED="yes"
+else
+  CONFIG_DIR_INITIALIZED="no"
+fi
+if [ -f "$ENTRYPOINT_PID_FILE" ] || [ -f "$ENTRYPOINT_INIT_FILE" ]; then
+  ENTRYPOINT_FIRST_RUN="no"
+else
+  ENTRYPOINT_FIRST_RUN="yes"
+fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # clean ENV_PORTS variables
 ENV_PORTS="${ENV_PORTS//,/ }"  #
@@ -207,164 +233,233 @@ ENV_PORTS="$(__format_variables "$SERVER_PORTS" "$WEB_SERVER_PORTS" "$ENV_PORTS"
 HEALTH_ENDPOINTS="${HEALTH_ENDPOINTS//,/ }"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # create required directories
-mkdir -p "/run"
-mkdir -p "/tmp"
-mkdir -p "/root"
-mkdir -p "/var/run"
-mkdir -p "/var/tmp"
-mkdir -p "/run/cron"
-mkdir -p "/data/logs"
-mkdir -p "/run/init.d"
-mkdir -p "/config/enable"
-mkdir -p "/config/secure"
-mkdir -p "/usr/local/etc/docker/exec"
+mkdir -p "/run" 2>/dev/null || true
+mkdir -p "/tmp" 2>/dev/null || true
+mkdir -p "/root" 2>/dev/null || true
+mkdir -p "/var/run" 2>/dev/null || true
+mkdir -p "/var/tmp" 2>/dev/null || true
+mkdir -p "/run/cron" 2>/dev/null || true
+mkdir -p "/data/logs" 2>/dev/null || true
+mkdir -p "/run/init.d" 2>/dev/null || true
+mkdir -p "/config/enable" 2>/dev/null || true
+mkdir -p "/config/secure" 2>/dev/null || true
+mkdir -p "/usr/local/etc/docker/exec" 2>/dev/null || true
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # create required files
-touch "/data/logs/start.log"
-touch "/data/logs/entrypoint.log"
+touch "/data/logs/start.log" 2>/dev/null || true
+touch "/data/logs/entrypoint.log" 2>/dev/null || true
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # fix permissions
-chmod -f 777 "/run"
-chmod -f 777 "/tmp"
-chmod -f 700 "/root"
-chmod -f 777 "/var/run"
-chmod -f 777 "/var/tmp"
-chmod -f 777 "/run/cron"
-chmod -f 777 "/data/logs"
-chmod -f 777 "/run/init.d"
-chmod -f 777 "/config/enable"
-chmod -f 777 "/config/secure"
-chmod -f 777 "/data/logs/entrypoint.log"
-chmod -f 777 "/usr/local/etc/docker/exec"
+chmod -f 777 "/run" 2>/dev/null || true
+chmod -f 777 "/tmp" 2>/dev/null || true
+chmod -f 700 "/root" 2>/dev/null || true
+chmod -f 777 "/var/run" 2>/dev/null || true
+chmod -f 777 "/var/tmp" 2>/dev/null || true
+chmod -f 777 "/run/cron" 2>/dev/null || true
+chmod -f 777 "/data/logs" 2>/dev/null || true
+chmod -f 777 "/run/init.d" 2>/dev/null || true
+chmod -f 777 "/config/enable" 2>/dev/null || true
+chmod -f 777 "/config/secure" 2>/dev/null || true
+chmod -f 777 "/data/logs/entrypoint.log" 2>/dev/null || true
+chmod -f 777 "/usr/local/etc/docker/exec" 2>/dev/null || true
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # lets ensure everyone can write to std*
-[ -f "/dev/stdin" ] && chmod -f 777 "/dev/stdin"
-[ -f "/dev/stderr" ] && chmod -f 777 "/dev/stderr"
-[ -f "/dev/stdout" ] && chmod -f 777 "/dev/stdout"
+if [ -f "/dev/stdin" ]; then
+  chmod -f 777 "/dev/stdin" 2>/dev/null || true
+fi
+if [ -f "/dev/stderr" ]; then
+  chmod -f 777 "/dev/stderr" 2>/dev/null || true
+fi
+if [ -f "/dev/stdout" ]; then
+  chmod -f 777 "/dev/stdout" 2>/dev/null || true
+fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-cat <<EOF | tee /etc/profile.d/locales.shadow /etc/profile.d/locales.sh >/dev/null
+cat <<EOF 2>/dev/null | tee /etc/profile.d/locales.shadow /etc/profile.d/locales.sh >/dev/null 2>&1 || true
 export LANG="\${LANG:-C.UTF-8}"
 export LC_ALL="\${LANG:-C.UTF-8}"
 export TZ="\${TZ:-\${TIMEZONE:-America/New_York}}"
 EOF
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Create the backup dir
-[ -n "$BACKUP_DIR" ] && { [ -d "$BACKUP_DIR" ] || mkdir -p "$BACKUP_DIR"; }
+if [ -n "$BACKUP_DIR" ]; then
+  if [ ! -d "$BACKUP_DIR" ]; then
+    mkdir -p "$BACKUP_DIR" 2>/dev/null || true
+  fi
+fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 if [ -f "$ENTRYPOINT_INIT_FILE" ]; then
   ENTRYPOINT_MESSAGE="no" ENTRYPOINT_FIRST_RUN="no"
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 if [ "$ENTRYPOINT_FIRST_RUN" != "no" ]; then
-  # Show start message
   if [ "$CONFIG_DIR_INITIALIZED" = "no" ] || [ "$DATA_DIR_INITIALIZED" = "no" ]; then
-    [ "$ENTRYPOINT_MESSAGE" = "yes" ] && echo "Executing entrypoint script for blueonyx"
+    if [ "$ENTRYPOINT_MESSAGE" = "yes" ]; then
+      echo "Executing entrypoint script for blueonyx"
+    fi
   fi
   # - - - - - - - - - - - - - - - - - - - - - - - - -
   # Set reusable variables
-  { { [ -w "/etc" ] && [ ! -f "/etc/hosts" ]; } || [ -w "/etc/hosts" ]; } && UPDATE_FILE_HOSTS="yes" && touch "/etc/hosts"
-  { { [ -w "/etc" ] && [ ! -f "/etc/timezone" ]; } || [ -w "/etc/timezone" ]; } && UPDATE_FILE_TZ="yes" && touch "/etc/timezone"
-  { { [ -w "/etc" ] && [ ! -f "/etc/resolv.conf" ]; } || [ -w "/etc/resolv.conf" ]; } && UPDATE_FILE_RESOLV="yes" && touch "/etc/resolv.conf"
+  if [ -w "/etc" ] && [ ! -f "/etc/hosts" ]; then
+    UPDATE_FILE_HOSTS="yes"
+    touch "/etc/hosts"
+  elif [ -w "/etc/hosts" ]; then
+    UPDATE_FILE_HOSTS="yes"
+    touch "/etc/hosts"
+  fi
+  if [ -w "/etc" ] && [ ! -f "/etc/timezone" ]; then
+    UPDATE_FILE_TZ="yes"
+    touch "/etc/timezone"
+  elif [ -w "/etc/timezone" ]; then
+    UPDATE_FILE_TZ="yes"
+    touch "/etc/timezone"
+  fi
+  if [ -w "/etc" ] && [ ! -f "/etc/resolv.conf" ]; then
+    UPDATE_FILE_RESOLV="yes"
+    touch "/etc/resolv.conf"
+  elif [ -w "/etc/resolv.conf" ]; then
+    UPDATE_FILE_RESOLV="yes"
+    touch "/etc/resolv.conf"
+  fi
   # - - - - - - - - - - - - - - - - - - - - - - - - -
   # Set timezone
-  [ -n "$TZ" ] && [ "$UPDATE_FILE_TZ" = "yes" ] && echo "$TZ" >"/etc/timezone"
-  [ -f "/usr/share/zoneinfo/$TZ" ] && [ "$UPDATE_FILE_TZ" = "yes" ] && ln -sf "/usr/share/zoneinfo/$TZ" "/etc/localtime"
+  if [ -n "$TZ" ] && [ "$UPDATE_FILE_TZ" = "yes" ]; then
+    echo "$TZ" >"/etc/timezone" 2>/dev/null || true
+  fi
+  if [ -f "/usr/share/zoneinfo/$TZ" ] && [ "$UPDATE_FILE_TZ" = "yes" ]; then
+    ln -sf "/usr/share/zoneinfo/$TZ" "/etc/localtime" 2>/dev/null || true
+  fi
   # - - - - - - - - - - - - - - - - - - - - - - - - -
   # if ipv6 add it to /etc/hosts
   if [ "$UPDATE_FILE_HOSTS" = "yes" ]; then
-    echo "# known hostname mappings" >"/etc/hosts"
+    echo "# known hostname mappings" >"/etc/hosts" 2>/dev/null || true
     if [ -n "$(ip a 2>/dev/null | grep 'inet6.*::' || ifconfig 2>/dev/null | grep 'inet6.*::')" ]; then
-      __printf_space "40" "::1" "localhost" >>"/etc/hosts"
-      __printf_space "40" "127.0.0.1" "localhost" >>"/etc/hosts"
+      __printf_space "40" "::1" "localhost" >>"/etc/hosts" 2>/dev/null || true
+      __printf_space "40" "127.0.0.1" "localhost" >>"/etc/hosts" 2>/dev/null || true
     else
-      __printf_space "40" "127.0.0.1" "localhost" >>"/etc/hosts"
+      __printf_space "40" "127.0.0.1" "localhost" >>"/etc/hosts" 2>/dev/null || true
     fi
   fi
   # - - - - - - - - - - - - - - - - - - - - - - - - -
   # add .internal domain
   if [ "$UPDATE_FILE_HOSTS" = "yes" ] && [ -n "$HOSTNAME" ]; then
-    __grep_test " $HOSTNAME" "/etc/hosts" || __printf_space "40" "${CONTAINER_IP4_ADDRESS:-127.0.0.1}" "$HOSTNAME" >>"/etc/hosts"
-    __grep_test " ${HOSTNAME%%.*}.internal" "/etc/hosts" || __printf_space "40" "${CONTAINER_IP4_ADDRESS:-127.0.0.1}" "${HOSTNAME%%.*}.internal" >>"/etc/hosts"
+    if ! __grep_test " $HOSTNAME" "/etc/hosts"; then
+      __printf_space "40" "${CONTAINER_IP4_ADDRESS:-127.0.0.1}" "$HOSTNAME" >>"/etc/hosts" 2>/dev/null || true
+    fi
+    if ! __grep_test " ${HOSTNAME%%.*}.internal" "/etc/hosts"; then
+      __printf_space "40" "${CONTAINER_IP4_ADDRESS:-127.0.0.1}" "${HOSTNAME%%.*}.internal" >>"/etc/hosts" 2>/dev/null || true
+    fi
   fi
   # - - - - - - - - - - - - - - - - - - - - - - - - -
   # add domainname
   if [ "$UPDATE_FILE_HOSTS" = "yes" ] && [ "$DOMAINNAME" != "internal" ] && [ -n "$DOMAINNAME" ] && [ "$HOSTNAME.$DOMAINNAME" != "$DOMAINNAME" ]; then
-    __grep_test " ${HOSTNAME%%.*}.$DOMAINNAME" "/etc/hosts" || __printf_space "40" "${CONTAINER_IP4_ADDRESS:-127.0.0.1}" "${HOSTNAME%%.*}.$DOMAINNAME" >>"/etc/hosts"
+    if ! __grep_test " ${HOSTNAME%%.*}.$DOMAINNAME" "/etc/hosts"; then
+      __printf_space "40" "${CONTAINER_IP4_ADDRESS:-127.0.0.1}" "${HOSTNAME%%.*}.$DOMAINNAME" >>"/etc/hosts" 2>/dev/null || true
+    fi
   fi
   # - - - - - - - - - - - - - - - - - - - - - - - - -
   # Set containers hostname
-  [ -n "$HOSTNAME" ] && [ "$UPDATE_FILE_HOSTS" = "yes" ] && echo "$HOSTNAME" >"/etc/hostname"
+  if [ -n "$HOSTNAME" ] && [ "$UPDATE_FILE_HOSTS" = "yes" ]; then
+    echo "$HOSTNAME" >"/etc/hostname" 2>/dev/null || true
+  fi
   # - - - - - - - - - - - - - - - - - - - - - - - - -
   if [ -f "/etc/hostname" ]; then
-    [ -n "$(type -P hostname)" ] && hostname -F "/etc/hostname" &>/dev/null || HOSTNAME="$(<"/etc/hostname")"
+    if command -v hostname &>/dev/null; then
+      hostname -F "/etc/hostname" 2>/dev/null || true
+    else
+      HOSTNAME="$(<"/etc/hostname")" 2>/dev/null || true
+    fi
     export HOSTNAME
   fi
   # - - - - - - - - - - - - - - - - - - - - - - - - -
   # import hosts file into container
-  [ -f "/usr/local/etc/hosts" ] && [ "$UPDATE_FILE_HOSTS" = "yes" ] && cat "/usr/local/etc/hosts" | grep -vF "$HOSTNAME" >>"/etc/hosts"
+  if [ -f "/usr/local/etc/hosts" ] && [ "$UPDATE_FILE_HOSTS" = "yes" ]; then
+    grep -vF "$HOSTNAME" "/usr/local/etc/hosts" 2>/dev/null >>"/etc/hosts" 2>/dev/null || true
+  fi
   # - - - - - - - - - - - - - - - - - - - - - - - - -
   # import resolv.conf file into container
-  [ "$CUSTOM_DNS" != "yes" ] && [ -f "/usr/local/etc/resolv.conf" ] && [ "$UPDATE_FILE_RESOLV" = "yes" ] && cat "/usr/local/etc/resolv.conf" >"/etc/resolv.conf"
+  if [ "$CUSTOM_DNS" != "yes" ] && [ -f "/usr/local/etc/resolv.conf" ] && [ "$UPDATE_FILE_RESOLV" = "yes" ]; then
+    cp -f "/usr/local/etc/resolv.conf" "/etc/resolv.conf" 2>/dev/null || true
+  fi
   # - - - - - - - - - - - - - - - - - - - - - - - - -
   if [ -n "$HOME" ] && [ -d "/usr/local/etc/skel" ]; then
-    [ -d "$HOME" ] && cp -Rf "/usr/local/etc/skel/." "$HOME/"
+    if [ -d "$HOME" ]; then
+      cp -Rf "/usr/local/etc/skel/." "$HOME/" 2>/dev/null || true
+    fi
   fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-# Delete any .gitkeep files
-[ -d "/data" ] && rm -Rf "/data/.gitkeep" "/data"/*/*.gitkeep
-[ -d "/config" ] && rm -Rf "/config/.gitkeep" "/config"/*/*.gitkeep
-[ -f "/usr/local/bin/.gitkeep" ] && rm -Rf "/usr/local/bin/.gitkeep"
-# - - - - - - - - - - - - - - - - - - - - - - - - -
-# Setup bin directory - /config/bin > /usr/local/bin
-__initialize_custom_bin_dir
-# - - - - - - - - - - - - - - - - - - - - - - - - -
-# Copy default system configs - /usr/local/share/template-files/defaults > /config/
-__initialize_default_templates
-# - - - - - - - - - - - - - - - - - - - - - - - - -
-# Copy custom config files - /usr/local/share/template-files/config > /config/
-__initialize_config_dir
-# - - - - - - - - - - - - - - - - - - - - - - - - -
-# Copy custom data files - /usr/local/share/template-files/data > /data/
-__initialize_data_dir
-# - - - - - - - - - - - - - - - - - - - - - - - - -
-__initialize_ssl_certs
-# - - - - - - - - - - - - - - - - - - - - - - - - -
-if [ -f "$ENTRYPOINT_INIT_FILE" ]; then
-  ENTRYPOINT_FIRST_RUN="no"
-fi
-# - - - - - - - - - - - - - - - - - - - - - - - - -
-if [ -d "/config" ]; then
-  echo "Initialized on: $INIT_DATE" >"$ENTRYPOINT_INIT_FILE"
-fi
-# - - - - - - - - - - - - - - - - - - - - - - - - -
-# Check if this is a new container
-if [ -f "$ENTRYPOINT_DATA_INIT_FILE" ]; then
-  DATA_DIR_INITIALIZED="yes"
-fi
-# - - - - - - - - - - - - - - - - - - - - - - - - -
+# Delete any .gitkeep files (bash * does not match dotfiles by default,
+# so the explicit /.gitkeep path is required at each depth)
 if [ -d "/data" ]; then
-  echo "Initialized on: $INIT_DATE" >"$ENTRYPOINT_DATA_INIT_FILE"
+  rm -Rf "/data/.gitkeep" "/data"/*/.gitkeep 2>/dev/null || true
 fi
-# - - - - - - - - - - - - - - - - - - - - - - - - -
-if [ -f "$ENTRYPOINT_CONFIG_INIT_FILE" ]; then
-  CONFIG_DIR_INITIALIZED="yes"
-fi
-# - - - - - - - - - - - - - - - - - - - - - - - - -
 if [ -d "/config" ]; then
-  echo "Initialized on: $INIT_DATE" >"$ENTRYPOINT_CONFIG_INIT_FILE"
+  rm -Rf "/config/.gitkeep" "/config"/*/.gitkeep 2>/dev/null || true
+fi
+if [ -f "/usr/local/bin/.gitkeep" ]; then
+  rm -Rf "/usr/local/bin/.gitkeep" 2>/dev/null || true
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-if [ "$ENTRYPOINT_FIRST_RUN" != "no" ]; then
+# Only run initialization on first run or when directories are not initialized
+if [ "$ENTRYPOINT_FIRST_RUN" != "no" ] || [ "$CONFIG_DIR_INITIALIZED" = "no" ] || [ "$DATA_DIR_INITIALIZED" = "no" ]; then
+  # - - - - - - - - - - - - - - - - - - - - - - - - -
+  # Setup bin directory - /config/bin > /usr/local/bin
+  __initialize_custom_bin_dir
+  # - - - - - - - - - - - - - - - - - - - - - - - - -
+  # Copy default system configs - /usr/local/share/template-files/defaults > /config/
+  if [ "$CONFIG_DIR_INITIALIZED" = "no" ]; then
+    __initialize_default_templates
+  fi
+  # - - - - - - - - - - - - - - - - - - - - - - - - -
+  # Copy custom config files - /usr/local/share/template-files/config > /config/
+  if [ "$CONFIG_DIR_INITIALIZED" = "no" ]; then
+    __initialize_config_dir
+  fi
+  # - - - - - - - - - - - - - - - - - - - - - - - - -
+  # Copy custom data files - /usr/local/share/template-files/data > /data/
+  if [ "$DATA_DIR_INITIALIZED" = "no" ]; then
+    __initialize_data_dir
+  fi
+  # - - - - - - - - - - - - - - - - - - - - - - - - -
+  # Initialize SSL certificates
+  __initialize_ssl_certs
+  # - - - - - - - - - - - - - - - - - - - - - - - - -
+  # Mark directories as initialized (only write if not already initialized)
+  if [ -d "/config" ] && [ "$CONFIG_DIR_INITIALIZED" = "no" ]; then
+    echo "Initialized on: $INIT_DATE" >"$ENTRYPOINT_CONFIG_INIT_FILE" 2>/dev/null || true
+    CONFIG_DIR_INITIALIZED="yes"
+  fi
+  # - - - - - - - - - - - - - - - - - - - - - - - - -
+  if [ -d "/data" ] && [ "$DATA_DIR_INITIALIZED" = "no" ]; then
+    echo "Initialized on: $INIT_DATE" >"$ENTRYPOINT_DATA_INIT_FILE" 2>/dev/null || true
+    DATA_DIR_INITIALIZED="yes"
+  fi
+  # - - - - - - - - - - - - - - - - - - - - - - - - -
+  if [ -d "/config" ] && [ ! -f "$ENTRYPOINT_INIT_FILE" ]; then
+    echo "Initialized on: $INIT_DATE" >"$ENTRYPOINT_INIT_FILE" 2>/dev/null || true
+  fi
+  # - - - - - - - - - - - - - - - - - - - - - - - - -
   # setup the smtp server
   __setup_mta
+  # - - - - - - - - - - - - - - - - - - - - - - - - -
+  ENTRYPOINT_FIRST_RUN="no"
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # if no pid assume container restart - clean stale files on restart
 if [ -f "$ENTRYPOINT_PID_FILE" ]; then
-  START_SERVICES="no"
-  touch "$ENTRYPOINT_PID_FILE"
+  # Check if the PID in the file is still running
+  entrypoint_pid=$(<"$ENTRYPOINT_PID_FILE") 2>/dev/null
+  if [ -n "$entrypoint_pid" ] && kill -0 "$entrypoint_pid" 2>/dev/null; then
+    # Process is still running, don't restart services
+    START_SERVICES="no"
+    touch "$ENTRYPOINT_PID_FILE"
+  else
+    # PID file exists but process is dead - this is a restart
+    START_SERVICES="yes"
+    # Clean any stale PID files on restart
+    rm -f /run/.start_init_scripts.pid /run/init.d/*.pid /run/*.pid 2>/dev/null || true
+  fi
 else
   START_SERVICES=yes
   # Clean any stale PID files on first run
@@ -411,6 +506,9 @@ if [ "$START_SERVICES" = "yes" ] || [ -z "$1" ]; then
     echo "$$" >"$ENTRYPOINT_PID_FILE"
     __start_init_scripts "/usr/local/etc/docker/init.d"
     CONTAINER_INIT="${CONTAINER_INIT:-no}"
+    # Services started successfully - enter monitoring mode
+    __no_exit
+    exit $?
   fi
   START_SERVICES="no"
 fi
@@ -420,7 +518,7 @@ export START_SERVICES CONTAINER_INIT ENTRYPOINT_PID_FILE
 case "$1" in
 init)
   shift 1
-  echo "Container has been Initialized"
+  __log_info "Container has been initialized"
   exit 0
   ;;
 tail)
@@ -451,7 +549,7 @@ logs)
   clean)
     log_files="$(find "/data/logs" -type f)"
     for log in "${log_files[@]}"; do
-      echo "clearing $log"
+      __log_info "Clearing log file: $log"
       printf '' >$log
     done
     ;;
@@ -464,7 +562,7 @@ logs)
 cron)
   shift 1
   __cron "$@" &
-  echo "cron script is running with pid: $!"
+  __log_info "Cron script is running with PID: $!"
   exit
   ;;
 # backup data and config dirs
@@ -490,13 +588,13 @@ healthcheck)
     services="$(echo "${SERVICES_LIST//,/ }")"
     healthMessage="Everything seems to be running"
     [ "$healthEnabled" = "yes" ] || exit 0
-    if [ -d "/run/healthcheck" ] && [ "$(ls -A "/run/healthcheck" | wc -l)" -ne 0 ]; then
+    if [ -d "/run/healthcheck" ] && ! __is_dir_empty "/run/healthcheck"; then
       for service in /run/healthcheck/*; do
-        name=$(basename -- $service)
+        name="${service##*/}"
         services+="$name "
       done
     fi
-    services="$(echo "$services" | tr ' ' '\n' | sort -u | grep -v '^$')"
+    services="$(printf '%s\n' $services | sort -u | grep -v '^$')"
     for proc in $services; do
       if [ -n "$proc" ]; then
         if ! __pgrep "$proc"; then
@@ -506,7 +604,7 @@ healthcheck)
       fi
     done
     for port in $ports; do
-      if [ -n "$(type -P netstat)" ] && [ -n "$port" ]; then
+      if command -v netstat &>/dev/null && [ -n "$port" ]; then
         if ! netstat -taupln | grep -q ":$port "; then
           echo "$port isn't open" >&2
           healthStatus=$((healthStatus + 1))
@@ -530,14 +628,14 @@ healthcheck)
   # show open ports
 ports)
   shift 1
-  ports="$(__netstat -taupln | awk -F ' ' '{print $4}' | awk -F ':' '{print $2}' | sort --unique --version-sort | grep -v '^$' | grep '^' || echo '')"
+  ports="$(__netstat -taupln 2>/dev/null | awk '{ split($4, a, ":"); if (a[2] != "") print a[2] }' | sort -uV)"
   [ -n "$ports" ] && printf '%s\n%s\n' "The following are servers:" "$ports" | tr '\n' ' '
   exit $?
   ;;
   # show running processes
 procs)
   shift 1
-  ps="$(__ps axco command | grep -vE 'COMMAND|grep|ps' | sort -u || grep '^' || echo '')"
+  ps="$(__ps axco command 2>/dev/null | grep -vE '^(COMMAND|grep|ps)$' | sort -u)"
   [ -n "$ps" ] && printf '%s\n%s\n' "Found the following processes" "$ps" | tr '\n' ' '
   exit $?
   ;;
diff --git a/rootfs/usr/local/bin/pkmgr b/rootfs/usr/local/bin/pkmgr
index 205c2b0..bebefdb 100755
--- a/rootfs/usr/local/bin/pkmgr
+++ b/rootfs/usr/local/bin/pkmgr
@@ -1,10 +1,10 @@
 #!/usr/bin/env sh
 # shellcheck shell=sh
 # shellcheck disable=SC2016
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 USER_UID="$(id -u)"
 USER_GID="$(id -g)"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 if [ -x "$(command -v apt 2>/dev/null)" ]; then
   export DEBIAN_FRONTEND=noninteractive
   pkmgr_cmd="apt"
@@ -58,7 +58,7 @@ else
   pkmgr_update_cmd="$pkmgr_cmd"
   pkmgr_install_cmd="$pkmgr_cmd"
 fi
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 if [ -f "/config/pkmgr/settings.conf" ]; then
   . "/config/pkmgr/settings.conf"
 elif [ -f "/etc/pkmgr/settings.conf" ]; then
@@ -73,9 +73,9 @@ pkmgr_install_cmd="$pkmgr_install_cmd"
 pkmgr_mkcache_cmd="$pkmgr_mkcache_cmd"
 EEOF
 fi
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 [ -n "$pkmgr_cmd" ] || { echo "Can not determine the package manager" && exit 1; }
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 case "$1" in
 pip)
   shift 1
@@ -103,7 +103,7 @@ install)
   [ -n "$1" ] || exit 0
   [ "$USER_UID" -eq 0 ] || [ "$USER" = "root" ] || pkmgr_install_cmd="sudo $pkmgr_install_cmd"
   if [ -f "$1" ]; then
-    install_list="$(cat "$1")"
+    install_list="$(tr '\n' ' ' < "$1")"
   else
     install_list="$*"
   fi
@@ -138,5 +138,6 @@ clean)
   exit $?
   ;;
 esac
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# - - - - - - - - - - - - - - - - - - - - - - - - -
 # end
+