diff --git a/mermaids.sh b/mermaids.sh
index 98669a4..0039a3a 100644
--- a/mermaids.sh
+++ b/mermaids.sh
@@ -83,12 +83,12 @@ fi
 log "Creating Debian 12 LXC container $LXC_ID ($LXC_HOSTNAME)..."
 
 # Build NET_CONFIG safely BEFORE pct create
-NET0_ARGS="name=eth0,bridge=$LXC_BRIDGE"
-if [[ -n "$LXC_IP" ]]; then
-  NET0_ARGS="$NET0_ARGS,ip=$LXC_IP/$LXC_NETMASK"
-  [[ -n "$LXC_GATEWAY" ]] && NET0_ARGS="$NET0_ARGS,gw=$LXC_GATEWAY"
+if [[ -n "$LXC_IP" && -n "$LXC_GATEWAY" ]]; then
+  NET0_ARGS="name=eth0,bridge=$LXC_BRIDGE,ip=$LXC_IP/$LXC_NETMASK,gw=$LXC_GATEWAY"
+elif [[ -z "$LXC_GATEWAY" && -n "$LXC_IP" ]]; then
+  NET0_ARGS="name=eth0,bridge=$LXC_BRIDGE,ip=dhcp"
 else
-  NET0_ARGS="$NET0_ARGS,ip=dhcp"
+  NET0_ARGS="name=eth0,bridge=$LXC_BRIDGE,ip=dhcp"
 fi
 
 echo "DEBUG: NET0_ARGS = $NET0_ARGS"