diff --git a/Dockerfile.gitea b/Dockerfile.gitea
deleted file mode 100644
index 0df6f62..0000000
--- a/Dockerfile.gitea
+++ /dev/null
@@ -1,20 +0,0 @@
-# syntax=docker/dockerfile:1
-# gentoo-gitea
-FROM gentoo-base-gnu AS builder
-
-WORKDIR /workdir
-COPY --exclude=repos --exclude=bin . .
-RUN --mount=type=cache,target=/workdir/cache,sharing=locked <<-EOF
-	echo 'acct-user/git gitea -git' >> /etc/portage/package.use/gitea
-	emerge -1v --quiet-build=y acct-user/git
-	/bin/bash src/setup-gitea.sh /mnt/gentoo -j8
-EOF
-
-FROM scratch
-WORKDIR /
-EXPOSE 3000 32799
-VOLUME ["/etc/gitea", "/var/lib/gitea"]
-COPY --from=builder /mnt/gentoo /
-RUN rm -fR /var/db
-USER git:git
-CMD ["/usr/bin/gitea", "web"]
diff --git a/Dockerfile.busybox.gitea b/gitea.Dockerfile
similarity index 78%
rename from Dockerfile.busybox.gitea
rename to gitea.Dockerfile
index f28de0a..6f18c97 100644
--- a/Dockerfile.busybox.gitea
+++ b/gitea.Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 # gentoo-gitea
-FROM gentoo-base-busybox AS builder
+FROM registry.ceamac.ro/gentoo-base-busybox AS builder
 
 WORKDIR /workdir
 COPY --exclude=repos --exclude=bin . .
@@ -15,6 +15,6 @@ WORKDIR /
 EXPOSE 3000 32799
 VOLUME ["/etc/gitea", "/var/lib/gitea"]
 COPY --from=builder /mnt/gentoo /
-RUN rm -fR /var/db
+RUN tar c -j -f /var/db/pkg.tar.bz2 -C /var/db/pkg . && rm -fR /var/db/pkg
 USER git:git
 CMD ["/usr/bin/gitea", "web"]
diff --git a/compose-gitea.yaml b/gitea.yaml
similarity index 85%
rename from compose-gitea.yaml
rename to gitea.yaml
index c3b79c6..721ef79 100644
--- a/compose-gitea.yaml
+++ b/gitea.yaml
@@ -3,7 +3,7 @@ services:
     image: registry.ceamac.ro/gentoo-gitea
     restart: always
     #user: 196:196
-    userns: nomap
+    #userns: nomap
     ports:
       - "127.0.0.1:3000:3000/tcp"
       - "127.0.0.1:32799:32799/tcp"
@@ -16,6 +16,9 @@ services:
         source: /var/lib/gitea
         target: /var/lib/gitea
         read_only: false
+    build:
+      dockerfile: gitea.Dockerfile
+      context: .
 
     #command: /bin/bash
     #stdin_open: true