diff --git a/.gitignore b/.gitignore
index a1ecf03..ad3ba30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@ target/
 #configs
 config.service.ts
 config.json
-*.properties
 
 #other
 .springBeans
@@ -13,6 +12,7 @@ hs_err_pid7608.log
 .classpath
 /.sts4-cache
 /logs
+.idea
 
 # Properties
-src/main/environment/104_test.properties
\ No newline at end of file
+src/main/environment/104_local.properties
diff --git a/.java-version b/.java-version
new file mode 100644
index 0000000..6259340
--- /dev/null
+++ b/.java-version
@@ -0,0 +1 @@
+1.8
diff --git a/pom.xml b/pom.xml
index 9491f22..0a2bddc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 		<final-name>104api-v1.0</final-name>
 		<environment>${ENV_VAR}</environment>
 		<target-properties>target/classes/application.properties</target-properties>
-		<source-properties>src/main/environment/104_${environment}.properties</source-properties>
+		<source-properties>target/classes/104_${environment}.properties</source-properties>
 	</properties>
 
 	<dependencies>
@@ -250,31 +250,69 @@
 			</plugin>
 
 			<plugin>
-
-
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>filter-resources</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>resources</goal>
+						</goals>
+						<configuration>
+							<delimiters>@</delimiters>
+							<useDefaultDelimiters>false</useDefaultDelimiters>
+							<resources>
+								<resource>
+									<directory>src/main/environment</directory>
+									<filtering>true</filtering>
+									<includes>
+										<include>104_${environment}.properties</include>
+									</includes>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.8</version>
-
 				<executions>
 					<execution>
 						<phase>process-resources</phase>
 						<goals>
 							<goal>run</goal>
 						</goals>
-						<id>properties-updated</id>
+						<id>merge-properties</id>
 						<configuration>
 							<target>
-								<echo>concatinating properties file ${target-properties} and
-									${source-properties}</echo>
+								<echo>
+									concatenating properties file ${target-properties} and
+									${source-properties}
+								</echo>
 								<concat destfile="${target-properties}" append="yes"
-									force="yes">
+										force="yes">
 									<fileset file="${source-properties}">
 									</fileset>
 								</concat>
 							</target>
 						</configuration>
 					</execution>
+					<execution>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<id>clean-property-files</id>
+						<configuration>
+							<tasks>
+								<delete>
+									<file file="${source-properties}"/>
+								</delete>
+							</tasks>
+						</configuration>
+					</execution>
 				</executions>
 			</plugin>
 			<plugin>
@@ -309,7 +347,7 @@
 			<properties>
 				<final-name>104api-v1.0</final-name>
 				<target-properties>target/classes/application.properties</target-properties>
-				<source-properties>src/main/environment/104_${environment}.properties</source-properties>
+				<source-properties>target/classes/104_${environment}.properties</source-properties>
 			</properties>
 			<build>
 				<finalName>104api-v1.0</finalName>
diff --git a/src/main/environment/104_ci.properties b/src/main/environment/104_ci.properties
new file mode 100644
index 0000000..1994aab
--- /dev/null
+++ b/src/main/environment/104_ci.properties
@@ -0,0 +1,19 @@
+# local env 
+# DB Connections
+## Primary db
+spring.datasource.url=@env.DATABASE_URL@
+spring.datasource.username=@env.DATABASE_USERNAME@
+spring.datasource.password=@env.DATABASE_PASSWORD@
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+
+secondary.datasource.username=@env.REPORTING_DATABASE_USERNAME@
+secondary.datasource.password=@env.REPORTING_DATABASE_PASSWORD@
+secondary.datasource.url=@env.REPORTING_DATABASE_URL@
+secondary.datasource.driver-class-name=com.mysql.jdbc.Driver
+
+# Common Config
+common-url=@env.COMMON_API_BASE_URL@
+
+### Redis IP
+spring.redis.host=localhost
+
diff --git a/src/main/environment/104_local.properties b/src/main/environment/104_example.properties
similarity index 100%
rename from src/main/environment/104_local.properties
rename to src/main/environment/104_example.properties
diff --git a/src/main/environment/104_uat.propertie b/src/main/environment/104_uat.properties
similarity index 100%
rename from src/main/environment/104_uat.propertie
rename to src/main/environment/104_uat.properties