diff --git a/tecken/ext/gcs/storage.py b/tecken/ext/gcs/storage.py
index db3483d94..f732cfde0 100644
--- a/tecken/ext/gcs/storage.py
+++ b/tecken/ext/gcs/storage.py
@@ -36,7 +36,7 @@ def __init__(
         # The Cloud Storage client doesn't support setting global timeouts for all requests, so we
         # need to pass the timeout for every single request. the default timeout is 60 seconds for
         # both connecting and reading from the socket.
-        self.timeout = (settings.S3_CONNECT_TIMEOUT, settings.S3_READ_TIMEOUT)
+        self.timeout = (settings.STORAGE_CONNECT_TIMEOUT, settings.STORAGE_READ_TIMEOUT)
 
     def __repr__(self):
         return f"<{self.__class__.__name__} gs://{self.bucket}/{self.prefix}> try:{self.try_symbols}"
diff --git a/tecken/ext/s3/storage.py b/tecken/ext/s3/storage.py
index 1e6d929e7..ec5b49c6b 100644
--- a/tecken/ext/s3/storage.py
+++ b/tecken/ext/s3/storage.py
@@ -43,8 +43,8 @@ def _get_client(self):
         if not hasattr(self.clients, "storage"):
             options = {
                 "config": Config(
-                    read_timeout=settings.S3_READ_TIMEOUT,
-                    connect_timeout=settings.S3_CONNECT_TIMEOUT,
+                    read_timeout=settings.STORAGE_READ_TIMEOUT,
+                    connect_timeout=settings.STORAGE_CONNECT_TIMEOUT,
                 )
             }
             if self.endpoint_url:
diff --git a/tecken/settings.py b/tecken/settings.py
index 856a98b2d..cc58dc832 100644
--- a/tecken/settings.py
+++ b/tecken/settings.py
@@ -432,13 +432,13 @@ def filter(self, record):
         },
     }
 
-S3_CONNECT_TIMEOUT = _config(
+STORAGE_CONNECT_TIMEOUT = _config(
     "S3_LOOKUP_CONNECT_TIMEOUT",
     default="5",
     parser=int,
     doc="S3 connection timeout in seconds.",
 )
-S3_READ_TIMEOUT = _config(
+STORAGE_READ_TIMEOUT = _config(
     "S3_LOOKUP_READ_TIMEOUT",
     default="5",
     parser=int,