diff --git a/grafana-grafonnet.yaml b/grafana-grafonnet.yaml
index ead3f4a8025..e183648b95d 100644
--- a/grafana-grafonnet.yaml
+++ b/grafana-grafonnet.yaml
@@ -1,7 +1,7 @@
 package:
   name: grafana-grafonnet
   version: 0.0_git20231114
-  epoch: 2
+  epoch: 3
   description: Jsonnet library for generating Grafana dashboards
   copyright:
     - license: Apache-2.0
@@ -29,12 +29,40 @@ pipeline:
       install -m755 *.json "${{targets.destdir}}"/opt/jsonnet/grafonnet/
 
       for i in clean custom raw; do
-        mkdir -p ${{targets.destdir}}/opt/jsonnet/grafonnet/$i
-        mv $i "${{targets.destdir}}"/opt/jsonnet/grafonnet/$i/
+        if [ -d "$i" ]; then
+          cp -r "$i" "${{targets.destdir}}"/opt/jsonnet/grafonnet/
+        fi
       done
 
   - uses: strip
 
+subpackages:
+  - name: ${{package.name}}-bitnami-compat
+    description: "compat package for bitnami/grafonnet library"
+    pipeline:
+      - uses: bitnami/compat
+        with:
+          image: grafana-operator
+          version-path: 5/debian-12
+      - runs: |
+          mkdir -p ${{targets.subpkgdir}}/opt/bitnami/grafonnet-lib/
+          chmod g+rwX ${{targets.subpkgdir}}/opt/bitnami
+          ln -sf /opt/jsonnet/grafonnet ${{targets.subpkgdir}}/opt/bitnami/grafonnet-lib/grafonnet
+    test:
+      pipeline:
+        - runs: |
+            ls -l /opt/bitnami/grafonnet-lib/grafonnet
+
+test:
+  pipeline:
+    - runs: |
+        test -f /opt/jsonnet/grafonnet/alerting.libsonnet || (echo "Missing alerting.libsonnet" && exit 1)
+        test -f /opt/jsonnet/grafonnet/jsonnetfile.json || (echo "Missing jsonnetfile.json" && exit 1)
+        for dir in clean custom raw; do
+          test -d /opt/jsonnet/grafonnet/$dir || (echo "Missing $dir directory" && exit 1)
+        done
+        test -f /opt/jsonnet/grafonnet/clean/dashboard.libsonnet || (echo "Missing clean/dashboard.libsonnet" && exit 1)
+
 update:
   enabled: false
   exclude-reason: no releases or tags available