2 files changed, 3 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6f228616e870..d84574bd2c1c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -16,7 +16,6 @@ pkgbase = pleroma-git
 	optdepends = ffmpeg: media preview proxy support for videos
 	optdepends = perl-image-exiftool: supporting stripping location (GPS) data from uploaded images with Pleroma.Upload.Filters.Exiftool
 	provides = pleroma
-	conflicts = pleroma
 	backup = etc/pleroma/config.exs
 	source = pleroma.sysusers
 	source = pleroma.tmpfiles
diff --git a/PKGBUILD b/PKGBUILD
index a767003acc69..2c9ad798d49f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,6 @@ optdepends=('postgresql: local postgresql database support'
             'ffmpeg: media preview proxy support for videos'
             'perl-image-exiftool: supporting stripping location (GPS) data from uploaded images with Pleroma.Upload.Filters.Exiftool')
 provides=("${_pkgname}")
-conflicts=("${_pkgname}")
 backup=('etc/pleroma/config.exs')
 install=pleroma.install
 source=('pleroma.sysusers'
@@ -40,9 +39,10 @@ package() {
 
     cd "${_pkgname}"
     echo "y\ny" | mix deps.get
-    mix pleroma.instance gen
+    MIX_ENV=prod mix pleroma.instance gen
+    mv config/{generated_config.exs,prod.secret.exs}
     psql -f config/setup_db.psql
-    mix ecto.migrate
+    MIX_ENV=prod mix ecto.migrate
 }
 
 pkgver() {