diff --git a/credit-tracker.properties b/credit-tracker.properties
index d294b79..4c3c1be 100644
--- a/credit-tracker.properties
+++ b/credit-tracker.properties
@@ -1,40 +1,40 @@
-server.port=8099
+server.port=${SERVER_PORT:8099}
 
 # datasources
 # indic
 ct.indic-data-source-settings.driver=com.ibm.db2.jcc.DB2Driver
-ct.indic-data-source-settings.url=jdbc:db2://10.230.227.101:2668/cprosd22:currentSchema=INDIC;
-ct.indic-data-source-settings.username=tester
-ct.indic-data-source-settings.password=tester
+ct.indic-data-source-settings.url=${DB_URL_INDIC:jdbc:db2://10.230.227.101:2668/cprosd22:currentSchema=INDIC;}
+ct.indic-data-source-settings.username=${USERNAME_INDIC:tester}
+ct.indic-data-source-settings.password=${PASSWORD_INDIC:tester}
 
 # signal
 ct.signal-data-source-settings.driver=org.postgresql.Driver
-ct.signal-data-source-settings.url=jdbc:postgresql://10.200.200.133:5432/credit_tracker
-ct.signal-data-source-settings.username=credit_tracker_user
-ct.signal-data-source-settings.password=
+ct.signal-data-source-settings.url=${DB_URL_SIGNAL:jdbc:postgresql://10.200.200.133:5432/credit_tracker}
+ct.signal-data-source-settings.username=${USERNAME_SIGNAL:credit_tracker_user}
+ct.signal-data-source-settings.password=${PASSWORD_SIGNAL:-}
 
 # scoring
 ct.scoring-data-source-settings.driver=com.ibm.db2.jcc.DB2Driver
-ct.scoring-data-source-settings.url=jdbc:db2://10.230.227.101:2668/cprosd22:currentSchema=TEST_2_INDIC;
-ct.scoring-data-source-settings.username=tester
-ct.scoring-data-source-settings.password=tester
+ct.scoring-data-source-settings.url=${DB_URL_SCORING:jdbc:db2://10.230.227.101:2668/cprosd22:currentSchema=TEST_2_INDIC;}
+ct.scoring-data-source-settings.username=${USERNAME_SCORING:tester}
+ct.scoring-data-source-settings.password=${PASSWORD_SCORING:tester}
 
-spring.servlet.multipart.max-file-size=2048MB
-spring.servlet.multipart.max-request-size=2048MB
+spring.servlet.multipart.max-file-size=${ACCEPTED_ARCHIVE_SIZE:2048MB}
+spring.servlet.multipart.max-request-size=${ACCEPTED_ARCHIVE_SIZE:2048MB}
 
 # xsd paths
 ct.xsd-validation.monitoring-request-path=monitoring-request.xsd
 ct.xsd-validation.signal-package-path=signal-package.xsd
 
-ct.signals-root-uri=http://10.230.227.102:11094/signalRUalfa/
-ct.signals-token=gttcHxwcGojoAvZK
-ct.signals-user=0001ZZ000001
+ct.signals-root-uri=${SIGNALS_ROOT_URI:http://10.230.227.102:11094/signalRUalfa/}
+ct.signals-token=${SIGNALS_TOKEN:gttcHxwcGojoAvZK}
+ct.signals-user=${SIGNALS_USER:0001ZZ000001}
 
 ct.load-dir=/opt/app/reports
 #ct.load-dir=D:\\folder_name\\signals
 
 # min
-ct.monitoring-interval=15
+ct.monitoring-interval=${MONITORING_INTERVAL:15}
 # days
-ct.update-flags-interval=1
-ct.days-to-update-flags=30
\ No newline at end of file
+ct.update-flags-interval=${UPDATE_FLAGS_INTERVAL:1}
+ct.days-to-update-flags=${DAYS_TO_UPDATE_FLAGS:30}
\ No newline at end of file
diff --git a/docker_compose/credit_tracker_config.env b/docker_compose/credit_tracker_config.env
index ca5bc7e..121cd58 100644
--- a/docker_compose/credit_tracker_config.env
+++ b/docker_compose/credit_tracker_config.env
@@ -1,6 +1,6 @@
 #commons
 APP_VERSION=1.0
-REGISTRY_URL=localhost:5000
+REGISTRY_URL=10.230.238.56:5000
 JMX_PORT=
 JMX_HOSTNAME=
 
@@ -15,38 +15,34 @@ APM_ENVIRONMENT=test
 APM_SERVICE_NODE_NAME=test
 APM_SERVICE_VERSION=test
 
-server.port=8099
+SERVER_PORT=8099
 
 # datasources
 # indic
-ct.indic-data-source-settings.driver=com.ibm.db2.jcc.DB2Driver
-ct.indic-data-source-settings.url=jdbc:db2://10.230.227.101:2668/cprosd22:currentSchema=INDIC;
-ct.indic-data-source-settings.username=tester
-ct.indic-data-source-settings.password=tester
+DB_URL_INDIC=jdbc:db2://10.230.227.101:2668/cprosd22:currentSchema=INDIC;
+USERNAME_INDIC=tester
+PASSWORD_INDIC=tester
 
 # signal
-ct.signal-data-source-settings.driver=org.postgresql.Driver
-ct.signal-data-source-settings.url=jdbc:postgresql://10.200.200.133:5432/credit_tracker
-ct.signal-data-source-settings.username=credit_tracker_user
-ct.signal-data-source-settings.password=
+DB_URL_SIGNAL=jdbc:postgresql://10.200.200.133:5432/credit_tracker
+USERNAME_SIGNAL=credit_tracker_user
+PASSWORD_SIGNAL=
 
 # scoring
-ct.scoring-data-source-settings.driver=com.ibm.db2.jcc.DB2Driver
-ct.scoring-data-source-settings.url=jdbc:db2://10.230.227.101:2668/cprosd22:currentSchema=TEST_2_INDIC;
-ct.scoring-data-source-settings.username=tester
-ct.scoring-data-source-settings.password=tester
+DB_URL_SCORING=jdbc:db2://10.230.227.101:2668/cprosd22:currentSchema=TEST_2_INDIC;
+USERNAME_SCORING=tester
+PASSWORD_SCORING=tester
 
-spring.servlet.multipart.max-file-size=2048MB
-spring.servlet.multipart.max-request-size=2048MB
+ACCEPTED_ARCHIVE_SIZE=2048MB
 
-ct.signals-root-uri=http://10.230.227.102:11094/signalRUalfa/
-ct.signals-token=gttcHxwcGojoAvZK
-ct.signals-user=0001ZZ000001
+SIGNALS_ROOT_URI=http://10.230.227.102:11094/signalRUalfa/
+SIGNALS_TOKEN=gttcHxwcGojoAvZK
+SIGNALS_USER=0001ZZ000001
 
 # min
-ct.monitoring-interval=15
+MONITORING_INTERVAL=15
 # days
-ct.update-flags-interval=1
-ct.days-to-update-flags=30
+UPDATE_FLAGS_INTERVAL=1
+DAYS_TO_UPDATE_FLAGS=30
 
 
diff --git a/docker_compose/docker-compose.yml b/docker_compose/docker-compose.yml
index 9fd1a6d..624274a 100644
--- a/docker_compose/docker-compose.yml
+++ b/docker_compose/docker-compose.yml
@@ -14,4 +14,21 @@ services:
       - APM_SERVICE_NODE_NAME=${APM_SERVICE_NODE_NAME}
       - APM_SERVICE_VERSION=${APP_VERSION}
       - JMX_PORT=${JMX_PORT}
-      - JMX_HOSTNAME="${JMX_HOSTNAME}
\ No newline at end of file
+      - JMX_HOSTNAME=${JMX_HOSTNAME}
+      - SERVER_PORT=${SERVER_PORT}
+      - DB_URL_INDIC=${DB_URL_INDIC}
+      - USERNAME_INDIC=${USERNAME_INDIC}
+      - PASSWORD_INDIC=${PASSWORD_INDIC}
+      - DB_URL_SIGNAL=${DB_URL_SIGNAL}
+      - USERNAME_SIGNAL=${USERNAME_SIGNAL}
+      - PASSWORD_SIGNAL=${PASSWORD_SIGNAL}
+      - DB_URL_SCORING=${DB_URL_SCORING}
+      - USERNAME_SCORING=${USERNAME_SCORING}
+      - PASSWORD_SCORING=${PASSWORD_SCORING}
+      - ACCEPTED_ARCHIVE_SIZE=${ACCEPTED_ARCHIVE_SIZE}
+      - SIGNALS_ROOT_URI=${SIGNALS_ROOT_URI}
+      - SIGNALS_TOKEN=${SIGNALS_TOKEN}
+      - SIGNALS_USER=${SIGNALS_USER}
+      - MONITORING_INTERVAL=${MONITORING_INTERVAL}
+      - UPDATE_FLAGS_INTERVAL=${UPDATE_FLAGS_INTERVAL}
+      - DAYS_TO_UPDATE_FLAGS=${DAYS_TO_UPDATE_FLAGS}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index fecaad9..304601f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,6 +127,30 @@
 	<build>
 		<finalName>credit-tracker</finalName>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<annotationProcessorPaths>
+						<path>
+							<groupId>org.projectlombok</groupId>
+							<artifactId>lombok</artifactId>
+						</path>
+					</annotationProcessorPaths>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+				<configuration>
+					<excludes>
+						<exclude>
+							<groupId>org.projectlombok</groupId>
+							<artifactId>lombok</artifactId>
+						</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>pl.project13.maven</groupId>
 				<artifactId>git-commit-id-plugin</artifactId>
@@ -157,30 +181,6 @@
 					</includeOnlyProperties>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<annotationProcessorPaths>
-						<path>
-							<groupId>org.projectlombok</groupId>
-							<artifactId>lombok</artifactId>
-						</path>
-					</annotationProcessorPaths>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-				<configuration>
-					<excludes>
-						<exclude>
-							<groupId>org.projectlombok</groupId>
-							<artifactId>lombok</artifactId>
-						</exclude>
-					</excludes>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>io.fabric8</groupId>
 				<artifactId>docker-maven-plugin</artifactId>