diff --git a/.ci-make.sh b/.ci-make.sh
index 8356dbc..8755a80 100755
--- a/.ci-make.sh
+++ b/.ci-make.sh
@@ -97,13 +97,13 @@ case "$1" in
 				git describe --tags HEAD
 				CI_COMMIT_TAG_RESOLVE=$(git describe --tags HEAD --abbrev=0)
 				echo "Closest existing tag: $CI_COMMIT_TAG_RESOLVE"
-				if [ "$CI_COMMIT_TAG_RESOLVE" = *"-dev" ] ; then
+				if [ "$CI_COMMIT_TAG_RESOLVE" != "${CI_COMMIT_TAG_RESOLVE%"-dev"}" ] || [ ! "$CI_COMMIT_TAG_RESOLVE" ] ; then
 					if [ $PR_MODE ] ; then
 						echo "I can't figure out which release version of Forgejo to build your PR against."
 						echo "Whatever you're trying to do is not yet implemented."
 						exit 97
 					fi
-					echo "err! building dev version- skipping binary dl"
+					echo "err! unable to resolve tag or building dev version- skipping binary dl"
 					CI_COMMIT_TAG_RESOLVE=
 				fi
 			fi
@@ -186,7 +186,7 @@ case "$1" in
 		[ -z "$FORGEJO_HOME" ] && FORGEJO_HOME=/var/lib/forgejo
 		[ -z "$FORGEJO_USER" ] && FORGEJO_USER=forgejo
 		sudo -u $FORGEJO_USER USER=$FORGEJO_USER \
-			HOME=$FORGEJO_HOME GITEA_WORK_DIR=$FORGEJO_HOME \
+			HOME=$FORGEJO_HOME FORGEJO_WORK_DIR=$FORGEJO_HOME \
 			forgejo web -q --config /etc/forgejo/app.ini &
 		sleep 10
 		curl http://localhost:3000/ | grep -A 4 "Powered by Forgejo"
@@ -202,7 +202,7 @@ case "$1" in
 		apt update -qq
 		apt install -y "$3"
 		sudo -u forgejo USER=forgejo \
-			HOME=/var/lib/forgejo GITEA_WORK_DIR=/var/lib/forgejo \
+			HOME=/var/lib/forgejo FORGEJO_WORK_DIR=/var/lib/forgejo \
 			forgejo web -q --config /etc/fogejo/app.ini &
 		sleep 10
 		curl http://localhost:3000/ | grep -A 4 "Powered by Forgejo"
diff --git a/deb/.forgejo-bin.control b/deb/.forgejo-bin.control
index 3f2de6f..5c093a2 100644
--- a/deb/.forgejo-bin.control
+++ b/deb/.forgejo-bin.control
@@ -2,7 +2,7 @@ Package: forgejo-bin
 Architecture: amd64
 Priority: optional
 Provides: forgejo,gitea
-Depends: adduser (>= 3.11)
-Conflicts: forgejo,forgejo-bin
+Depends: adduser (>= 3.11), git
+Conflicts: forgejo,forgejo-sqlite,forgejo-common
 Description: Forgejo: Beyond Coding. We Forge. (binary)
  The official Forgejo release binary in a Debian package
diff --git a/deb/forgejo.service b/deb/forgejo.service
index 008d93e..c5f3bc8 100644
--- a/deb/forgejo.service
+++ b/deb/forgejo.service
@@ -61,7 +61,7 @@ WorkingDirectory=~
 #RuntimeDirectory=forgejo
 ExecStart=/usr/bin/forgejo web --config /etc/forgejo/app.ini
 Restart=always
-Environment=USER=forgejo HOME=/var/lib/forgejo GITEA_WORK_DIR=/var/lib/forgejo
+Environment=USER=forgejo HOME=/var/lib/forgejo FORGEJO_WORK_DIR=/var/lib/forgejo
 # If you install Git to directory prefix other than default PATH (which happens
 # for example if you install other versions of Git side-to-side with
 # distribution version), uncomment below line and add that prefix to PATH
diff --git a/etc/systemd/system/forgejo.service.d/override.conf b/etc/systemd/system/forgejo.service.d/override.conf
index f626df8..02635f5 100644
--- a/etc/systemd/system/forgejo.service.d/override.conf
+++ b/etc/systemd/system/forgejo.service.d/override.conf
@@ -3,4 +3,4 @@
 # LimitNOFILE=524288:524288
 User=git
 Group=git
-Environment=USER=git HOME=/var/lib/forgejo GITEA_WORK_DIR=/var/lib/forgejo
+Environment=USER=git HOME=/var/lib/forgejo FORGEJO_WORK_DIR=/var/lib/forgejo