diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index de465ffa..89bf6873 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -12,6 +12,9 @@ Added: Users can specify a GroupName tag for each submission. This tag will be a
 ### dds-topology
 Added: A new groupName requirement. It can be used on task and collection. (GH-407)   
 
+### dds-ssh-plugin
+Fixed: ssh cfg parser is passing cfg files of all plug-ins. (GH-413)    
+
 ## v3.6 (2022-01-11)
 
 ### DDS common
diff --git a/dds-commander/src/ConnectionManager.cpp b/dds-commander/src/ConnectionManager.cpp
index 86fefc1e..f8a95099 100644
--- a/dds-commander/src/ConnectionManager.cpp
+++ b/dds-commander/src/ConnectionManager.cpp
@@ -1000,8 +1000,9 @@ void CConnectionManager::submitAgents(const dds::tools_api::SSubmitRequestData&
 
         // Create / re-pack WN package
         // Include inline script if present
+        // Only the ssh plug-in supports it.
         string inlineShellScripCmds;
-        if (!_submitInfo.m_config.empty())
+        if (_submitInfo.m_rms == "ssh" && !_submitInfo.m_config.empty())
         {
             inlineShellScripCmds = CSSHConfigFile(_submitInfo.m_config).getBash();
             LOG(info)