Yes! You are correct.
Glycolysis:
6 ATP
Preparation of two pyruvates for the Krebs cycle:
2 NADH
x3
6 ATP
Krebs Cycle products of two pyruvate molecules:
6 NADH
x3
18 ATP
2 GTP
x1
2 ATP
2 FADH
2
x2
4 ATP
Total ATP =
36 ATP