diff --git a/eive_tmtc/pus_tc/tc_handler.py b/eive_tmtc/pus_tc/tc_handler.py
index f84ad4e..8ebc652 100644
--- a/eive_tmtc/pus_tc/tc_handler.py
+++ b/eive_tmtc/pus_tc/tc_handler.py
@@ -20,10 +20,7 @@ from tmtccmd.tc import (
     SendCbParams,
     TcQueueEntryType,
 )
-from tmtccmd.config.cfdp import (
-    cfdp_req_to_put_req_proxy_get_req,
-    cfdp_req_to_put_req_regular,
-)
+from tmtccmd.config.cfdp import generic_cfdp_params_to_put_request
 from spacepackets.ecss import PusVerificator
 from tmtccmd.util import FileSeqCountProvider
 from spacepackets.cfdp import PduHolder, DirectiveType
@@ -117,16 +114,13 @@ class TcHandler(TcHandlerBase):
             ):
                 put_req_cfg_wrapper = cfdp_procedure.request_wrapper.to_put_request()
                 if put_req_cfg_wrapper.cfg.proxy_op:
-                    put_req = cfdp_req_to_put_req_proxy_get_req(
-                        put_req_cfg_wrapper.cfg,
-                        CFDP_LOCAL_ENTITY_ID,
-                        CFDP_REMOTE_ENTITY_ID,
-                    )
                     self.proxy_op = True
-                else:
-                    put_req = cfdp_req_to_put_req_regular(
-                        put_req_cfg_wrapper.cfg, CFDP_REMOTE_ENTITY_ID
-                    )
+                put_req = generic_cfdp_params_to_put_request(
+                    params=put_req_cfg_wrapper.cfg,
+                    local_id=CFDP_LOCAL_ENTITY_ID,
+                    remote_id=CFDP_REMOTE_ENTITY_ID,
+                    dest_id_proxy_put_req=CFDP_LOCAL_ENTITY_ID,
+                )
                 _LOGGER.info(
                     f"CFDP: Starting file put request with parameters:\n{put_req}"
                 )