diff --git a/.crystalintegration.yml b/.crystalintegration.yml
index 150e48c..ccf55aa 100644
--- a/.crystalintegration.yml
+++ b/.crystalintegration.yml
@@ -53,7 +53,6 @@ steps:
 
   ci-verify:
     image: *ci_verify_image
-    group: deps
     environment:
       BUILD_SUBMODULE: *build_submodule
     commands:
@@ -61,7 +60,6 @@ steps:
 
   deps-frontend:
     image: *nodejs_image
-    group: deps
     environment:
       BUILD_SUBMODULE: *build_submodule
     commands:
@@ -69,7 +67,6 @@ steps:
 
   deps-backend:
     image: *golang_image
-    group: deps
     environment:
       BUILD_SUBMODULE: *build_submodule
       GOPROXY_OVERRIDE: *goproxy_override
@@ -89,7 +86,6 @@ steps:
 
   security-check:
     image: *golang_image
-    group: checks
     environment:
       BUILD_SUBMODULE: *build_submodule
       GOPROXY_OVERRIDE: *goproxy_override
@@ -101,7 +97,6 @@ steps:
 
   build-frontend:
     image: *nodejs_image
-    group: checks
     environment:
       BUILD_SUBMODULE: *build_submodule
     commands:
@@ -109,7 +104,6 @@ steps:
 
   checks-backend:
     image: *forgejo_test_image
-    group: checks
     environment:
       BUILD_SUBMODULE: *build_submodule
       GOPROXY_OVERRIDE: *goproxy_override
@@ -121,7 +115,6 @@ steps:
 
   download-bin-amd64:
     image: *bin_dl_image
-    group: build-main
     commands:
       - ./.ci-make.sh download-binary forgejo-bin-dl
     when:
@@ -129,7 +122,6 @@ steps:
 
   build-forgejo-amd64:
     image: *golang_image
-    group: build-main
     environment:
       BUILD_SUBMODULE: *build_submodule
       GOSUMDB: sum.golang.org
@@ -156,7 +148,6 @@ steps:
 
   package-bullseye:
     image: *deb_build_image
-    group: package
     commands:
       - ./.ci-make.sh package-prep
       - ./.ci-make.sh package-build
@@ -164,7 +155,6 @@ steps:
       
   package-repo:
     image: *deb_build_image
-    group: package
     commands:
       - cd repo-deb
       - ./build.sh
@@ -177,68 +167,57 @@ steps:
 
   test-inst-bookworm:
     image: *deb_test_image_bookworm
-    group: pkg-test-1
     commands:
       - ./.ci-make.sh install-run-test ./forgejo_*_amd64.deb
 
   test-inst-bookworm-user:
     image: *deb_test_image_bookworm
-    group: pkg-test-1
     commands:
       - ./.ci-make.sh test-userinst-prep
       - ./.ci-make.sh install-run-test ./forgejo_*_amd64.deb
 
   test-inst-bullseye-sqlite:
     image: *deb_test_image_bullseye
-    group: pkg-test-1
     commands:
       - ./.ci-make.sh install-run-test ./forgejo-sqlite_*_amd64.deb
 
   test-inst-bookworm-sqlite:
     image: *deb_test_image_bookworm
-    group: pkg-test-1
     commands:
       - ./.ci-make.sh install-run-test ./forgejo-sqlite_*_amd64.deb
 
   test-inst-buster-sqlite:
     image: *deb_test_image_buster
-    group: pkg-test-2
     commands:
       - ./.ci-make.sh install-run-test ./forgejo-sqlite_*_amd64.deb
 
   test-inst-sid-sqlite:
     image: *deb_test_image_sid
-    group: pkg-test-2
     commands:
       - ./.ci-make.sh install-run-test ./forgejo-sqlite_*_amd64.deb
 
   test-inst-jammy-sqlite:
     image: *deb_test_image_jammy
