diff --git a/modules/aeolus/aeolus_amv.py b/modules/aeolus/aeolus_amv.py
index bc931211f62b65366972958435f9d0be9afd91bf..ffe4fa0d0c308ebcae6684d8176c06833c4d9613 100644
--- a/modules/aeolus/aeolus_amv.py
+++ b/modules/aeolus/aeolus_amv.py
@@ -2075,9 +2075,9 @@ def create_bestfit_file(filename, match_dct, raob_dct, gfs_at_raob_dct, bf_dct,
 
     # ---- Profile variables ---------------
     prf_lon = rootgrp.createVariable('raob_longitude', 'f4', ['time', 'num_raob_profs'])
-    prf_lon.units = 'degrees east'
+    prf_lon.units = 'degrees_east'
     prf_lat = rootgrp.createVariable('raob_latitude', 'f4', ['time', 'num_raob_profs'])
-    prf_lat.units = 'degrees north'
+    prf_lat.units = 'degrees_north'
 
     prf_dir = rootgrp.createVariable('raob_dir', 'f4', ['time', 'num_raob_profs', 'max_num_raob_levels'])
     prf_dir.units = 'degree'
@@ -2088,10 +2088,17 @@ def create_bestfit_file(filename, match_dct, raob_dct, gfs_at_raob_dct, bf_dct,
 
     # ----- Product variables ----------------
     nc4_vars = []
-    nc4_vars.append(rootgrp.createVariable('amv_lon', 'f4', ['time', 'num_raob_profs', 'max_num_amvs']))
-    nc4_vars.append(rootgrp.createVariable('amv_lat', 'f4', ['time', 'num_raob_profs', 'max_num_amvs']))
+    amv_lon = rootgrp.createVariable('amv_lon', 'f4', ['time', 'num_raob_profs', 'max_num_amvs'])
+    amv_lon.units = 'degrees_east'
+    nc4_vars.append(amv_lon)
+
+    amv_lat = rootgrp.createVariable('amv_lat', 'f4', ['time', 'num_raob_profs', 'max_num_amvs'])
+    amv_lat.units = 'degrees_north'
+    nc4_vars.append(amv_lat)
+
     nc4_vars.append(rootgrp.createVariable('amv_elem', 'i4', ['time', 'num_raob_profs', 'max_num_amvs']))
     nc4_vars.append(rootgrp.createVariable('amv_line', 'i4', ['time', 'num_raob_profs', 'max_num_amvs']))
+
     var_s = rg_exmpl.variables
     for pidx, param in enumerate(amv_params):
         v = var_s[param]