diff --git a/lib/lib.sh b/lib/lib.sh
index 2d1be2e..9d836db 100644
--- a/lib/lib.sh
+++ b/lib/lib.sh
@@ -34,7 +34,7 @@ export DOT_FORGEJO_CURL=$DIR/forgejo-curl
 export DOT=$DOT_FORGEJO_CURL # for backward compatibility with forgejo-curl.sh 1.0.0
 : ${FORGEJO_USER:=root}
 : ${FORGEJO_PASSWORD:=admin1234}
-RELEASE_NUMBERS_AND_DEV="$(for r in $RELEASE_NUMBERS ; do echo -n $r $r-dev ; done)"
+RELEASE_NUMBERS_AND_DEV="$(for r in $RELEASE_NUMBERS ; do echo -n $r-dev $r ; done)"
 ORGANIZATIONS=$(cat $LIB_DIR/ORGANIZATIONS)
 
 function log_info() {
diff --git a/packages/alpine-7.0-dev b/packages/alpine-7.0-dev
index a2389c0..b34295a 120000
--- a/packages/alpine-7.0-dev
+++ b/packages/alpine-7.0-dev
@@ -1 +1 @@
-alpine-7.0-test
\ No newline at end of file
+alpine-7.0
\ No newline at end of file
diff --git a/packages/alpine-7.0-test/package-source/forgejo-2173/APKBUILD b/packages/alpine-7.0/package-source/forgejo-2173/APKBUILD
similarity index 100%
rename from packages/alpine-7.0-test/package-source/forgejo-2173/APKBUILD
rename to packages/alpine-7.0/package-source/forgejo-2173/APKBUILD
diff --git a/packages/alpine-7.0-test/package-source/forgejo-2173/forgejo_2173 b/packages/alpine-7.0/package-source/forgejo-2173/forgejo_2173
similarity index 100%
rename from packages/alpine-7.0-test/package-source/forgejo-2173/forgejo_2173
rename to packages/alpine-7.0/package-source/forgejo-2173/forgejo_2173
diff --git a/packages/alpine-7.0-test/package-source/forgejo-2173/forgejo_2173.init b/packages/alpine-7.0/package-source/forgejo-2173/forgejo_2173.init
similarity index 100%
rename from packages/alpine-7.0-test/package-source/forgejo-2173/forgejo_2173.init
rename to packages/alpine-7.0/package-source/forgejo-2173/forgejo_2173.init
diff --git a/packages/alpine-7.0-test/package-source/forgejo-2174/APKBUILD b/packages/alpine-7.0/package-source/forgejo-2174/APKBUILD
similarity index 100%
rename from packages/alpine-7.0-test/package-source/forgejo-2174/APKBUILD
rename to packages/alpine-7.0/package-source/forgejo-2174/APKBUILD
diff --git a/packages/alpine-7.0-test/package-source/forgejo-2174/forgejo_2174 b/packages/alpine-7.0/package-source/forgejo-2174/forgejo_2174
similarity index 100%
rename from packages/alpine-7.0-test/package-source/forgejo-2174/forgejo_2174
rename to packages/alpine-7.0/package-source/forgejo-2174/forgejo_2174
diff --git a/packages/alpine-7.0-test/package-source/forgejo-2174/forgejo_2174.init b/packages/alpine-7.0/package-source/forgejo-2174/forgejo_2174.init
similarity index 100%
rename from packages/alpine-7.0-test/package-source/forgejo-2174/forgejo_2174.init
rename to packages/alpine-7.0/package-source/forgejo-2174/forgejo_2174.init
diff --git a/packages/alpine-7.0-test/test.sh b/packages/alpine-7.0/test.sh
similarity index 100%
rename from packages/alpine-7.0-test/test.sh
rename to packages/alpine-7.0/test.sh
diff --git a/packages/alpine.sh b/packages/alpine.sh
index b3e5b5d..8a21f17 100644
--- a/packages/alpine.sh
+++ b/packages/alpine.sh
@@ -17,7 +17,7 @@ function test_packages_alpine_version() {
 
 function test_packages_alpine() {
     for alpine_version in 3.18 3.19 ; do
-	for forgejo_version in 1.21 7.0-test 7.0-dev ; do
+	for forgejo_version in 1.21 $RELEASE_NUMBERS_AND_DEV ; do
 	    test_packages_alpine_version $alpine_version $forgejo_version
 	done
     done
diff --git a/upgrade/upgrade.sh b/upgrade/upgrade.sh
index 5f69abc..bfb04c0 100755
--- a/upgrade/upgrade.sh
+++ b/upgrade/upgrade.sh
@@ -38,7 +38,7 @@ function test_successful_upgrades() {
 	fixture_assert
 	doctor_run $version
 
-        for version in 1.19 1.20 1.21 $RELEASE_NUMBERS_AND_DEV ; do
+        for version in 1.19 1.20 1.21 $(for r in $RELEASE_NUMBERS ; do echo -n $r $r-dev ; done) ; do
             stop
             log_info "run $version"
             start $version