diff --git a/NAERSTADMO.py b/NAERSTADMO.py
index d233a19c6d6123af97ca3ef635db5ff34b122cd9..1df3943a984eb78ce6b87a93c0cb9835bb45570b 100644
--- a/NAERSTADMO.py
+++ b/NAERSTADMO.py
@@ -244,8 +244,8 @@ def create_warning_status(start_date):
     output = template.render(
         {
             "timestep_dates": timestep_dates,
-            "mapserver_data_dir": os.getenv("MAPSERVER_DATA_DIR"),
-            "mapserver_mapfile_dir": os.getenv("MAPSERVER_MAPFILE_DIR"),
+            "mapserver_data_dir": f"{os.getenv("MAPSERVER_DATA_DIR")}{year}/",
+            "mapserver_mapfile_dir": f"{os.getenv("MAPSERVER_MAPFILE_DIR")}{year}/",
             "mapserver_log_file": os.getenv("MAPSERVER_LOG_FILE"),
             "mapserver_image_path": os.getenv("MAPSERVER_IMAGE_PATH"),
             "mapserver_extent": os.getenv("MAPSERVER_EXTENT"),