diff --git a/distribution/src/scripts/profiles/ciphertool.sh b/distribution/src/scripts/profiles/ciphertool.sh
index 74bfee0dba..6d5612c449 100755
--- a/distribution/src/scripts/profiles/ciphertool.sh
+++ b/distribution/src/scripts/profiles/ciphertool.sh
@@ -104,7 +104,7 @@ fi
 
 # update classpath
 CARBON_CLASSPATH=""
-for f in "$CARBON_HOME"/../lib/org.wso2.ciphertool*.jar
+for f in "$CARBON_HOME"/../lib/*.jar
 do
   CARBON_CLASSPATH=$CARBON_CLASSPATH:$f
 done
@@ -119,4 +119,4 @@ if $cygwin; then
 fi
 
 # ----- Execute The Requested Command -----------------------------------------
-$JAVA_HOME/bin/java -Dcarbon.home="$CARBON_HOME" -classpath "$CARBON_CLASSPATH" org.wso2.ciphertool.CipherTool $*
+$JAVA_HOME/bin/java -Dcarbon.home="$CARBON_HOME" -Dcarbon.config.dir.path="$CARBON_HOME"/conf -classpath "$CARBON_CLASSPATH" org.wso2.ciphertool.CipherTool $*