-    group: pkg-test-2
     commands:
       - ./.ci-make.sh install-run-test ./forgejo-sqlite_*_amd64.deb
 
   test-inst-focal-sqlite:
     image: *deb_test_image_focal
-    group: pkg-test-2
     commands:
       - ./.ci-make.sh install-run-test ./forgejo-sqlite_*_amd64.deb
 
   test-inst-kinetic-sqlite:
     image: *deb_test_image_kinetic
-    group: pkg-test-3
     commands:
       - ./.ci-make.sh install-run-test ./forgejo-sqlite_*_amd64.deb
 
   test-inst-lunar-sqlite:
     image: *deb_test_image_lunar
-    group: pkg-test-3
     commands:
       - ./.ci-make.sh install-run-test ./forgejo-sqlite_*_amd64.deb
 
   test-inst-bullseye-bin:
     image: *deb_test_image_bullseye
-    group: pkg-test-3
     commands:
       - ./.ci-make.sh install-run-test ./forgejo-bin_*_amd64.deb
     when:
@@ -246,7 +225,6 @@ steps:
 
   test-inst-bookworm-bin:
     image: *deb_test_image_bookworm
-    group: pkg-test-3
     commands:
       - ./.ci-make.sh install-run-test ./forgejo-bin_*_amd64.deb
     when:
@@ -254,7 +232,6 @@ steps:
 
   test-inst-buster-bin:
     image: *deb_test_image_buster
-    group: pkg-test-4
     commands:
       - ./.ci-make.sh install-run-test ./forgejo-bin_*_amd64.deb
     when:
@@ -262,7 +239,6 @@ steps:
 
   test-inst-sid-bin:
     image: *deb_test_image_sid
-    group: pkg-test-4
     commands:
       - ./.ci-make.sh install-run-test ./forgejo-bin_*_amd64.deb
     when:
@@ -270,7 +246,6 @@ steps:
 
   test-inst-jammy-bin:
     image: *deb_test_image_jammy
-    group: pkg-test-4
     commands:
       - ./.ci-make.sh install-run-test ./forgejo-bin_*_amd64.deb
     when:
@@ -278,7 +253,6 @@ steps:
 
   test-inst-focal-bin:
     image: *deb_test_image_focal
-    group: pkg-test-4
     commands:
       - ./.ci-make.sh install-run-test ./forgejo-bin_*_amd64.deb
     when:
@@ -286,7 +260,6 @@ steps:
 
   test-inst-kinetic-bin:
     image: *deb_test_image_kinetic
-    group: pkg-test-5
     commands:
       - ./.ci-make.sh install-run-test ./forgejo-bin_*_amd64.deb
     when:
@@ -294,7 +267,6 @@ steps:
 
   test-inst-lunar-bin:
     image: *deb_test_image_lunar
-    group: pkg-test-5
     commands:
       - ./.ci-make.sh install-run-test ./forgejo-bin_*_amd64.deb
     when:
@@ -302,13 +274,11 @@ steps:
       
   test-repo-bookworm-sqlite:
     image: *deb_test_image_bookworm
-    group: pkg-test-5
     commands:
       - ./.ci-make.sh install-repo-test ./repo-deb/forgejo-deb-repo_0-0_all.deb forgejo-sqlite
 
   upload-crystalcommit:
     image: woodpeckerci/plugin-gitea-release
-    group: upload
     settings:
       base_url: https://sc.cryxtal.org
       files:
@@ -323,7 +293,6 @@ steps:
 
   upload-codeberg:
     image: woodpeckerci/plugin-gitea-release
-    group: upload
     settings:
       base_url: https://codeberg.org
       files:
@@ -338,7 +307,6 @@ steps:
 
   publish-apt-repo:
     image: *ci_verify_image
-    group: upload
     environment:
       FORGEJO_SITE: https://code.forgejo.org
       FORGEJO_OWNER: forgejo-contrib