diff --git a/edu_edfi_airflow/callables/change_version.py b/edu_edfi_airflow/callables/change_version.py
index 1659db5..9256dc9 100644
--- a/edu_edfi_airflow/callables/change_version.py
+++ b/edu_edfi_airflow/callables/change_version.py
@@ -297,7 +297,7 @@ def update_change_versions(
         for endpoint in endpoints:
             row = [
                 tenant_code, api_year, endpoint,
-                context["ds"], context["ts"],
+                context["dag_run"].start_date.date().isoformat(), context['dag_run'].start_date.isoformat(),
                 edfi_change_version, True,
                 row_set["get_deletes"],
             ]
diff --git a/edu_edfi_airflow/callables/total_counts.py b/edu_edfi_airflow/callables/total_counts.py
index c71e933..c91830c 100644
--- a/edu_edfi_airflow/callables/total_counts.py
+++ b/edu_edfi_airflow/callables/total_counts.py
@@ -125,7 +125,7 @@ def insert_total_counts(
     for endpoint in endpoint_counts:
         row = [
             tenant_code, api_year, endpoint[0],
-            kwargs["ds"], kwargs["ts"],
+            kwargs["dag_run"].start_date.date().isoformat(), kwargs['dag_run'].start_date.isoformat(),
             endpoint[1]
         ]
         rows_to_insert.append(row)
diff --git a/edu_edfi_airflow/dags/edfi_resource_dag.py b/edu_edfi_airflow/dags/edfi_resource_dag.py
index f08c3d0..76bcafb 100644
--- a/edu_edfi_airflow/dags/edfi_resource_dag.py
+++ b/edu_edfi_airflow/dags/edfi_resource_dag.py
@@ -261,7 +261,7 @@ def chain_task_groups_into_dag(self):
 
         # Set parent directory and create subfolders for each task group.
         parent_directory = os.path.join(
-            self.tenant_code, str(self.api_year), "{{ ds_nodash }}", "{{ ts_nodash }}"
+            self.tenant_code, str(self.api_year), "{{ dag_run.start_date | ds_nodash }}", "{{ dag_run.start_date | ts_nodash }}"
         )
 
         # Resources