diff --git a/.github/workflows/phpdoc.yml b/.github/workflows/phpdoc.yml
index f192303..14eee9d 100644
--- a/.github/workflows/phpdoc.yml
+++ b/.github/workflows/phpdoc.yml
@@ -40,7 +40,7 @@ jobs:
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: 7.4
+        php-version: '8.1'
         extensions: bcmath, ctype, curl, dom, gd, gettext, iconv, imagick, json, ldap, mbstring, mysql, opcache, openssl, pcntl, pdo, posix, redis, soap, sockets, sqlite, tokenizer, xmlwriter
         ini-values: post_max_size=512M, max_execution_time=360
         coverage: xdebug
@@ -59,8 +59,9 @@ jobs:
         chmod +x "${BIN_DIR}/phpdocumentor"
         echo "Creating UUT related dir in docu repo"
         mkdir -p $UUT_DIR/phpdoc-git/${GITHUB_REF##*/}/${REPO}/
-        ## TODO: check for and include lib, src, app (if they exist) but not test or script dirs
-        $BIN_DIR/phpdocumentor -d $UUT_DIR/lib/ -d $UUT_DIR/src/ -d $UUT_DIR/app/ -t "${UUT_DIR}/phpdoc-git/${GITHUB_REF##*/}/${REPO}/"
+        ## Look into any of lib, src, app (if they exist) but not test, migration, bin, locale or script dirs
+        cd $UUT_DIR
+        $BIN_DIR/phpdocumentor -d lib/ -d src/ -d app/ -t "phpdoc-git/${GITHUB_REF##*/}/${REPO}/"
         cd ${UUT_DIR}/phpdoc-git
         git add "${GITHUB_REF##*/}/${REPO}"
         php indexer.php ${GITHUB_REF##*/} $REPO
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6c3ee41..ee161f7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -8,6 +8,7 @@ on:
       - FRAMEWORK_6_0
 env:
   components: "/home/runner/.composer/web/components/bin/horde-components -c /home/runner/.composer/web/components/config/maintaina.conf.dist"
+  COMPOSER_ALLOW_SUPERUSER: 1
 
 jobs:
   run:
@@ -15,7 +16,7 @@ jobs:
     strategy:
       matrix:
         operating-system: ['ubuntu-20.04']
-        php-versions: ['7.4']
+        php-versions: ['8.1']
     steps:
     - name: Setup git
       run:  |
@@ -39,6 +40,7 @@ jobs:
           composer global config repositories.0 composer https://horde-satis.maintaina.com
           composer global config minimum-stability dev
           composer config --no-plugins --global allow-plugins.horde/horde-installer-plugin true
+          composer global require horde/horde-installer-plugin "2.3.0"
           composer global require horde/components "dev-FRAMEWORK_6_0"
     - name: write changelog
       run: |
diff --git a/.github/workflows/update-satis.yml b/.github/workflows/update-satis.yml
index 5049bd0..41e78af 100644
--- a/.github/workflows/update-satis.yml
+++ b/.github/workflows/update-satis.yml
@@ -38,7 +38,7 @@ jobs:
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: 7.4
+        php-version: '8.2'
         extensions: bcmath, ctype, curl, dom, gd, gettext, iconv, imagick, json, ldap, mbstring, mysql, opcache, openssl, pcntl, pdo, posix, redis, soap, sockets, sqlite, tokenizer, xmlwriter
         ini-values: post_max_size=512M, max_execution_time=3600
         coverage: xdebug