diff --git a/modules/distribution/src/core/conf/security/Owasp.CsrfGuard.Carbon.properties b/modules/distribution/src/core/conf/security/Owasp.CsrfGuard.Carbon.properties
index 78c42b0b..d730d644 100644
--- a/modules/distribution/src/core/conf/security/Owasp.CsrfGuard.Carbon.properties
+++ b/modules/distribution/src/core/conf/security/Owasp.CsrfGuard.Carbon.properties
@@ -477,6 +477,7 @@ org.owasp.csrfguard.unprotected.socialApis=%servletContext%/social/apis/*
 org.owasp.csrfguard.unprotected.appStoreDevices=%servletContext%/store/apps/devices/*
 org.owasp.csrfguard.unprotected.appStoreApis=%servletContext%/store/apis/*
 org.owasp.csrfguard.unprotected.appPortalClient=%servletContext%/portal/apis/*
+org.owasp.csrfguard.unprotected.connectedcupAgent=%servletContext%/connected-cup-agent/*
 
 #carbon
 org.owasp.csrfguard.unprotected.Services=%servletContext%/services/*
diff --git a/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleInstallationTest.java b/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleInstallationTest.java
index 1368e0b1..4aa77954 100644
--- a/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleInstallationTest.java
+++ b/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleInstallationTest.java
@@ -108,13 +108,13 @@ public class SampleInstallationTest extends IOTIntegrationUIBaseTestCase {
 
         log.info("CARBON_HOME: " + System.getProperty(Constants.CARBON_HOME));
         File dir = new File(carbonHome);
-        log.info("Sample installation started : mvn clean install -f device-deployer.xml");
+        log.info("Sample installation started : mvn clean install -f device-plugins-deployer.xml");
         try {
             if (System.getProperty(Constants.OS_NAME).toLowerCase().contains("windows")) {
-                commands = new String[]{"cmd.exe", "/c", "mvn clean install -f device-deployer.xml"};
+                commands = new String[]{"cmd.exe", "/c", "mvn clean install -f device-plugins-deployer.xml"};
                 tempProcess = Runtime.getRuntime().exec(commands, null, dir);
             } else {
-                commands = new String[]{"mvn", "clean", "install", "-f", "device-deployer.xml"};
+                commands = new String[]{"mvn", "clean", "install", "-f", "device-plugins-deployer.xml"};
                 tempProcess = Runtime.getRuntime().exec(commands, null, dir);
             }
             boolean buildStatus = waitForMessage(tempProcess.getInputStream(), Constants.BUILD_SUCCESS_MSG);