diff --git a/README.md b/README.md
index c17503c..29f09df 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 # verstream
 
 ## Environment
-`SERVER_ADDRESS` - Server address (default: 127.0.0.1)
+`ADDRESS` - Server address (default: 127.0.0.1)
 <br>
-`BIND_PORT` - Server port (default: 8080)
+`PORT` - Server port (default: 8080)
 <br>
 `AWS_BUCKET` - S3 bucket name (required)
 <br>
diff --git a/src/main.rs b/src/main.rs
index 2baeb14..ea7f044 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -30,7 +30,7 @@ fn check_env_var(var_name: &str) {
 }
 
 fn get_bind_address() -> IpAddr {
-    let bind_address = env::var("SERVER_ADDRESS")
+    let bind_address = env::var("ADDRESS")
         .unwrap_or_else(|_| String::from("127.0.0.1"));
 
     IpAddr::from_str(&bind_address)
@@ -118,7 +118,7 @@ async fn main() -> std::io::Result<()> {
     let client = Client::new(&shared_config);
 
     let bind_address = get_bind_address();
-    let bind_port = env::var("BIND_PORT")
+    let bind_port = env::var("PORT")
         .unwrap_or_else(|_| String::from("8080"))
         .parse::<u16>()
         .expect("Invalid port number");