diff --git a/gitea/Containerfile b/gitea/Containerfile
index 8c3126c..3f4ab4c 100644
--- a/gitea/Containerfile
+++ b/gitea/Containerfile
@@ -81,18 +81,18 @@ RUN wget https://dl.gitea.io/gitea/${GITEAV:?}/gitea-${GITEAV:?}-linux-amd64 &&
     chmod +x /usr/local/bin/gitea
 
 # make directories gitea needs
-RUN mkdir -p /var/lib/gitea/custom /var/lib/gitea/data/ /var/log/gitea && \
+RUN mkdir -p /var/lib/gitea/data/ /var/log/gitea /etc/gitea && \
     chown -R gitea:gitea /var/lib/gitea /var/log/gitea && \
     chmod -R 750 /var/lib/gitea /var/log/gitea && \
-    ln -s /var/log/gitea /var/lib/gitea/log
+    ln -s /var/log/gitea /var/lib/gitea/log && \
+    ln -s /vol/data/custom /var/lib/gitea/custom
 
-# copy gitea config template
-COPY assets/app.ini.esh /etc/gitea/
 # template config file
-RUN cd /etc/gitea/ && \
-    esh app.ini.esh > app.ini && \
-    rm app.ini.esh && \
-    chmod -R +r /etc/gitea/
+COPY assets/app.ini.esh.esh /etc/gitea/
+RUN cd /etc/gitea && \
+    esh app.ini.esh.esh && \
+    rm app.ini.esh.esh && \
+    chmod -R +r /etc/gitea
 
 COPY assets/gitea.service /etc/systemd/system/
 
diff --git a/gitea/Systemdfile b/gitea/Systemdfile
index 469fa94..4089fd2 100644
--- a/gitea/Systemdfile
+++ b/gitea/Systemdfile
@@ -9,6 +9,5 @@ sleep 5
 # make database for gitea
 db-make
 
-# enable and start gitea
+# enable gitea
 systemctl enable gitea
-systemctl start gitea
diff --git a/gitea/assets/app.ini.esh.esh b/gitea/assets/app.ini.esh.esh
index 376b6fd..27c764c 100644
--- a/gitea/assets/app.ini.esh.esh
+++ b/gitea/assets/app.ini.esh.esh
@@ -1,4 +1,5 @@
-APP_NAME = Gitea: Git with a cup of tea
+<%% . /vol/data/hostvars -%>
+APP_NAME = <%%= $pagename %>
 RUN_USER = gitea
 RUN_MODE = prod
 
@@ -26,11 +27,11 @@ PATH     = /var/lib/gitea/data/gitea.db
 ROOT = /vol/git/repos
 
 [server]
-DOMAIN           = git.alemor.org
-ROOT_URL         = https://git.alemor.org/
+DOMAIN           = <%% $domain %>
+ROOT_URL         = https://<%% $domain %>/
 HTTP_PORT        = 80
 START_SSH_SERVER = false
-SSH_PORT         = 4323
+SSH_PORT         = <%% $sshport %%>
 SSH_CREATE_AUTHORIZED_KEYS_FILE = true
 SSH_AUTHORIZED_KEYS_BACKUP = false
 LFS_START_SERVER = true
diff --git a/gitea/assets/gitea.service b/gitea/assets/gitea.service
index 8883386..6780d43 100644
--- a/gitea/assets/gitea.service
+++ b/gitea/assets/gitea.service
@@ -19,6 +19,7 @@ WorkingDirectory=/var/lib/gitea/
 # If using Unix socket: tells systemd to create the /run/gitea folder, which will contain the gitea.sock file
 # (manually creating /run/gitea doesn't work, because it would not persist across reboots)
 #RuntimeDirectory=gitea
+ExecStartPre=/usr/local/bin/esh /etc/gitea/app.ini.esh
 ExecStartPre=/usr/local/bin/gitea --config /etc/gitea/app.ini admin regenerate keys
 ExecStart=/usr/local/bin/gitea web --config /etc/gitea/app.ini
 Restart=always