diff --git a/polyapi/cli.py b/polyapi/cli.py
index 62c3cad..df7fedc 100644
--- a/polyapi/cli.py
+++ b/polyapi/cli.py
@@ -47,8 +47,11 @@ def execute_from_cli():
     setup_parser.add_argument("url", nargs="?", help="URL for the Poly API")
 
     def setup(args):
-        if args.api_key and args.url:
-            set_api_key_and_url(args.url, args.api_key)
+        api_key = args.api_key or os.getenv("POLY_API_KEY")
+        url = args.url or os.getenv("POLY_API_BASE_URL")
+
+        if api_key and url:
+            set_api_key_and_url(api_key, url)
         else:
             initialize_config(force=True)
             # setup command should have default cache values
diff --git a/pyproject.toml b/pyproject.toml
index b208338..3e1ce32 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -3,7 +3,7 @@ requires = ["setuptools>=61.2", "wheel"]
 
 [project]
 name = "polyapi-python"
-version = "0.3.10"
+version = "0.3.11.dev1"
 description = "The Python Client for PolyAPI, the IPaaS by Developers for Developers"
 authors = [{ name = "Dan Fellin", email = "dan@polyapi.io" }]
 dependencies = [