diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml
index 9d79fdd0..96f2adc3 100644
--- a/.github/workflows/pull_request.yaml
+++ b/.github/workflows/pull_request.yaml
@@ -11,13 +11,25 @@ on:
 
 jobs:
   analyse-changed-services:
-    uses: ./.github/workflows/get-changed-services.yaml
+    runs-on: ubuntu-latest
+    outputs:
+      CHANGED_PACKAGES: ${{ steps.changed-packages.outputs.CHANGED_PACKAGES }}
+    steps:
+      - name: Analyze changed services
+        run: |
+          pnpm list -r --json --filter "...[$SINCE]" --changed-files-ignore-pattern="**/(garden.yml|.dockerignore)" | jq '[.[] | select(.private == false) | {name, path}]' > ./tmp.json
+          CHANGED_PACKAGES=$(jq '[.[] | .name]' ./tmp.json)
+          echo CHANGED_PACKAGES=$CHANGED_PACKAGES  >> $GITHUB_OUTPUT
+          echo CHANGED_PACKAGES=$CHANGED_PACKAGES
+        id: changed-packages
+        env:
+          SINCE: master
 
   build-and-push:
     uses: ./.github/workflows/build-and-push.yaml
     needs: analyse-changed-services
     with:
-      changedPackages: ${{ needs.analyse-changed-services.outputs.CHANGED_PACKAGES }}
+      changedPackages: ${{fromJson(needs.analyse-changed-services.outputs.CHANGED_PACKAGES)}}
     secrets:
       DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
       DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
diff --git a/bundestag.io/admin/src/app/list/past/page.tsx b/bundestag.io/admin/src/app/list/past/page.tsx
index 00184c75..61d7240c 100644
--- a/bundestag.io/admin/src/app/list/past/page.tsx
+++ b/bundestag.io/admin/src/app/list/past/page.tsx
@@ -1,9 +1,11 @@
 import Entry from '../_components/entry';
 import { IProcedure } from '@democracy-deutschland/bundestagio-common';
+import { unstable_noStore as noStore } from 'next/cache';
 
 export const dynamic = 'force-dynamic';
 
 export default async function Page() {
+  noStore();
   const data = await getData();
   return (
     <>
diff --git a/bundestag.io/admin/src/app/list/upcoming/page.tsx b/bundestag.io/admin/src/app/list/upcoming/page.tsx
index 5f9b6a03..f2869bc9 100644
--- a/bundestag.io/admin/src/app/list/upcoming/page.tsx
+++ b/bundestag.io/admin/src/app/list/upcoming/page.tsx
@@ -1,9 +1,11 @@
 import Entry from '../_components/entry';
 import { IProcedure } from '@democracy-deutschland/bundestagio-common';
+import { unstable_noStore as noStore } from 'next/cache';
 
 export const dynamic = 'force-dynamic';
 
 export default async function Page() {
+  noStore();
   const data = await getData();
   return (
     <>