diff --git a/modules/server/containers/defs/etherpad.nix b/modules/server/containers/defs/etherpad.nix
index df66653..37411a5 100644
--- a/modules/server/containers/defs/etherpad.nix
+++ b/modules/server/containers/defs/etherpad.nix
@@ -18,7 +18,8 @@ let
       ExposedPorts = { "${toString containerCfg.port}/tcp" = {}; };
       Env = [
         "NODE_ENV=production"
-        "HOME=/var/lib/etherpad"
+        "HOME=/opt/etherpad-lite/var"
+        "DB_FILENAME=/opt/etherpad-lite/var/dirty.db"
       ];
 
     };
@@ -43,21 +44,17 @@ in {
       ip = containerCfg.ip;
       secret = name;
       extraEnv = {
-        NODE_ENV = "production";
-        TITLE = "Pad";
-        PORT = toString containerCfg.port;
-        DB_TYPE = "postgres";
-        DB_HOST = builder.host;
-        DB_NAME = "etherpad_db";
-        DB_USER = "etherpad_user";
-        DB_PASS = "ETHERPAD_DB_PASSWORD";
-        ADMIN_PASSWORD = "ETHERPAD_ADMIN_PASSWORD";
+        "TITLE" = "Pad";
+        "PORT" = toString containerCfg.port;
+        "DB_TYPE" = "postgres";
+        "DB_HOST" = builder.host;
+        "DB_NAME" = "etherpad_db";
+        "DB_USER" = "etherpad_user";
         "TRUST_PROXY" = "true";
-        DB_CHARSET = "utf8mb4";
-        DEFAULT_PAD_TEXT = "";
-        PAD_OPTIONS_SHOW_LINE_NUMBERS = "true";
-        PAD_OPTIONS_USE_MONOSPACE_FONT = "true";
-        SKIN_VARIANTS = "super-dark-toolbar light-editor dark-background";
+        "DEFAULT_PAD_TEXT" = "";
+        "PAD_OPTIONS_SHOW_LINE_NUMBERS" = "true";
+        "PAD_OPTIONS_USE_MONOSPACE_FONT" = "true";
+        "SKIN_VARIANTS" = "super-dark-toolbar light-editor dark-background";
       };
       overrides = {
         volumes = [