diff --git a/.dockerignore b/.dockerignore
index 5373eb23..82b28b58 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,2 +1,3 @@
 data
 .tox
+.env*
diff --git a/.gitignore b/.gitignore
index 60e4575b..a6a4c85b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -99,7 +99,7 @@ celerybeat-schedule
 *.sage.py
 
 # Environments
-.env
+.env*
 .venv
 env/
 venv/
diff --git a/README.rst b/README.rst
index f88d9b63..aa670344 100644
--- a/README.rst
+++ b/README.rst
@@ -135,7 +135,7 @@ Running it
 Environment variables
 ---------------------
 
-First create and customize a file named ``environment``,
+First create and customize a file named ``.env``,
 based on `environment.sample <./environment.sample>`_.
 
 Tasks performed by the bot can be specified by setting the ``BOT_TASKS``
diff --git a/docker-compose.yml b/docker-compose.yml
index 2cd82853..69ca3b19 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,7 +14,7 @@ services:
       - 8080:8080
     user: "${UID}:${GID}"
     env_file:
-      - ./environment
+      - ./.env
     volumes:
       - ./data/cache:/app/run/.cache
       - ./data/simple-index:/app/run/simple-index
@@ -28,7 +28,7 @@ services:
       - queue
     user: "${UID}:${GID}"
     env_file:
-      - ./environment
+      - ./.env
     volumes:
       - ./data/cache:/app/run/.cache
       - ./data/simple-index:/app/run/simple-index
@@ -42,7 +42,7 @@ services:
       - queue
     user: "${UID}:${GID}"
     env_file:
-      - ./environment
+      - ./.env
     volumes:
       - ./data/cache:/app/run/.cache
       - ./data/simple-index:/app/run/simple-index