diff --git a/pom.xml b/pom.xml
index 8396715..b327141 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,10 +5,10 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.iemr.common</groupId>
-	<artifactId>Common</artifactId>
-	<version>1.0-SNAPSHOT</version>
+	<artifactId>helpline-104-api</artifactId>
+	<version>3.1.0</version>
 	<packaging>war</packaging>
-	<name>Piramal-Helpline-104-API</name>
+	<name>Helpline-104-API</name>
 	<description>Piramal Helpline 104 API</description>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
@@ -254,7 +254,7 @@
 	</dependencies>
 
 	<build>
-		<finalName>104api-v3.0.0</finalName>
+		<finalName>${artifactId}-${version}</finalName>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
diff --git a/src/main/environment/104_ci.properties b/src/main/environment/104_ci.properties
index e7c1233..2443c86 100644
--- a/src/main/environment/104_ci.properties
+++ b/src/main/environment/104_ci.properties
@@ -18,7 +18,11 @@ common-url=@env.COMMON_API_BASE_URL@
 spring.redis.host=localhost
 
 #ELK logging file name
+logging.path=logs/
 logging.file.name=@env.HELPLINE104_API_LOGGING_FILE_NAME@
 jwt.secret=@env.JWT_SECRET_KEY@
 springdoc.api-docs.enabled=@env.SWAGGER_DOC_ENABLED@
 springdoc.swagger-ui.enabled=@env.SWAGGER_DOC_ENABLED@
+
+sendSMSUrl= @env.COMMON_API_BASE_URL@sms/sendSMS
+sendEmailGeneralUrl = @env.COMMON_API_BASE_URL@emailController/sendEmailGeneral
diff --git a/src/main/environment/104_dev.properties b/src/main/environment/104_dev.properties
deleted file mode 100644
index 308886a..0000000
--- a/src/main/environment/104_dev.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-
-# dev env 
-# DB Connections 
-spring.datasource.url=<Enter AMRIT DB_IEMR URL here>
-spring.datasource.username=<Enter your AMRIT DB_IEMR username>
-spring.datasource.password=<Enter your AMRIT DB_IEMR password>
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-
-#DB Connections - Secondary
-secondary.datasource.username=<Enter your AMRIT DB_REPORTING username>
-secondary.datasource.password=<Enter your AMRIT DB_REPORTING password>
-secondary.datasource.url=<Enter AMRIT DB_REPORTING URL here>
-secondary.datasource.driver-class-name=com.mysql.jdbc.Driver
-
-# Common Config
-common-url=<Enter your socket address here>/commonapi-v1.0
-
-### Redis IP
-spring.redis.host=localhost
-jwt.secret=
diff --git a/src/main/environment/104_example.properties b/src/main/environment/104_example.properties
index d1fb345..a86b2c7 100644
--- a/src/main/environment/104_example.properties
+++ b/src/main/environment/104_example.properties
@@ -12,8 +12,13 @@ secondary.datasource.url=<Enter AMRIT DB_REPORTING URL here>
 secondary.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 # Common Config
-common-url=http://localhost:8080/commonapi-v1.0
+common-url=http://localhost:8080
+sendSMSUrl= http://localhost:8080/sms/sendSMS
+sendEmailGeneralUrl = http://localhost:8080/emailController/sendEmailGeneral
 
 ### Redis IP
 spring.redis.host=localhost
-jwt.secret=
+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/helpline104-api.log
\ No newline at end of file
diff --git a/src/main/environment/104_test.properties b/src/main/environment/104_test.properties
deleted file mode 100644
index 82c660c..0000000
--- a/src/main/environment/104_test.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-# test env 
-spring.jpa.database=default
-# DB Connections - Primary
-spring.datasource.url=<Enter AMRIT DB_IEMR URL here>
-spring.datasource.username=<Enter your AMRIT DB_IEMR username>
-spring.datasource.password=<Enter your AMRIT DB_IEMR password>
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-
-#DB Connections - Secondary
-secondary.datasource.username=<Enter your AMRIT DB_REPORTING username>
-secondary.datasource.password=<Enter your AMRIT DB_REPORTING password>
-secondary.datasource.url=<Enter AMRIT DB_REPORTING URL here>
-secondary.datasource.driver-class-name=com.mysql.jdbc.Driver
-
-# Common Config
-common-url=<Enter your socket address here>/commonapi-v1.0
-
-### Redis IP
-spring.redis.host=localhost
-jwt.secret=
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/main/environment/104_uat.properties b/src/main/environment/104_uat.properties
deleted file mode 100644
index daf1885..0000000
--- a/src/main/environment/104_uat.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-# UAT env 
-# DB Connections 
-spring.datasource.url=<Enter AMRIT DB_IEMR URL here>
-spring.datasource.username=<Enter your AMRIT DB_IEMR username>
-spring.datasource.password=<Enter your AMRIT DB_IEMR password>
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-
-#DB Connections - Secondary
-secondary.datasource.username=<Enter your AMRIT DB_REPORTING username>
-secondary.datasource.password=<Enter your AMRIT DB_REPORTING password>
-secondary.datasource.url=<Enter AMRIT DB_REPORTING URL here>
-secondary.datasource.driver-class-name=com.mysql.jdbc.Driver
-
-# Common Config
-common-url=<Enter your socket address here>/commonapi-v1.0
-
-### Redis IP
-spring.redis.host=localhost
-jwt.secret=
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 1be932e..2bb31ad 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -45,9 +45,6 @@ logging.level.org.hibernate=INFO
 logging.level.com.iemr=DEBUG
 logging.level.org.springframework=INFO
 
-logging.path=logs/
-logging.file.name=logs/helpline104-api.log
-
 ##sms details for IMR MMR
 IMRMMRSmsTemplate= IMR MMR SMS
 sendSMSUrl= <Enter your socket address here>/commonapi-v1.0/sms/sendSMS
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..4bd562a
--- /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>/104-api</context-root>
+</jboss-web>