diff --git a/docker-compose.yml b/docker-compose.yml
index bebd56b..bb71904 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,16 +3,16 @@ services:
   speedtest-tracker:
     container_name: speedtest-tracker
     ports:
-      - '8080:80'
-      - '8443:443'
+      - '${APP_HTTP_PORT:-8080}:80'
+      - '${APP_HTTPS_PORT:-8443}:443'
     environment:
       - PUID
       - PGID
-      - DB_CONNECTION
-      - DB_HOST
-      - DB_PORT
-      - DB_DATABASE
-      - DB_USERNAME
+      - DB_CONNECTION=mysql
+      - DB_HOST=db
+      - DB_PORT=3306
+      - DB_DATABASE=speedtest_tracker
+      - DB_USERNAME=speedy
       - DB_PASSWORD
     volumes:
       - '${APP_DATA_DIR:-./data}/config:/config'
@@ -25,9 +25,9 @@ services:
     image: mariadb:10
     restart: always
     environment:
-      - MARIADB_DATABASE
-      - MARIADB_USER
-      - MARIADB_PASSWORD
-      - MARIADB_RANDOM_ROOT_PASSWORD
+      - MARIADB_DATABASE=${DB_DATABASE:-speedtest_tracker}
+      - MARIADB_USER=${DB_USERNAME:-speedy}
+      - MARIADB_PASSWORD=${DB_PASSWORD}
+      - MARIADB_RANDOM_ROOT_PASSWORD=true
     volumes:
       - ${APP_DATA_DIR:-./data}:/var/lib/mysql
diff --git a/env.sample b/env.sample
index 64de7f1..2fdfccd 100644
--- a/env.sample
+++ b/env.sample
@@ -1,19 +1,10 @@
 # general
 COMPOSE_PROJECT_NAME=speedtest-tracker
 APP_DATA_DIR=./data
+APP_HTTP_PORT=8080
+APP_HTTPS_PORT=8443
 
 # speedtest tracker
 PUID=1000
 PGID=1000
-DB_CONNECTION=mysql
-DB_HOST=db
-DB_PORT=3306
-DB_DATABASE=speedtest_tracker
-DB_USERNAME=speedy
 DB_PASSWORD=password
-
-# mariadb
-MARIADB_DATABASE=speedtest_tracker
-MARIADB_USER=speedy
-MARIADB_PASSWORD=password
-MARIADB_RANDOM_ROOT_PASSWORD=true