diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 57db732..207da11 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -60,10 +60,15 @@ jobs:
           - {os: debian, codename: bullseye, image_owner: , package_type: deb}
           # - {os: debian, codename: bullseye, image_owner: i386/, package_type: deb, labels: [i386,docker]}
           - {os: debian, codename: bullseye, image_owner: arm32v7/, package_type: deb, labels: [arm,docker]}
+          - {os: debian, codename: bookworm, image_owner: , package_type: deb}
+          # - {os: debian, codename: bookworm, image_owner: i386/, package_type: deb, labels: [i386,docker]}
+          - {os: debian, codename: bookworm, image_owner: arm32v7/, package_type: deb, labels: [arm,docker]}
+          - {os: debian, codename: bookworm, image_owner: arm64v8/, package_type: deb, labels: [arm,docker]}
           - {os: ubuntu, codename: focal, image_owner: , package_type: deb}
           - {os: ubuntu, codename: jammy, image_owner: , package_type: deb}
           # - {os: raspbian, codename: buster, image_owner: igagis/, package_type: deb, labels: [arm,docker]}
           - {os: raspbian, codename: bullseye, image_owner: igagis/, package_type: deb, labels: [arm,docker]}
+          - {os: raspbian, codename: bookworm, image_owner: igagis/, package_type: deb, labels: [arm,docker]}
     runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
     container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
     name: linux - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
diff --git a/src/makefile b/src/makefile
index c3e0ba0..6fdbe47 100644
--- a/src/makefile
+++ b/src/makefile
@@ -45,13 +45,7 @@ $(.RECIPEPREFIX)$(a)$(this_cc) -ObjC++ -c -o "$$$$@" $$(this_cxxflags) $$(OBJCXX
     this_ldlibs += -lruis-render-$1
 
     ifeq ($1,opengles)
-        ifeq ($(prorab_linux),raspbian)
-            this_cxxflags += -DRUISAPP_RASPBERRYPI -isystem /opt/vc/include
-            this_ldflags += -L/opt/vc/lib
-            this_ldlibs += -lbrcmEGL
-        else
-            this_ldlibs += -lEGL
-        endif
+        this_ldlibs += -lEGL
     endif
 
     $$(eval $$(prorab-build-lib))