diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
index 2efab4a..72e5557 100644
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -17,19 +17,19 @@
 # =========================================================
 # Orchestrator general Configuration
 # =========================================================
-spring.cloud.gcp.project-id=bnt-orquestador-cognitivo-dev
+spring.cloud.gcp.project-id=${GCP_PROJECT_ID}
 # =========================================================
 # Google Firestore Configuration
 # =========================================================
-spring.cloud.gcp.firestore.project-id=bnt-orquestador-cognitivo-dev
-spring.cloud.gcp.firestore.database-id=bnt-orquestador-cognitivo-firestore-bdo-dev
-spring.cloud.gcp.firestore.host=firestore.googleapis.com
-spring.cloud.gcp.firestore.port=443
+spring.cloud.gcp.firestore.project-id=${GCP_PROJECT_ID}
+spring.cloud.gcp.firestore.database-id=${GCP_FIRESTORE_DATABASE_ID}
+spring.cloud.gcp.firestore.host=${GCP_FIRESTORE_HOST}
+spring.cloud.gcp.firestore.port=${GCP_FIRESTORE_PORT}
 # =========================================================
 # Google Memorystore(Redis) Configuration
 # =========================================================
-spring.data.redis.host=10.33.22.4
-spring.data.redis.port=6379
+spring.data.redis.host=${REDIS_HOST}
+spring.data.redis.port=${REDIS_PORT}
 spring.redis.jedis.pool.enabled=true
 spring.redis.notify-keyspace-events=Ex
 #spring.data.redis.password=23cb4c76-9d96-4c74-b8c0-778fb364877a
@@ -42,23 +42,23 @@ spring.redis.notify-keyspace-events=Ex
 # =========================================================
 # Google Conversational Agents Configuration
 # =========================================================
-dialogflow.cx.project-id=bnt-orquestador-cognitivo-dev
-dialogflow.cx.location=us-central1
-dialogflow.cx.agent-id=5590ff1d-1f66-4777-93f5-1a608f1900ac
-dialogflow.default-language-code=es
+dialogflow.cx.project-id=${DIALOGFLOW_CX_PROJECT_ID}
+dialogflow.cx.location=${DIALOGFLOW_CX_LOCATION}
+dialogflow.cx.agent-id=${DIALOGFLOW_CX_AGENT_ID}
+dialogflow.default-language-code=${DIALOGFLOW_DEFAULT_LANGUAGE_CODE}
 # =========================================================
 # Google Generative AI (Gemini) Configuration
 # =========================================================
-google.cloud.project=bnt-orquestador-cognitivo-dev
-google.cloud.location=us-central1
-gemini.model.name=gemini-2.0-flash-001
+google.cloud.project=${GCP_PROJECT_ID}
+google.cloud.location=${GCP_LOCATION}
+gemini.model.name=${GEMINI_MODEL_NAME}
 # =========================================================
 # (Gemini) MessageFilter Configuration
 # =========================================================
-messagefilter.geminimodel=gemini-2.0-flash-001
-messagefilter.temperature=0.1f
-messagefilter.maxOutputTokens=800
-messagefilter.topP= 0.1f
+messagefilter.geminimodel=${MESSAGE_FILTER_GEMINI_MODEL}
+messagefilter.temperature=${MESSAGE_FILTER_TEMPERATURE}
+messagefilter.maxOutputTokens=${MESSAGE_FILTER_MAX_OUTPUT_TOKENS}
+messagefilter.topP=${MESSAGE_FILTER_TOP_P}
 messagefilter.prompt=prompts/message_filter_prompt.txt
 # =========================================================
 # (DLP) Configuration
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index cbb42d2..9b000d5 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1 +1 @@
-spring.profiles.active=dev
+spring.profiles.active=${SPRING_PROFILE}