diff --git a/src/main/resources/application-production.properties b/src/main/resources/application-production.properties
index 4850490..96ba547 100644
--- a/src/main/resources/application-production.properties
+++ b/src/main/resources/application-production.properties
@@ -13,5 +13,6 @@ spring.jpa.show-sql=false
 spring.jpa.properties.hibernate.format_sql=false
 spring.flyway.locations=classpath:db/migration/{vendor}
 spring.flyway.baseline-on-migrate=true
+spring.flyway.default-schema=${FLYWAY_DEFAULT_SCHEMA}
 # Application properties
 app.security.jwt.secret=${APP_SECURITY_JWT_SECRET}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index b51b978..22c2a25 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -16,7 +16,7 @@ spring.jpa.hibernate.ddl-auto=validate
 spring.jpa.show-sql=true
 spring.jpa.properties.hibernate.format_sql=true
 spring.flyway.locations=classpath:db/migration/{vendor},classpath:dev/db/migration/{vendor}
-spring.flyway.default-schema=despensa_app
+spring.flyway.default-schema=${FLYWAY_DEFAULT_SCHEMA:despensa_app}
 # Springdoc - OpenAPI specification properties
 springdoc.api-docs.path=/api-docs
 springdoc.default-produces-media-type=application/json