diff --git a/roles/gitea/defaults/main.yaml b/roles/gitea/defaults/main.yaml
index 02cee39..77e7cc8 100644
--- a/roles/gitea/defaults/main.yaml
+++ b/roles/gitea/defaults/main.yaml
@@ -48,13 +48,11 @@ gitea_config:
     root_path: /var/log/gitea
     mode: file
     access: file
-    macaron: file
     router: file
-    redirect_macaron_log: true
   log.console:
     colorize: no
   service:
-    disable_registration: yes
+    register_manual_confirm: true
 
 gitea_var_tree:
   - "{{ gitea_var_path }}"
diff --git a/roles/gitea/tasks/configure.yaml b/roles/gitea/tasks/configure.yaml
index 62496bf..d53f658 100644
--- a/roles/gitea/tasks/configure.yaml
+++ b/roles/gitea/tasks/configure.yaml
@@ -49,6 +49,12 @@
   notify:
     - restart gitea
 
+- name: set environment
+  lineinfile:
+    path: /etc/environment
+    regexp: ^GITEA_WORK_DIR
+    line: "GITEA_WORK_DIR=\"{{ gitea_var_path }}\""
+
 - name: configure systemd unit
   template:
     src: gitea.service.j2