diff --git a/pom.xml b/pom.xml
index 2d0d9fb..186ddfe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,9 +11,9 @@
 	</parent>
 	<groupId>com.iemr.ecd</groupId>
 	<artifactId>ecd-api</artifactId>
-	<version>0.0.1</version>
+	<version>3.1.0</version>
 	<packaging>war</packaging>
-	<name>ecd-api</name>
+	<name>ECD-API</name>
 	<description>ECD project</description>
 	<properties>
 		<environment>${ENV_VAR}</environment>
@@ -249,7 +249,7 @@
 
 
 	<build>
-		<finalName>ecdapi-v3.0.0</finalName>
+		<finalName>${artifactId}-${version}</finalName>
 		<plugins>
 
 			<plugin>
@@ -336,6 +336,20 @@
 							</target>
 						</configuration>
 					</execution>
+					<execution>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<id>clean-property-files</id>
+						<configuration>
+							<target>
+								<delete>
+									<file file="${source-properties}" />
+								</delete>
+							</target>
+						</configuration>
+					</execution>
 				</executions>
 			</plugin>
 
diff --git a/src/main/environment/ecd_ci.properties b/src/main/environment/ecd_ci.properties
index 9df17e4..fff95bb 100644
--- a/src/main/environment/ecd_ci.properties
+++ b/src/main/environment/ecd_ci.properties
@@ -22,6 +22,7 @@ beneficiaryEditUrl =@env.COMMON_API@/beneficiary/update
 
 
 #ELK logging file name
+logging.path=logs/
 logging.file.name=@env.ECD_API_LOGGING_FILE_NAME@
 
 
diff --git a/src/main/environment/ecd_dev.properties b/src/main/environment/ecd_dev.properties
deleted file mode 100644
index 779e08f..0000000
--- a/src/main/environment/ecd_dev.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-## Primary db
-spring.datasource.username=<Enter your AMRIT DB_IEMR username>
-spring.datasource.password=<Enter your AMRIT DB_IEMR password>
-spring.datasource.url=<Enter AMRIT DB_IEMR URL here>
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-
-## Secondary db
-secondary.datasource.username=<Enter your AMRIT secondary DB_REPORTING username>
-secondary.datasource.password=<Enter your AMRIT secondary DB_REPORTING password>
-secondary.datasource.url=<Enter AMRIT secondary DB_REPORTING URL here>
-secondary.datasource.driver-class-name=com.mysql.jdbc.Driver
-
-##Beneficiary Registration Url
-registerBeneficiaryUrl=<Enter your socket address here>/commonapi-v1.0/beneficiary/create
-
-##Beneficiary Edit Url
-beneficiaryEditUrl =<Enter your socket address here>/commonapi-v1.0/beneficiary/update
-
-jwt.secret=
-
-
-springdoc.api-docs.enabled=true
-springdoc.swagger-ui.enabled=true
-
diff --git a/src/main/environment/ecd_example.properties b/src/main/environment/ecd_example.properties
index dd037f5..a09c459 100644
--- a/src/main/environment/ecd_example.properties
+++ b/src/main/environment/ecd_example.properties
@@ -20,3 +20,7 @@ beneficiaryEditUrl =https:localhost:8083/beneficiary/update
 springdoc.api-docs.enabled=true
 springdoc.swagger-ui.enabled=true
 
+jwt.secret=my-32-character-ultra-secure-and-ultra-long-secret
+#If both properties are set, only logging.file.name takes effect.
+logging.path=logs/
+logging.file.name=logs/ecd-api.log
\ No newline at end of file
diff --git a/src/main/environment/ecd_test.properties b/src/main/environment/ecd_test.properties
deleted file mode 100644
index 779e08f..0000000
--- a/src/main/environment/ecd_test.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-## Primary db
-spring.datasource.username=<Enter your AMRIT DB_IEMR username>
-spring.datasource.password=<Enter your AMRIT DB_IEMR password>
-spring.datasource.url=<Enter AMRIT DB_IEMR URL here>
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-
-## Secondary db
-secondary.datasource.username=<Enter your AMRIT secondary DB_REPORTING username>
-secondary.datasource.password=<Enter your AMRIT secondary DB_REPORTING password>
-secondary.datasource.url=<Enter AMRIT secondary DB_REPORTING URL here>
-secondary.datasource.driver-class-name=com.mysql.jdbc.Driver
-
-##Beneficiary Registration Url
-registerBeneficiaryUrl=<Enter your socket address here>/commonapi-v1.0/beneficiary/create
-
-##Beneficiary Edit Url
-beneficiaryEditUrl =<Enter your socket address here>/commonapi-v1.0/beneficiary/update
-
-jwt.secret=
-
-
-springdoc.api-docs.enabled=true
-springdoc.swagger-ui.enabled=true
-
diff --git a/src/main/environment/ecd_uat.properties b/src/main/environment/ecd_uat.properties
deleted file mode 100644
index b00f99b..0000000
--- a/src/main/environment/ecd_uat.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-## Primary db
-spring.datasource.username=<Enter your AMRIT DB_IEMR username>
-spring.datasource.password=<Enter your AMRIT DB_IEMR password>
-spring.datasource.url=<Enter AMRIT DB_IEMR URL here>
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-
-## Secondary db
-secondary.datasource.username=<Enter your AMRIT secondary DB_REPORTING username>
-secondary.datasource.password=<Enter your AMRIT secondary DB_REPORTING password>
-secondary.datasource.url=<Enter AMRIT secondary DB_REPORTING URL here>
-secondary.datasource.driver-class-name=com.mysql.jdbc.Driver
-
-##Beneficiary Registration Url
-registerBeneficiaryUrl=<Enter your socket address here>/commonapi-v1.0/beneficiary/create
-
-##Beneficiary Edit Url
-beneficiaryEditUrl =<Enter your socket address here>/commonapi-v1.0/beneficiary/update
-
-jwt.secret=
-
-
-springdoc.api-docs.enabled=true
-springdoc.swagger-ui.enabled=true
-
-
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 6f71da6..64ee941 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -32,10 +32,6 @@ logging.level.web=INFO
 logging.level.org.springframework.web=INFO
 logging.level.org.hibernate=INFO
 
-#If both properties are set, only logging.file.name takes effect.
-logging.path=logs/
-logging.file.name=logs/ecd-api.log
-
 ## multipart file size
 spring.http.multipart.max-request-size=10MB
 spring.http.multipart.max-file-size=10MB
diff --git a/src/main/webapp/WEB-INF/jboss-web.xml b/src/main/webapp/WEB-INF/jboss-web.xml
new file mode 100644
index 0000000..e95a65a
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jboss-web.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-web>
+    <context-root>/ecd-api</context-root>
+</jboss-web>