diff --git a/transfer_service/import_amqp_server.py b/transfer_service/import_amqp_server.py
index 935e8019a5c7c15af5d3f5fcf555b4a437c463cd..f0ebe7383ad71a4ed6489e66a1bd34521234adcf 100644
--- a/transfer_service/import_amqp_server.py
+++ b/transfer_service/import_amqp_server.py
@@ -26,7 +26,7 @@ class ImportAMQPServer(AMQPServer):
         self.tapeClient = TapeClient(self.params["host"],
                                      self.params.getint("port"),
                                      self.params["user"],
-                                     self.params["password"])
+                                     self.params["pkey_file_path"])
         self.systemUtils = SystemUtils()
         self.path = None
         self.username = None
diff --git a/transfer_service/retrieve_executor.py b/transfer_service/retrieve_executor.py
index e9f4f265278c30b114d14f594b7905716dd1ad24..eae069c3fe2ecd7d8c90e93cfef76f14e21cf528 100644
--- a/transfer_service/retrieve_executor.py
+++ b/transfer_service/retrieve_executor.py
@@ -16,7 +16,7 @@ class RetrieveExecutor(TaskExecutor):
         self.tapeClient = TapeClient(self.params["host"],
                                      self.params.getint("port"),
                                      self.params["user"],
-                                     self.params["password"])
+                                     self.params["pkey_file_path"])
         self.params = config.loadSection("transfer_node")
         self.storageRetrievePath = self.params["retrieve_path"]
         self.params = config.loadSection("file_catalog")
diff --git a/transfer_service/store_executor.py b/transfer_service/store_executor.py
index 11d1324c6346ac87a27199aa09661df7db6a8b97..72b3285e70372594eed7e6b09a0f0153e29f0f3b 100644
--- a/transfer_service/store_executor.py
+++ b/transfer_service/store_executor.py
@@ -18,7 +18,7 @@ class StoreExecutor(TaskExecutor):
         self.tapeClient = TapeClient(self.params["host"],
                                      self.params.getint("port"),
                                      self.params["user"],
-                                     self.params["password"])
+                                     self.params["pkey_file_path"])
         self.params = config.loadSection("transfer_node")
         self.storageStorePath = self.params["store_path"]
         self.params = config.loadSection("file_catalog")
diff --git a/transfer_service/tape_client.py b/transfer_service/tape_client.py
index 14c7776175790ae88ad220218480e9c4faf3dbed..ceb2876b5edf4f92017b35bd12f27dc6c9793b42 100644
--- a/transfer_service/tape_client.py
+++ b/transfer_service/tape_client.py
@@ -5,20 +5,16 @@ import scp
 import sys
 import uuid
 
-from config import Config
 from tape_task import TapeTask
 
 
 class TapeClient(object):
 
     # Constructor
-    def __init__(self):
-        config = Config("vos_ts.conf")
-        self.params = config.loadSection("spectrum_archive")
-        self.host = self.params["host"]
-        self.port = self.params.getint("port")
-        self.user = self.params["user"]
-        self.keyFile = self.params["pkey_file_path"]
+    def __init__(self, host, port, user, keyFile):
+        self.host = host
+        self.port = port
+        self.user = user
         self.key = paramiko.RSAKey.from_private_key_file(keyFile)
         self.client = paramiko.SSHClient()
         self.client.set_missing_host_key_policy(paramiko.AutoAddPolicy())