diff --git a/lib/common.sh b/lib/common.sh
index 19d667d..85b4818 100644
--- a/lib/common.sh
+++ b/lib/common.sh
@@ -204,10 +204,12 @@ validate_optional_path() {
 # Parallel arrays: variable name → validator type (bash 3.2 compatible).
 # Order matches configure_env.sh prompt_var calls.
 _ENV_VAR_NAMES=(
-  UNRAID_IP UNRAID_SSH_USER UNRAID_SSH_PORT
-  UNRAID_GITEA_PORT UNRAID_GITEA_SSH_PORT UNRAID_GITEA_DATA_PATH
-  FEDORA_IP FEDORA_SSH_USER FEDORA_SSH_PORT
-  FEDORA_GITEA_PORT FEDORA_GITEA_SSH_PORT FEDORA_GITEA_DATA_PATH
+  UNRAID_IP UNRAID_SSH_USER UNRAID_SSH_PORT UNRAID_GITEA_DATA_PATH
+  FEDORA_IP FEDORA_SSH_USER FEDORA_SSH_PORT FEDORA_GITEA_DATA_PATH
+  UNRAID_MACVLAN_PARENT UNRAID_MACVLAN_SUBNET UNRAID_MACVLAN_GATEWAY
+  UNRAID_MACVLAN_IP_RANGE UNRAID_GITEA_IP UNRAID_CADDY_IP
+  FEDORA_MACVLAN_PARENT FEDORA_MACVLAN_SUBNET FEDORA_MACVLAN_GATEWAY
+  FEDORA_MACVLAN_IP_RANGE FEDORA_GITEA_IP FEDORA_CADDY_IP
   GITEA_ADMIN_USER GITEA_ADMIN_PASSWORD GITEA_ADMIN_EMAIL
   GITEA_ORG_NAME GITEA_INSTANCE_NAME GITEA_DB_TYPE GITEA_VERSION ACT_RUNNER_VERSION
   GITEA_DOMAIN GITEA_INTERNAL_URL
@@ -224,10 +226,12 @@ _ENV_VAR_NAMES=(
 )
 
 _ENV_VAR_TYPES=(
-  ip nonempty port
-  port port path
-  ip nonempty port
-  port port path
+  ip nonempty port path
+  ip nonempty port path
+  nonempty nonempty ip
+  nonempty ip ip
+  nonempty nonempty ip
+  nonempty ip ip
   nonempty password email
   nonempty nonempty db_type nonempty nonempty
   nonempty url
@@ -253,8 +257,8 @@ _ENV_CONDITIONAL_DB_NAMES=(GITEA_DB_HOST GITEA_DB_PORT GITEA_DB_NAME GITEA_DB_US
 _ENV_CONDITIONAL_DB_TYPES=(nonempty      port          nonempty      nonempty      password)
 
 # Optional variables — validated only when non-empty (never required).
-_ENV_OPTIONAL_NAMES=(UNRAID_SSH_KEY FEDORA_SSH_KEY LOCAL_REGISTRY)
-_ENV_OPTIONAL_TYPES=(optional_path  optional_path  nonempty)
+_ENV_OPTIONAL_NAMES=(UNRAID_SSH_KEY FEDORA_SSH_KEY LOCAL_REGISTRY UNRAID_DB_IP FEDORA_DB_IP)
+_ENV_OPTIONAL_TYPES=(optional_path  optional_path  nonempty       ip           ip)
 
 # Human-readable format hints for error messages.
 _validator_hint() {