diff --git a/param_templates/diag_table.yaml b/param_templates/diag_table.yaml
index aebd232..42d0690 100644
--- a/param_templates/diag_table.yaml
+++ b/param_templates/diag_table.yaml
@@ -59,6 +59,8 @@ FieldLists:
 
     - &cfc_2d  ["cfc11_flux", "cfc12_flux", "ice_fraction", "u10_sqr"]
 
+    - &geothermal  ["Geo_heat"]
+
 ###############################################################################
 # Section 2: File lists:
 #   List of files to be added in diag_table
@@ -230,6 +232,9 @@ Files:
             module:   "ocean_model"   # native
             packing: = 1 if $TEST else 2
             lists:    [ *static_flds ]
+            lists2:
+                $DO_GEOTHERMAL == "True":
+                    [ *geothermal ]
 
 
     # Sections ------------------------------------
diff --git a/param_templates/json/diag_table.json b/param_templates/json/diag_table.json
index a7bdfc1..d563852 100644
--- a/param_templates/json/diag_table.json
+++ b/param_templates/json/diag_table.json
@@ -189,6 +189,9 @@
          "cfc12_flux",
          "ice_fraction",
          "u10_sqr"
+      ],
+      [
+         "Geo_heat"
       ]
    ],
    "Files": {
@@ -632,7 +635,14 @@
                   "C_P",
                   "Rho_0"
                ]
-            ]
+            ],
+            "lists2": {
+               "$DO_GEOTHERMAL == \"True\"": [
+                  [
+                     "Geo_heat"
+                  ]
+               ]
+            }
          }
       },
       "Agulhas": {