diff --git a/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/java/org/apache/airavata/datalake/orchestrator/handlers/async/OrchestratorEventProcessor.java b/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/java/org/apache/airavata/datalake/orchestrator/handlers/async/OrchestratorEventProcessor.java
index f6a4e49..2519b8b 100644
--- a/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/java/org/apache/airavata/datalake/orchestrator/handlers/async/OrchestratorEventProcessor.java
+++ b/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/java/org/apache/airavata/datalake/orchestrator/handlers/async/OrchestratorEventProcessor.java
@@ -342,11 +342,11 @@
         switch (sourceSP.getStorageCase()) {
             case SSH_STORAGE_PREFERENCE:
                 resourceMetadataReq.setResourceType("SCP");
-                resourceMetadataReq.setResourceToken(sourceSP.getSshStoragePreference().getStoragePreferenceId());
+                resourceMetadataReq.setResourceToken(sourceSP.getSshStoragePreference().getCredentialToken());
                 break;
             case S3_STORAGE_PREFERENCE:
                 resourceMetadataReq.setResourceType("S3");
-                resourceMetadataReq.setResourceToken(sourceSP.getS3StoragePreference().getStoragePreferenceId());
+                resourceMetadataReq.setResourceToken(sourceSP.getS3StoragePreference().getCredentialToken());
                 break;
         }