diff --git a/.env b/.env
index 94a12f6..83a329c 100644
--- a/.env
+++ b/.env
@@ -112,14 +112,11 @@ APP_UNDERSUBSCRIPTION_SURCHARGE_40_CHF=2.5
 # Use 'O' during beta phase, switch to 'F' for production
 DEFAULT_BOOKING_STATUS=F
 
-XML_EXPORT_PATH="%kernel.project_dir%/var/xmlexport"
-JSON_EXPORT_PATH="%kernel.project_dir%/var/jsonexport"
-
-SFTP_XML_EXPORT_HOST=
-SFTP_XML_EXPORT_PORT=
-SFTP_XML_EXPORT_USER=
-SFTP_XML_EXPORT_PASSWORD=
-SFTP_XML_EXPORT_ROOT=
+SFTP_XML_SOURCE_HOST=
+SFTP_XML_SOURCE_PORT=
+SFTP_XML_SOURCE_USER=
+SFTP_XML_SOURCE_PASSWORD=
+SFTP_XML_SOURCE_ROOT=
 
 ###> league/oauth2-server-bundle ###
 OAUTH_PRIVATE_KEY=%kernel.project_dir%/config/secret/private.key
diff --git a/config/packages/flysystem.yaml b/config/packages/flysystem.yaml
index cd1ede7..46bc67c 100644
--- a/config/packages/flysystem.yaml
+++ b/config/packages/flysystem.yaml
@@ -2,17 +2,17 @@ flysystem:
     storages:
         xml_export.storage:
             local:
-                directory: '%env(resolve:XML_EXPORT_PATH)%'
+                directory: '%kernel.project_dir%/var/xmlexport'
         xml_source.storage:
             sftp:
-                host: '%env(SFTP_XML_EXPORT_HOST)%'
-                port: '%env(int:SFTP_XML_EXPORT_PORT)%'
-                username: '%env(SFTP_XML_EXPORT_USER)%'
-                password: '%env(SFTP_XML_EXPORT_PASSWORD)%'
-                root: '%env(SFTP_XML_EXPORT_ROOT)%'
+                host: '%env(SFTP_XML_SOURCE_HOST)%'
+                port: '%env(int:SFTP_XML_SOURCE_PORT)%'
+                username: '%env(SFTP_XML_SOURCE_USER)%'
+                password: '%env(SFTP_XML_SOURCE_PASSWORD)%'
+                root: '%env(SFTP_XML_SOURCE_ROOT)%'
         xml_dump.storage:
             local:
                 directory: '%kernel.project_dir%/var/bpn'
         json_export.storage:
             local:
-                directory: '%env(resolve:JSON_EXPORT_PATH)%'
+                directory: '%kernel.project_dir%/var/jsonexport'