diff --git a/HydroEO/cli/__init__.py b/HydroEO/cli/__init__.py
index 9c3403f..147c462 100644
--- a/HydroEO/cli/__init__.py
+++ b/HydroEO/cli/__init__.py
@@ -282,6 +282,10 @@ def fetch_swot_raster(
     startdate = _parse_date(start, "--start")
     enddate = _parse_date(end, "--end")
     u, p = _resolve_earthaccess_creds(username, password)
+    if u:
+        os.environ["EARTHDATA_USERNAME"] = u
+    if p:
+        os.environ["EARTHDATA_PASSWORD"] = p
 
     config = {
         "aoi": {
@@ -296,7 +300,7 @@ def fetch_swot_raster(
 
     from HydroEO.satellites.swot.raster import download_raster
 
-    download_raster(config=config, project_dir=output, credentials=(u, p))
+    download_raster(config=config, project_dir=output)
     typer.echo(f"SWOT raster download complete. Output: {output}")
 
 
@@ -363,6 +367,10 @@ def fetch_swot_pixc(
     startdate = _parse_date(start, "--start")
     enddate = _parse_date(end, "--end")
     u, p = _resolve_earthaccess_creds(username, password)
+    if u:
+        os.environ["EARTHDATA_USERNAME"] = u
+    if p:
+        os.environ["EARTHDATA_PASSWORD"] = p
 
     # Parse optional classes and fields
     classes_list = (
@@ -389,7 +397,7 @@ def fetch_swot_pixc(
 
     from HydroEO.satellites.swot.pixc import download_pixc
 
-    download_pixc(config=config, project_dir=output, credentials=(u, p))
+    download_pixc(config=config, project_dir=output)
     typer.echo(f"SWOT pixel cloud download complete. Output: {output}")
 
 
diff --git a/pyproject.toml b/pyproject.toml
index 712c2bf..5e11f34 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -14,7 +14,7 @@ exclude = ["notebooks", "tests", "images"]
 [project]
 # name on PyPI (e.g. pip install HydroEO)
 name = "HydroEO"
-version = "0.2.0"
+version = "0.2.1"
 dependencies = [
     "earthaccess>=0.9.0,<2.0",
     "h5netcdf>=1.3.0,<2.0",
diff --git a/uv.lock b/uv.lock
index d0acbc8..23b1203 100644
--- a/uv.lock
+++ b/uv.lock
@@ -1276,7 +1276,7 @@ wheels = [
 
 [[package]]
 name = "hydroeo"
-version = "0.2.0"
+version = "0.2.1"
 source = { editable = "." }
 dependencies = [
     { name = "cmcrameri" },