diff --git a/astro-airflow-iris/{{ cookiecutter.repo_name }}/requirements.txt b/astro-airflow-iris/{{ cookiecutter.repo_name }}/requirements.txt
index f1aa0979..b49c5e61 100644
--- a/astro-airflow-iris/{{ cookiecutter.repo_name }}/requirements.txt	
+++ b/astro-airflow-iris/{{ cookiecutter.repo_name }}/requirements.txt	
@@ -2,7 +2,8 @@ ipython>=8.10
 jupyterlab>=3.0
 notebook
 kedro~={{ cookiecutter.kedro_version }}
-kedro-datasets[pandas.CSVDataset]>=1.0
+kedro-datasets[pandas-csvdataset]>=3.0; python_version >= "3.9"
+kedro-datasets[pandas.CSVDataset]>=1.0; python_version < "3.9"
 kedro-airflow~=0.5
 kedro-telemetry>=0.3.1
 pytest-cov~=3.0
diff --git a/features/environment.py b/features/environment.py
index 0f6052f4..c3aa5b10 100644
--- a/features/environment.py
+++ b/features/environment.py
@@ -101,7 +101,7 @@ def before_scenario(context, scenario):
             "install",
             "-U",
             # pip==23.3 breaks dependency resolution
-            "pip==23.2",
+            "pip==23.3.1",
         ],
         env=context.env,
     )
diff --git a/spaceflights-pandas-viz/{{ cookiecutter.repo_name }}/requirements.txt b/spaceflights-pandas-viz/{{ cookiecutter.repo_name }}/requirements.txt
index 0aaa6250..bb2e2a25 100644
--- a/spaceflights-pandas-viz/{{ cookiecutter.repo_name }}/requirements.txt	
+++ b/spaceflights-pandas-viz/{{ cookiecutter.repo_name }}/requirements.txt	
@@ -2,7 +2,8 @@ ipython>=8.10
 jupyterlab>=3.0
 notebook
 kedro~={{ cookiecutter.kedro_version }}
-kedro-datasets[pandas.CSVDataset, pandas.ExcelDataset, pandas.ParquetDataset, plotly.PlotlyDataset, plotly.JSONDataset, matplotlib.MatplotlibWriter]>=1.0
+kedro-datasets[pandas-csvdataset, pandas-exceldataset, pandas-parquetdataset, plotly-plotlydataset, plotly-jsondataset, matplotlib-matplotlibwriter]>=3.0; python_version >= "3.9"
+kedro-datasets[pandas.CSVDataset, pandas.ExcelDataset, pandas.ParquetDataset, plotly.PlotlyDataset, plotly.JSONDataset, matplotlib.MatplotlibWriter]>=1.0; python_version < "3.9"
 kedro-telemetry>=0.3.1
 kedro-viz>=6.7.0
 pytest-cov~=3.0
diff --git a/spaceflights-pandas/{{ cookiecutter.repo_name }}/requirements.txt b/spaceflights-pandas/{{ cookiecutter.repo_name }}/requirements.txt
index c41f20b4..b58e63f2 100644
--- a/spaceflights-pandas/{{ cookiecutter.repo_name }}/requirements.txt	
+++ b/spaceflights-pandas/{{ cookiecutter.repo_name }}/requirements.txt	
@@ -2,7 +2,8 @@ ipython>=8.10
 jupyterlab>=3.0
 notebook
 kedro~={{ cookiecutter.kedro_version }}
-kedro-datasets[pandas.CSVDataset, pandas.ExcelDataset, pandas.ParquetDataset]>=1.0
+kedro-datasets[pandas-csvdataset, pandas-exceldataset, pandas-parquetdataset]>=3.0; python_version >= "3.9"
+kedro-datasets[pandas.CSVDataset, pandas.ExcelDataset, pandas.ParquetDataset]>=1.0; python_version < "3.9"
 kedro-telemetry>=0.3.1
 kedro-viz>=6.7.0
 pytest-cov~=3.0
diff --git a/spaceflights-pyspark-viz/{{ cookiecutter.repo_name }}/conf/base/catalog.yml b/spaceflights-pyspark-viz/{{ cookiecutter.repo_name }}/conf/base/catalog.yml
index e168de3a..a0755689 100644
--- a/spaceflights-pyspark-viz/{{ cookiecutter.repo_name }}/conf/base/catalog.yml	
+++ b/spaceflights-pyspark-viz/{{ cookiecutter.repo_name }}/conf/base/catalog.yml	
@@ -63,7 +63,7 @@ reviews:
     header: True
     mode: overwrite
 
-shuttles@excel:
+shuttles_excel:
   type: pandas.ExcelDataset
   filepath: data/01_raw/shuttles.xlsx
 
