diff --git a/.env.scripts b/.env.scripts
index 06c7491..fe163d3 100644
--- a/.env.scripts
+++ b/.env.scripts
@@ -1,10 +1,10 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202511291148-git
+##@Version           :  202605041316-git
 # @@Author           :  CasjaysDev
 # @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
 # @@License          :  MIT
-# @@Copyright        :  Copyright 2025 CasjaysDev
-# @@Created          :  Sat Nov 29 11:48:49 AM EST 2025
+# @@Copyright        :  Copyright 2026 CasjaysDev
+# @@Created          :  Mon May  4 01:16:12 PM EDT 2026
 # @@File             :  .env.scripts
 # @@Description      :  Variables for gen-dockerfile and buildx scripts
 # @@Changelog        :  newScript
@@ -25,11 +25,12 @@ DOCKER_ENTYPOINT_HEALTH_ENDPOINTS="$DOCKER_ENTYPOINT_HEALTH_ENDPOINTS"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Dockerfile info
 ENV_DOCKERFILE="Dockerfile"
-ENV_IMAGE_NAME="archlinux"
+# ENV_REGISTRY_REPO: Registry repository/image name
+ENV_REGISTRY_REPO="archlinux"
 ENV_USE_TEMPLATE="archlinux"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Maintainer info
-ENV_ORG_NAME="casjaysdev"
+ENV_REGISTRY_ORG="casjaysdev"
 ENV_VENDOR="CasjaysDev"
 ENV_AUTHOR="CasjaysDev"
 ENV_MAINTAINER="CasjaysDev <docker-admin@casjaysdev.pro>"
@@ -37,25 +38,25 @@ ENV_MAINTAINER="CasjaysDev <docker-admin@casjaysdev.pro>"
 # Repository URLs (Full URLs)
 # ENV_GIT_REPO_URL: Complete Git repository URL for source code
 ENV_GIT_REPO_URL="https://github.com/casjaysdevdocker/archlinux"
-# ENV_REGISTRY_URL: Complete registry URL for reference (NOT used for pushing)
-ENV_REGISTRY_URL="https://hub.docker.com/casjaysdevdocker/archlinux"
+# ENV_REGISTRY_URL: Registry provider base URL (for example https://docker.io)
+ENV_REGISTRY_URL="https://docker.io"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Push Configuration
-# ENV_IMAGE_PUSH: Complete push destination (this IS used for pushing)
-ENV_IMAGE_PUSH="casjaysdev/archlinux"
+# ENV_REGISTRY_PUSH: Complete push destination derived from registry/org/repo
+ENV_REGISTRY_PUSH="casjaysdev/archlinux"
 # 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="USE_DATE"
+ENV_ADD_TAGS=""
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Additional push destinations (if needed)
 ENV_ADD_IMAGE_PUSH=""
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Pull Configuration
 # ENV_PULL_URL: Source image to pull from (base image)
-ENV_PULL_URL="ghcr.io/dockersrc/archlinux"
+ENV_PULL_URL="casjaysdev/archlinux"
 # ENV_DISTRO_TAG: Tag for the pull source image
-ENV_DISTRO_TAG="base"
+ENV_DISTRO_TAG="${IMAGE_VERSION}"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Env
 SERVICE_PORT=""
@@ -76,7 +77,8 @@ 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-completion git curl wget sudo unzip base-devel mailx postfix python python-pip certbot ca-certificates jq "
+ENV_PACKAGES=""
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # ex: ts=2 sw=2 et filetype=sh
 # - - - - - - - - - - - - - - - - - - - - - - - - -
+