diff --git a/gitea-db.container b/gitea-db.container
index 3de625a..0d2ef96 100644
--- a/gitea-db.container
+++ b/gitea-db.container
@@ -10,6 +10,7 @@ Environment=MYSQL_USER=gitea
 Environment=MYSQL_PASSWORD=gitea
 Environment=MYSQL_DATABASE=gitea
 Network=gitea.network
+ContainerName=mysql
 
 [Service]
 Restart=always
diff --git a/gitea-server.container b/gitea-server.container
index 3de625a..0bcf87f 100644
--- a/gitea-server.container
+++ b/gitea-server.container
@@ -1,14 +1,28 @@
-# gitea-db.container
+# gitea-server.container
 [Unit]
-Description=Gitea MySQL Database
+Description=Gitea Server
+After=gitea-db.service
 
 [Container]
-Image=docker.io/library/mysql:8
-Volume=/var/podman/gitea/mysql:/var/lib/mysql:Z
-Environment=MYSQL_ROOT_PASSWORD=gitea
-Environment=MYSQL_USER=gitea
-Environment=MYSQL_PASSWORD=gitea
-Environment=MYSQL_DATABASE=gitea
+ContainerName=gitea
+Image=docker.gitea.com/gitea:1.26.1
+Environment=USER_UID=1000
+Environment=USER_GID=1000
+Environment=GITEA__database__DB_TYPE=mysql
+Environment=GITEA__database__HOST=gitea-db:3306
+Environment=GITEA__database__NAME=gitea
+Environment=GITEA__database__USER=gitea
+Environment=GITEA__database__PASSWD=gitea
+
+# Volume mappings
+Volume=/var/podman/gitea/data:/data:Z
+Volume=/etc/timezone:/etc/timezone:ro
+Volume=/etc/localtime:/etc/localtime:ro
+
+# Port mappings
+PublishPort=3001:3000
+PublishPort=222:22
+
 Network=gitea.network
 
 [Service]