diff --git a/client/pom.xml b/client/pom.xml
index dccf18d2d4d..a0fe596677e 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -485,14 +485,8 @@
                 </copy>
                 <copy overwrite="true" todir="${basedir}/target/generated-webapp/WEB-INF/classes">
                   <fileset dir="${basedir}/tomcatconf">
-                    <include name="*.in"/>
+                    <exclude name="*.in"/>
                   </fileset>
-                  <globmapper from="*.in" to="*"/>
-                  <filterchain>
-                    <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
-                      <param type="propertiesfile" value="${cs.replace.properties}"/>
-                    </filterreader>
-                  </filterchain>
                 </copy>
                 <copy overwrite="true" todir="${basedir}/target/utilities/bin">
                   <fileset dir="${basedir}/../setup/bindir">
diff --git a/client/tomcatconf/cloudmanagementserver.keystore.in b/client/tomcatconf/cloudmanagementserver.keystore
similarity index 100%
rename from client/tomcatconf/cloudmanagementserver.keystore.in
rename to client/tomcatconf/cloudmanagementserver.keystore