diff --git a/.forgejo/workflows/upgrade.yml b/.forgejo/workflows/upgrade.yml
index a4e0517..1af32f2 100644
--- a/.forgejo/workflows/upgrade.yml
+++ b/.forgejo/workflows/upgrade.yml
@@ -34,7 +34,7 @@ jobs:
           adduser --quiet --comment forgejo --disabled-password forgejo
           chown -R forgejo:forgejo .
       - run: |
-          script=$(pwd)/.forgejo/upgrades/test-upgrade.sh
+          script=$(pwd)/forgejo/upgrades/test-upgrade.sh
           $script run dependencies
           $script clobber
           su forgejo -c "$script test_upgrades"
diff --git a/forgejo/build.sh b/forgejo/build.sh
new file mode 100755
index 0000000..540bdb6
--- /dev/null
+++ b/forgejo/build.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -ex
+
+SELF_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+version=$1
+DIR=$2
+
+v=$(echo $version | sed -E -e 's/([0-9]+\.[0-9]+).*/\1/')
+read url branch semver < $SELF_DIR/sources/$v
+
+rm -fr $DIR/src
+git clone --depth 1 -b $branch $url $DIR/src
+cd $DIR/src
+export TAGS="bindata sqlite sqlite_unlock_notify"
+make deps-backend backend
+make VERSION=v$version GITEA_VERSION=v$version FORGEJO_VERSION=$semver generate forgejo
+mv forgejo $DIR/forgejo-$version
diff --git a/forgejo/sources/1.20 b/forgejo/sources/1.20
new file mode 100644
index 0000000..3539e49
--- /dev/null
+++ b/forgejo/sources/1.20
@@ -0,0 +1 @@
+https://codeberg.org/forgejo/forgejo v1.20/forgejo 5.0.0+0-gitea-1.20.0
diff --git a/forgejo/sources/1.21 b/forgejo/sources/1.21
new file mode 100644
index 0000000..fc1869a
--- /dev/null
+++ b/forgejo/sources/1.21
@@ -0,0 +1 @@
+https://codeberg.org/forgejo/forgejo v1.21/forgejo 6.0.0+0-gitea-1.21.0
diff --git a/forgejo/sources/1.22 b/forgejo/sources/1.22
new file mode 100644
index 0000000..985576e
--- /dev/null
+++ b/forgejo/sources/1.22
@@ -0,0 +1 @@
+https://codeberg.org/forgejo/forgejo forgejo 7.0.0+0-gitea-1.22.0
diff --git a/.forgejo/upgrades/default-app.ini b/forgejo/upgrades/default-app.ini
similarity index 100%
rename from .forgejo/upgrades/default-app.ini
rename to forgejo/upgrades/default-app.ini
diff --git a/.forgejo/upgrades/fixtures.sh b/forgejo/upgrades/fixtures.sh
similarity index 100%
rename from .forgejo/upgrades/fixtures.sh
rename to forgejo/upgrades/fixtures.sh
diff --git a/.forgejo/upgrades/legagy-relative-app.ini b/forgejo/upgrades/legagy-relative-app.ini
similarity index 100%
rename from .forgejo/upgrades/legagy-relative-app.ini
rename to forgejo/upgrades/legagy-relative-app.ini
diff --git a/.forgejo/upgrades/merged-app.ini b/forgejo/upgrades/merged-app.ini
similarity index 100%
rename from .forgejo/upgrades/merged-app.ini
rename to forgejo/upgrades/merged-app.ini
diff --git a/.forgejo/upgrades/misplace-app.ini b/forgejo/upgrades/misplace-app.ini
similarity index 100%
rename from .forgejo/upgrades/misplace-app.ini
rename to forgejo/upgrades/misplace-app.ini
diff --git a/.forgejo/upgrades/misplace-s3-app.ini b/forgejo/upgrades/misplace-s3-app.ini
similarity index 100%
rename from .forgejo/upgrades/misplace-s3-app.ini
rename to forgejo/upgrades/misplace-s3-app.ini
diff --git a/.forgejo/upgrades/misplace-s3-two-app.ini b/forgejo/upgrades/misplace-s3-two-app.ini
similarity index 100%
rename from .forgejo/upgrades/misplace-s3-two-app.ini
rename to forgejo/upgrades/misplace-s3-two-app.ini
diff --git a/.forgejo/upgrades/relative-app.ini b/forgejo/upgrades/relative-app.ini
similarity index 100%
rename from .forgejo/upgrades/relative-app.ini
rename to forgejo/upgrades/relative-app.ini
diff --git a/.forgejo/upgrades/specific-app.ini b/forgejo/upgrades/specific-app.ini
similarity index 100%
rename from .forgejo/upgrades/specific-app.ini
rename to forgejo/upgrades/specific-app.ini
diff --git a/.forgejo/upgrades/stable-s3-app.ini b/forgejo/upgrades/stable-s3-app.ini
similarity index 100%
rename from .forgejo/upgrades/stable-s3-app.ini
rename to forgejo/upgrades/stable-s3-app.ini
diff --git a/.forgejo/upgrades/storage-relative-app.ini b/forgejo/upgrades/storage-relative-app.ini
similarity index 100%
rename from .forgejo/upgrades/storage-relative-app.ini
rename to forgejo/upgrades/storage-relative-app.ini
diff --git a/.forgejo/upgrades/test-upgrade.sh b/forgejo/upgrades/test-upgrade.sh
similarity index 97%
rename from .forgejo/upgrades/test-upgrade.sh
rename to forgejo/upgrades/test-upgrade.sh
index 2cd03f4..f1bf103 100755
--- a/.forgejo/upgrades/test-upgrade.sh
+++ b/forgejo/upgrades/test-upgrade.sh
@@ -64,20 +64,8 @@ function dependencies() {
     fi
 }
 
-function build() {
-    local version=$1
-    local semver=$2
-
-    if ! test -f $DIR/forgejo-$version ; then
-        mkdir -p $DIR
-        make VERSION=v$version GITEA_VERSION=v$version FORGEJO_VERSION=$semver TAGS='bindata sqlite sqlite_unlock_notify' generate gitea
-        mv gitea $DIR/forgejo-$version
-    fi
-}
-
 function build_all() {
-    test -f Makefile
-    build 1.21.0-0 6.0.0+0-gitea-1.21.0
+    $SELF_DIR/../build.sh 1.22.0-0 $DIR
 }
 
 function retry() {
@@ -617,7 +605,7 @@ function run() {
 function test_upgrades() {
     run stop
     run dependencies
-#    run build_all
+    run build_all
     run test_successful_upgrades
     run test_bug_storage_misplace
     run test_bug_storage_merged