diff --git a/src/preset_cli/cli/main.py b/src/preset_cli/cli/main.py
index 68801ad6..7e052daf 100644
--- a/src/preset_cli/cli/main.py
+++ b/src/preset_cli/cli/main.py
@@ -99,7 +99,7 @@ def is_help() -> bool:
 @click.option("--api-token", envvar="PRESET_API_TOKEN")
 @click.option("--api-secret", envvar="PRESET_API_SECRET")
 @click.option("--jwt-token", envvar="PRESET_JWT_TOKEN")
-@click.option("--workspaces", callback=split_comma)
+@click.option("--workspaces", envvar="PRESET_WORKSPACES", callback=split_comma)
 @click.option("--loglevel", default="INFO")
 @click.version_option()
 @click.pass_context
diff --git a/tests/cli/main_test.py b/tests/cli/main_test.py
index bbc2c956..6234b104 100644
--- a/tests/cli/main_test.py
+++ b/tests/cli/main_test.py
@@ -362,6 +362,31 @@ def test_workspaces(mocker: MockerFixture) -> None:
     assert obj["WORKSPACES"] == ["https://ws1", "https://ws2"]
 
 
+def test_workspaces_from_env(
+    mocker: MockerFixture,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    """
+    Test that we don't prompt user for their workspaces if defined in the environment.
+    """
+    monkeypatch.setenv("PRESET_WORKSPACES", "https://ws1,https://ws2")
+
+    PresetClient = mocker.patch("preset_cli.cli.main.PresetClient")
+    client = PresetClient()
+
+    runner = CliRunner()
+    obj: Dict[str, Any] = {}
+    result = runner.invoke(
+        preset_cli,
+        ["--jwt-token", "JWT_TOKEN", "superset", "--help"],
+        catch_exceptions=False,
+        obj=obj,
+    )
+    assert result.exit_code == 0
+    assert obj["WORKSPACES"] == ["https://ws1", "https://ws2"]
+    client.get_workspaces.assert_not_called()
+
+
 def test_workspaces_help(mocker: MockerFixture) -> None:
     """
     Test that we don't prompt user for their workspaces if ``--help`` is passed.