diff --git a/ush/python/pygfs/task/atm_analysis.py b/ush/python/pygfs/task/atm_analysis.py
index 7268e1e126..c3dd50bab8 100644
--- a/ush/python/pygfs/task/atm_analysis.py
+++ b/ush/python/pygfs/task/atm_analysis.py
@@ -62,6 +62,7 @@ def initialize(self) -> None:
 
         This method will initialize a global atm analysis using JEDI.
         This includes:
+        - generating and saving JEDI YAML config
         - staging observation files
         - staging bias correction files
         - staging CRTM fix files
@@ -72,9 +73,13 @@ def initialize(self) -> None:
         """
         super().initialize()
 
-        # get JEDI variational configuration and save to YAML file
+        # get JEDI variational configuration
         self.jedi.get_config(self.task_config)
 
+        # save JEDI config to YAML file
+        logger.debug(f"Writing JEDI YAML file to: {self.yaml}")
+        save_as_yaml(jedi.config, jedi.yaml)
+
         # link JEDI variational executable
         self.jedi.link_exe(self.task_config)
         
diff --git a/ush/python/pygfs/task/atmens_analysis.py b/ush/python/pygfs/task/atmens_analysis.py
index 1114f757a4..9f94ad6b00 100644
--- a/ush/python/pygfs/task/atmens_analysis.py
+++ b/ush/python/pygfs/task/atmens_analysis.py
@@ -63,6 +63,7 @@ def initialize_letkf(self) -> None:
 
         This method will initialize a global atmens analysis using JEDI.
         This includes:
+        - generating and saving JEDI YAML config
         - staging observation files
         - staging bias correction files
         - staging CRTM fix files
@@ -80,9 +81,13 @@ def initialize_letkf(self) -> None:
         """
         super().initialize()
 
-        # get JEDI ensemble DA config dictionary and save to YAML file
+        # get JEDI ensemble DA config dictionary
         self.jedi.get_config(self.task_config)
 
+        # save JEDI config to YAML file
+        logger.debug(f"Writing JEDI YAML file to: {self.yaml}")
+	save_as_yaml(jedi.config, jedi.yaml)
+        
         # link JEDI ensemble DA executable
         self.jedi.link_exe(self.task_config)
         
diff --git a/ush/python/pygfs/task/jedi.py b/ush/python/pygfs/task/jedi.py
index f7d501def3..8339b34a0c 100644
--- a/ush/python/pygfs/task/jedi.py
+++ b/ush/python/pygfs/task/jedi.py
@@ -72,11 +72,6 @@ def get_config(self, task_config: AttrDict[str, Any], algorithm: Optional[str] =
 
         logger.debug(f"JEDI config:\n{pformat(self.config)}")
 
-        # Save YAML to disk
-        logger.debug(f"Write YAML file to: {self.yaml}")
-        save_as_yaml(self.config, self.yaml)
-        logger.info(f"Wrote YAML file to: {self.yaml}")
-
     @logit(logger)
     def execute(self, task_config: AttrDict[str, Any], aprun_cmd: str, jedi_args: Optional[List] = None) -> None:
         """Execute JEDI application