diff --git a/.dockerignore b/.dockerignore
index 5b2c909ad..35534ff5e 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,8 +1,7 @@
 .git
 .gitignore
-.env
-.env.*
-!.env.docker
+.env.example
+.env.docker.example
 node_modules
 vendor
 storage/logs/*
diff --git a/DOCKER_SETUP.md b/DOCKER_SETUP.md
index 90cfa9a28..eb6903518 100644
--- a/DOCKER_SETUP.md
+++ b/DOCKER_SETUP.md
@@ -12,10 +12,10 @@ This setup uses `serversideup/php:8.4-fpm-nginx` as the base image and is design
 
 1. **Copy the environment file:**
    ```bash
-   cp .env.docker.example .env.docker
+   cp .env.docker.example .env
    ```
 
-2. **Update `.env.docker` with your configuration:**
+2. **Update `.env` with your configuration:**
    - Set `APP_KEY` (generate with: `docker compose run --rm pixelfed php artisan key:generate --show`)
    - Update `APP_URL`, `APP_DOMAIN`, `ADMIN_DOMAIN`, `SESSION_DOMAIN` with your domain
    - Set secure database passwords for `DB_PASSWORD` and `DB_ROOT_PASSWORD`
@@ -144,6 +144,6 @@ docker compose exec pixelfed php artisan view:clear
 ```
 
 ### Database Connection Issues
-- Verify database credentials in `.env.docker`
+- Verify database credentials in `.env`
 - Check if database container is running: `docker compose ps`
 - View database logs: `docker compose logs db`
diff --git a/docker-compose.yml b/docker-compose.yml
index c9a333851..c796e3153 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,7 +10,7 @@ services:
     ports:
       - "8080:8080"
     env_file:
-      - .env.docker
+      - .env
     environment:
       # PHP Configuration
       AUTORUN_LARAVEL_MIGRATION_ISOLATION: "true"
@@ -43,7 +43,7 @@ services:
     container_name: pixelfed-db
     restart: unless-stopped
     env_file:
-      - .env.docker
+      - .env
     environment:
       MARIADB_DATABASE: ${DB_DATABASE}
       MARIADB_USER: ${DB_USERNAME}
@@ -72,7 +72,7 @@ services:
     restart: unless-stopped
     command: php artisan horizon
     env_file:
-      - .env.docker
+      - .env
     environment:
       AUTORUN_ENABLED: "false"
       PHP_POST_MAX_SIZE: "500M"