diff --git a/spaceflights-pyspark-viz/{{ cookiecutter.repo_name }}/requirements.txt b/spaceflights-pyspark-viz/{{ cookiecutter.repo_name }}/requirements.txt
index 48b5f058..0b77cff7 100644
--- a/spaceflights-pyspark-viz/{{ cookiecutter.repo_name }}/requirements.txt	
+++ b/spaceflights-pyspark-viz/{{ cookiecutter.repo_name }}/requirements.txt	
@@ -2,7 +2,8 @@ ipython>=8.10
 jupyterlab>=3.0
 notebook
 kedro~={{ cookiecutter.kedro_version }}
-kedro-datasets[pandas.CSVDataset, pandas.ExcelDataset, pandas.ParquetDataset, spark.SparkDataset, plotly.PlotlyDataset, plotly.JSONDataset, matplotlib.MatplotlibWriter]>=1.0
+kedro-datasets[pandas-csvdataset, pandas-exceldataset, pandas-parquetdataset, spark-sparkdataset, plotly-plotlydataset, plotly-jsondataset, matplotlib-matplotlibwriter]>=3.0; python_version >= "3.9"
+kedro-datasets[pandas.CSVDataset, pandas.ExcelDataset, pandas.ParquetDataset, spark.SparkDataset, plotly.PlotlyDataset, plotly.JSONDataset, matplotlib.MatplotlibWriter]>=1.0; python_version < "3.9"
 kedro-telemetry>=0.3.1
 kedro-viz>=6.7.0
 pytest-cov~=3.0
diff --git a/spaceflights-pyspark-viz/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.python_package }}/pipelines/data_processing/pipeline.py b/spaceflights-pyspark-viz/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.python_package }}/pipelines/data_processing/pipeline.py
index 7f11642b..fbe37cd2 100755
--- a/spaceflights-pyspark-viz/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.python_package }}/pipelines/data_processing/pipeline.py	
+++ b/spaceflights-pyspark-viz/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.python_package }}/pipelines/data_processing/pipeline.py	
@@ -14,7 +14,7 @@ def create_pipeline(**kwargs) -> Pipeline:
         [
             node(
                 func=load_shuttles_to_csv,
-                inputs="shuttles@excel",
+                inputs="shuttles_excel",
                 outputs="shuttles@csv",
                 name="load_shuttles_to_csv_node",
             ),
diff --git a/spaceflights-pyspark/{{ cookiecutter.repo_name }}/conf/base/catalog.yml b/spaceflights-pyspark/{{ cookiecutter.repo_name }}/conf/base/catalog.yml
index 186c0b54..55c1d844 100644
--- a/spaceflights-pyspark/{{ cookiecutter.repo_name }}/conf/base/catalog.yml	
+++ b/spaceflights-pyspark/{{ cookiecutter.repo_name }}/conf/base/catalog.yml	
@@ -63,7 +63,7 @@ reviews:
     header: True
     mode: overwrite
 
-shuttles@excel:
+shuttles_excel:
   type: pandas.ExcelDataset
   filepath: data/01_raw/shuttles.xlsx
 
diff --git a/spaceflights-pyspark/{{ cookiecutter.repo_name }}/requirements.txt b/spaceflights-pyspark/{{ cookiecutter.repo_name }}/requirements.txt
index dafb7874..6516cc7a 100644
--- a/spaceflights-pyspark/{{ cookiecutter.repo_name }}/requirements.txt	
+++ b/spaceflights-pyspark/{{ cookiecutter.repo_name }}/requirements.txt	
@@ -2,7 +2,8 @@ ipython>=8.10
 jupyterlab>=3.0
 notebook
 kedro~={{ cookiecutter.kedro_version }}
-kedro-datasets[pandas.CSVDataset, pandas.ExcelDataset, pandas.ParquetDataset, spark.SparkDataset]>=1.0
+kedro-datasets[pandas-csvdataset, pandas-exceldataset, pandas-parquetdataset, spark-sparkdataset]>=3.0; python_version >= "3.9"
+kedro-datasets[pandas.CSVDataset, pandas.ExcelDataset, pandas.ParquetDataset, spark.SparkDataset]>=1.0; python_version < "3.9"
 kedro-telemetry>=0.3.1
 kedro-viz>=6.7.0
 pytest-cov~=3.0
diff --git a/spaceflights-pyspark/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.python_package }}/pipelines/data_processing/pipeline.py b/spaceflights-pyspark/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.python_package }}/pipelines/data_processing/pipeline.py
index edafae85..44e1b21d 100755
--- a/spaceflights-pyspark/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.python_package }}/pipelines/data_processing/pipeline.py	
+++ b/spaceflights-pyspark/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.python_package }}/pipelines/data_processing/pipeline.py	
@@ -14,7 +14,7 @@ def create_pipeline(**kwargs) -> Pipeline:
         [
             node(
                 func=load_shuttles_to_csv,
-                inputs="shuttles@excel",
+                inputs="shuttles_excel",
                 outputs="shuttles@csv",
                 name="load_shuttles_to_csv_node",
             ),