Deductions & credits

Since both of us are over 55 shouldn't it be:

Working spouse withhold $7300 + $1000 (over 55 add-on)

Non-working spouse contributes $1000 to own HSA

for a total of $9300?