diff --git a/modules/server/containers/apps/etherpad.nix b/modules/server/containers/apps/etherpad.nix
index 1b094e5..95b767f 100644
--- a/modules/server/containers/apps/etherpad.nix
+++ b/modules/server/containers/apps/etherpad.nix
@@ -71,21 +71,15 @@ let
     tag = etherpad_exe.version;
     contents = with pkgs;[cacert tzdata bash coreutils curl settings ];
     fakeRootCommands = ''
-      mkdir -p ./opt ./tmp
-      chmod 1777 ./opt ./tmp
+      mkdir -p ./tmp
+      chmod 1777 ./tmp
     '';
     config = {
-      Cmd = [
-        "${pkgs.bash}/bin/bash"
-        "-c"
-        "echo \"$APIKEY\" > /opt/APIKEY.txt && exec ${etherpad_exe}/bin/etherpad-lite --settings /etc/etherpad/settings.json"
-      ];
+      Cmd = [ "${etherpad_exe}/bin/etherpad-lite" "--settings /etc/etherpad/settings.json" "--apikey $APIKEY"];
       User = "1000:1000";
-      WorkingDir = "/opt";
       ExposedPorts = { "${toString containerCfg.port}/tcp" = {}; };
       Env = [
         "NODE_ENV=production"
-        "HOME=/opt"
       ];
 
     };
@@ -107,7 +101,6 @@ in {
         DB_HOST = builder.host;
         DB_NAME = "etherpad_db";
         DB_USER = "etherpad_user";
-        HOME = "/opt";
         TRUST_PROXY = "true";
         DB_CHARSET = "utf8mb4";
         DEFAULT_PAD_TEXT = "";