diff --git a/pyinfra/config.py b/pyinfra/config.py
index 0afb57c..fe2d72e 100644
--- a/pyinfra/config.py
+++ b/pyinfra/config.py
@@ -93,8 +93,8 @@ class Config:
         self.allowed_compression_types = ["gz"]
 
         # config for x-tenant-endpoint to receive storage connection information per tenant
-        self.persistence_service_public_key = "redaction"
-        self.persistence_service_tenant_endpoint = "http://persistence-service-v1:8080/internal-api/tenants"
+        self.tenant_decryption_public_key = read_from_environment("TENANT_PUBLIC_KEY", "redaction")
+        self.tenant_endpoint = read_from_environment("TENANT_ENDPOINT", "http://tenant-user-management:8081/internal-api/tenants")
 
         # Value to see if we should write a consumer token to a file
         self.write_consumer_token = read_from_environment("WRITE_CONSUMER_TOKEN", "False")
diff --git a/pyinfra/payload_processing/processor.py b/pyinfra/payload_processing/processor.py
index 37f31a1..e4359f9 100644
--- a/pyinfra/payload_processing/processor.py
+++ b/pyinfra/payload_processing/processor.py
@@ -113,8 +113,8 @@ def make_payload_processor(data_processor: Callable, config: Config = None) -> P
     default_storage_info: StorageInfo = get_storage_info_from_config(config)
     get_storage_info_from_tenant_id = partial(
         get_storage_info_from_endpoint,
-        config.persistence_service_public_key,
-        config.persistence_service_tenant_endpoint,
+        config.tenant_decryption_public_key,
+        config.tenant_endpoint,
     )
     monitor = get_monitor_from_config(config)
     payload_parser: QueueMessagePayloadParser = get_queue_message_payload_parser(config)
diff --git a/pyproject.toml b/pyproject.toml
index 4409313..f4f3a7d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyinfra"
-version = "1.5.7"
+version = "1.5.8"
 description = ""
 authors = ["Francisco Schulz <francisco.schulz@iqser.com>"]
 license = "All rights reseverd"