diff --git a/.crystalintegration.yml b/.crystalintegration.yml
index e34bc8a..b7bef8e 100644
--- a/.crystalintegration.yml
+++ b/.crystalintegration.yml
@@ -17,6 +17,7 @@ variables:
   - &deb_test_image_jammy 'sc.cryxtal.org/ci-img/deb-test-ubuntu:jammy'
   - &deb_test_image_focal 'sc.cryxtal.org/ci-img/deb-test-ubuntu:focal'
   - &deb_test_image_kinetic 'sc.cryxtal.org/ci-img/deb-test-ubuntu:kinetic'
+  - &deb_test_image_lunar 'sc.cryxtal.org/ci-img/deb-test-ubuntu:lunar'
   - &build_submodule 'forgejo'
   - &goproxy_override ''
   - &goproxy_setup |-
@@ -221,6 +222,12 @@ pipeline:
     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
@@ -239,7 +246,7 @@ pipeline:
 
   test-inst-buster-bin:
     image: *deb_test_image_buster
-    group: pkg-test-3
+    group: pkg-test-4
     commands:
     - ./.ci-make.sh install-run-test ./forgejo-bin_*_amd64.deb
     when:
@@ -271,7 +278,15 @@ pipeline:
 
   test-inst-kinetic-bin:
     image: *deb_test_image_kinetic
-    group: pkg-test-4
+    group: pkg-test-5
+    commands:
+    - ./.ci-make.sh install-run-test ./forgejo-bin_*_amd64.deb
+    when:
+      event: [ tag ]
+
+  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: