diff --git a/createDockerImage.sh b/createDockerImage.sh
index d5767b9..3b3b58c 100755
--- a/createDockerImage.sh
+++ b/createDockerImage.sh
@@ -5,7 +5,7 @@
 
 
 if [[ $# -lt 1 || $# -gt 2 ]]; then
-    echo "Usage: ./createDockerImage.sh <path/to/bwce-runtime-2.3.1.zip> <Tag>"
+    echo "Usage: ./createDockerImage.sh <path/to/bwce-runtime-2.3.4.zip> <Tag>"
     printf "\t %s \t\t %s \n\t\t\t\t %s \n" "Location of runtime zip (bwce-runtime-<version>.zip)"
     printf "\t %s \t\t %s \n\t\t\t\t %s \n" "Tag. Eg: bwce:v2.0.0"
     exit 1
diff --git a/scripts/setup.sh b/scripts/setup.sh
index 24b0c9c..fa6bd81 100755
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -362,6 +362,20 @@ setupThirdPartyInstallationEnvironment()
 	fi
 }
 
+setupKerberosFiles()
+{
+	BWCE_CONFIG_DIR=`echo $BWCE_HOME/tibco.home/bw*/*`/config
+	if [ -f /krb5.conf ]; then
+		mv $BWCE_CONFIG_DIR/krb5.conf $BWCE_CONFIG_DIR/krb5.conf.orig
+		cp -f /krb5.conf $BWCE_CONFIG_DIR/krb5.conf # User provided profile
+	fi
+
+	if [ -f /login.conf ]; then
+		mv $BWCE_CONFIG_DIR/login.conf $BWCE_CONFIG_DIR/login.conf.orig
+		cp -f /login.conf $BWCE_CONFIG_DIR/login.conf # User provided profile
+	fi
+}
+
 appnodeConfigFile=$BWCE_HOME/tibco.home/bw*/*/config/appnode_config.ini
 POLICY_ENABLED="false"
 checkJAVAHOME
@@ -411,6 +425,9 @@ else
 	cp -f /tmp/META-INF/$BW_PROFILE $BWCE_HOME/tmp/pcf.substvar
 fi
 
+#Setup Kerberos files if they exist
+setupKerberosFiles
+
 $JAVA_HOME/bin/java -cp `echo $BWCE_HOME/tibco.home/bw*/*/system/shared/com.tibco.bwce.profile.resolver_*.jar`:`echo $BWCE_HOME/tibco.home/bw*/*/system/shared/com.tibco.tpcl.com.fasterxml.jackson_*`/*:`echo $BWCE_HOME/tibco.home/bw*/*/system/shared/com.tibco.bw.tpcl.org.codehaus.jettison_*`/*:$BWCE_HOME:$JAVA_HOME/lib -DBWCE_APP_NAME=$bwBundleAppName com.tibco.bwce.profile.resolver.Resolver
 
 STATUS=$?