diff --git a/api/src/pool.rs b/api/src/pool.rs
index 539259c..ab4c715 100644
--- a/api/src/pool.rs
+++ b/api/src/pool.rs
@@ -32,7 +32,7 @@ impl sea_orm_rocket::Pool for SeaOrmPool {
     async fn init(_figment: &Figment) -> Result<Self, Self::Error> {
         dotenv::dotenv().ok();
 
-        let database_url = std::env::var("DATABASE_URL").unwrap();
+        let database_url = std::env::var("PORTFOLIO_DATABASE_URL").unwrap();
         let mut options: ConnectOptions = database_url.into();
         options
             .max_connections(1024)
diff --git a/core/src/services/portfolio_service.rs b/core/src/services/portfolio_service.rs
index 2552154..7657bb2 100644
--- a/core/src/services/portfolio_service.rs
+++ b/core/src/services/portfolio_service.rs
@@ -127,7 +127,7 @@ impl PortfolioService {
     // Get root path or local directory
     fn get_file_store_path() -> PathBuf {
         dotenv::dotenv().ok();
-        Path::new(&std::env::var("STORE_PATH").unwrap_or_else(|_| "".to_string())).to_path_buf()
+        Path::new(&std::env::var("PORTFOLIO_STORE_PATH").unwrap_or_else(|_| "".to_string())).to_path_buf()
     }
 
     /// Writes file to desired location
@@ -379,7 +379,7 @@ mod tests {
 
         tokio::fs::create_dir_all(application_cache_dir.clone()).await.unwrap();
 
-        std::env::set_var("STORE_PATH", temp_dir.to_str().unwrap());
+        std::env::set_var("PORTFOLIO_STORE_PATH", temp_dir.to_str().unwrap());
 
         (temp_dir, application_dir, application_cache_dir)
     }
@@ -388,7 +388,7 @@ mod tests {
     async fn clear_data_store_temp_dir(temp_dir: PathBuf) {
         tokio::fs::remove_dir_all(temp_dir).await.unwrap();
 
-        std::env::remove_var("STORE_PATH");
+        std::env::remove_var("PORTFOLIO_STORE_PATH");
     }
 
     #[tokio::test]
@@ -398,7 +398,7 @@ mod tests {
         let plain_text_password = "test".to_string();
 
         let temp_dir = std::env::temp_dir().join("portfolio_test_tempdir").join("create_folder");
-        std::env::set_var("STORE_PATH", temp_dir.to_str().unwrap());
+        std::env::set_var("PORTFOLIO_STORE_PATH", temp_dir.to_str().unwrap());
 
         CandidateService::create(&db, APPLICATION_ID, &plain_text_password, "".to_string())
             .await
diff --git a/docker-compose.yml.dev b/docker-compose.yml.dev
index 059d90e..4d107d3 100644
--- a/docker-compose.yml.dev
+++ b/docker-compose.yml.dev
@@ -7,7 +7,7 @@ services:
     depends_on: 
       - db
     environment:
-      DATABASE_URL: postgres://postgres:postgres@db:5432/postgres
+      PORTFOLIO_DATABASE_URL: postgres://postgres:postgres@db:5432/postgres
     ports:
       - "9000:8000"
     command: sh -c "cargo watch -x run"