diff --git a/packager/.godir b/.packager/.godir
similarity index 100%
rename from packager/.godir
rename to .packager/.godir
diff --git a/packager/Procfile b/.packager/Procfile
similarity index 100%
rename from packager/Procfile
rename to .packager/Procfile
diff --git a/packager/hooks/postinst b/.packager/hooks/postinst
similarity index 84%
rename from packager/hooks/postinst
rename to .packager/hooks/postinst
index 561080eff..efae87ad1 100755
--- a/packager/hooks/postinst
+++ b/.packager/hooks/postinst
@@ -9,9 +9,9 @@ APP_GROUP=$(${CLI} config:get APP_GROUP)
 APP_CONFIG="/etc/${APP_NAME}/conf/app.ini"
 
 mkdir -p $(dirname ${APP_CONFIG})
-chown ${APP_USER}.${APP_GROUP} $(dirname ${APP_CONFIG})
+chown "${APP_USER}"."${APP_GROUP}" $(dirname ${APP_CONFIG})
 [ -f ${APP_CONFIG} ] || ${CLI} run cp conf/app.ini ${APP_CONFIG}
-${CLI} config:set USER=${APP_USER}
+${CLI} config:set USER="${APP_USER}"
 sed -i "s|RUN_USER = git|RUN_USER = ${APP_USER}|" ${APP_CONFIG}
 sed -i "s|RUN_MODE = dev|RUN_MODE = prod|" ${APP_CONFIG}
 
diff --git a/.pkgr.yml b/.pkgr.yml
index 0e9fd93fb..9a69a5721 100644
--- a/.pkgr.yml
+++ b/.pkgr.yml
@@ -9,6 +9,8 @@ targets:
     <<: *debian
   debian-10:
     <<: *debian
+  debian-11:
+    <<: *debian
   ubuntu-14.04:
     <<: *debian
   ubuntu-16.04:
@@ -18,7 +20,7 @@ targets:
       - mercurial
   ubuntu-18.04:
     <<: *debian
-  centos-6: &el
+  centos-7:
     build_dependencies:
       - pam-devel
       # required for go buildpack
@@ -26,14 +28,8 @@ targets:
     dependencies:
       - pam
       - git
-  centos-7:
-    <<: *el
 before:
-  - mv packager/Procfile .
+  - mv .packager/Procfile .
 after:
   - mv bin/gogs gogs
-after_install: ./packager/hooks/postinst
-# Can be updated after CentOS 6 support is dropped, otherwise fails with
-# `fatal: bad config file line 2 in /home/pkgr/.gitconfig` because of
-# https://github.com/heroku/heroku-buildpack-go/blob/f96ebebfa7605fd3916521e42ab050c81c9b947a/lib/common.sh#L238
-buildpack: https://github.com/heroku/heroku-buildpack-go.git#v76
+after_install: ./.packager/hooks/postinst
diff --git a/go.mod b/go.mod
index 499de0b60..928da6cbc 100644
--- a/go.mod
+++ b/go.mod
@@ -67,3 +67,5 @@ require (
 	xorm.io/core v0.7.2
 	xorm.io/xorm v0.8.0
 )
+
+// +heroku goVersion go1.13.3