diff --git a/README.md b/README.md
index 7658652..565b97e 100644
--- a/README.md
+++ b/README.md
@@ -84,11 +84,8 @@ Pull the [latest image](https://hub.docker.com/r/krateng/maloja) or check out th
 
 Of note are these settings which should be passed as environmental variables to the container:
 
-#### First run
-* `MALOJA_SKIP_SETUP` -- Make the server setup process non-interactive. Maloja will not work properly without this variable set.
-* `MALOJA_FORCE_PASSWORD` -- Set an admin password for Maloja. You will need this to log in on first run.
-
-#### Always
+* `MALOJA_SKIP_SETUP` -- Make the server setup process non-interactive. Maloja will not work properly in a container without this variable set. This is done by default in the provided Containerfile.
+* `MALOJA_FORCE_PASSWORD` -- Set an admin password for Maloja. You only need this on the first run.
 * `MALOJA_DATA_DIRECTORY` -- Set the directory in the container where configuration folders/files should be located
   * Mount a [volume](https://docs.docker.com/engine/reference/builder/#volume) to the specified directory to access these files outside the container (and to make them persistent)