diff --git a/ADASMELIAE.py b/ADASMELIAE.py
index d7a7dd163b08528508decbcb157c9b11ebb9121d..2521cc7e7669d8c9db48bac76bf239715132b8d2 100755
--- a/ADASMELIAE.py
+++ b/ADASMELIAE.py
@@ -317,8 +317,8 @@ if __name__ == "__main__":
         {
             "model_id": model_id,
             "timestep_dates": timestep_dates,
-            "mapserver_data_dir": result_tif_year_dir,
-            "mapserver_mapfile_dir": result_mapfile_year_dir,
+            "mapserver_data_dir": os.getenv("MAPSERVER_RESULT_TIF_DIR"),
+            "mapserver_mapfile_dir": os.getenv("MAPSERVER_RESULT_MAPFILE_DIR"),
             "mapserver_log_file": os.getenv("MAPSERVER_LOG_FILE"),
             "mapserver_image_path": os.getenv("MAPSERVER_IMAGE_PATH"),
             "mapserver_extent": os.getenv("MAPSERVER_EXTENT"),