diff --git a/repo/caddy-git/Caddyfile b/repo/caddy-bgme-git/Caddyfile
similarity index 100%
rename from repo/caddy-git/Caddyfile
rename to repo/caddy-bgme-git/Caddyfile
diff --git a/repo/caddy-git/PKGBUILD b/repo/caddy-bgme-git/PKGBUILD
similarity index 97%
rename from repo/caddy-git/PKGBUILD
rename to repo/caddy-bgme-git/PKGBUILD
index 218f3b4..908401a 100644
--- a/repo/caddy-git/PKGBUILD
+++ b/repo/caddy-bgme-git/PKGBUILD
@@ -7,9 +7,9 @@
 # Contributor: Andreas Linz <klingt.net at gmail dot com>
 # Contributor: Akshay S Dinesh <asdofindia at gmail dot com>
 
-pkgname=caddy-git
+pkgname=caddy-bgme-git
 _pkgname=caddy
-pkgver=2.7.0beta.1.r6.g5336bc0f
+pkgver=2.7.0.beta.1
 pkgrel=1
 pkgdesc='Fast web server with automatic HTTPS'
 url='https://caddyserver.com'
@@ -17,7 +17,7 @@ arch=('x86_64')
 license=('Apache')
 depends=('glibc')
 makedepends=('go' 'git' 'gzip')
-conflicts=('caddy')
+conflicts=('caddy' 'caddy-bgme')
 provides=('caddy')
 backup=('etc/caddy/Caddyfile')
 source=(
diff --git a/repo/caddy-git/caddy.sysusers b/repo/caddy-bgme-git/caddy.sysusers
similarity index 100%
rename from repo/caddy-git/caddy.sysusers
rename to repo/caddy-bgme-git/caddy.sysusers
diff --git a/repo/caddy-git/caddy.tmpfiles b/repo/caddy-bgme-git/caddy.tmpfiles
similarity index 100%
rename from repo/caddy-git/caddy.tmpfiles
rename to repo/caddy-bgme-git/caddy.tmpfiles
diff --git a/repo/caddy-git/lilac.yaml b/repo/caddy-bgme-git/lilac.yaml
similarity index 100%
rename from repo/caddy-git/lilac.yaml
rename to repo/caddy-bgme-git/lilac.yaml
diff --git a/repo/caddy-git/main.go b/repo/caddy-bgme-git/main.go
similarity index 100%
rename from repo/caddy-git/main.go
rename to repo/caddy-bgme-git/main.go
diff --git a/repo/caddy/Caddyfile b/repo/caddy-bgme/Caddyfile
similarity index 100%
rename from repo/caddy/Caddyfile
rename to repo/caddy-bgme/Caddyfile
diff --git a/repo/caddy/PKGBUILD b/repo/caddy-bgme/PKGBUILD
similarity index 98%
rename from repo/caddy/PKGBUILD
rename to repo/caddy-bgme/PKGBUILD
index cedd799..946b30a 100644
--- a/repo/caddy/PKGBUILD
+++ b/repo/caddy-bgme/PKGBUILD
@@ -7,7 +7,7 @@
 # Contributor: Andreas Linz <klingt.net at gmail dot com>
 # Contributor: Akshay S Dinesh <asdofindia at gmail dot com>
 
-pkgname=caddy
+pkgname=caddy-bgme
 pkgver=2.7.0.beta.1
 _gitcommit=v2.7.0-beta.1
 _distcommit=5ded5351fc9f6f35286e38c4552fc2d8b37f4df3
@@ -18,7 +18,7 @@ arch=('x86_64')
 license=('Apache')
 depends=('glibc')
 makedepends=('go' 'git' 'gzip')
-conflicts=('caddy-git')
+conflicts=('caddy' 'caddy-bgme-git')
 provides=('caddy')
 backup=('etc/caddy/Caddyfile')
 source=(
diff --git a/repo/caddy/caddy.sysusers b/repo/caddy-bgme/caddy.sysusers
similarity index 100%
rename from repo/caddy/caddy.sysusers
rename to repo/caddy-bgme/caddy.sysusers
diff --git a/repo/caddy/caddy.tmpfiles b/repo/caddy-bgme/caddy.tmpfiles
similarity index 100%
rename from repo/caddy/caddy.tmpfiles
rename to repo/caddy-bgme/caddy.tmpfiles
diff --git a/repo/caddy/lilac.yaml b/repo/caddy-bgme/lilac.yaml
similarity index 100%
rename from repo/caddy/lilac.yaml
rename to repo/caddy-bgme/lilac.yaml
diff --git a/repo/caddy/main.go b/repo/caddy-bgme/main.go
similarity index 100%
rename from repo/caddy/main.go
rename to repo/caddy-bgme/main.go