diff --git a/app-hooks/post-installation/install-calendar-app.sh b/app-hooks/post-installation/install-calendar-app.sh
index 2fe4f1f..465ba12 100755
--- a/app-hooks/post-installation/install-calendar-app.sh
+++ b/app-hooks/post-installation/install-calendar-app.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e  # Exit on any error
+set -euox pipefail
 
 echo "Installing and configuring Calendar app..."
 
diff --git a/app-hooks/post-installation/install-contacts-app.sh b/app-hooks/post-installation/install-contacts-app.sh
index 7a97d68..1cf27d5 100755
--- a/app-hooks/post-installation/install-contacts-app.sh
+++ b/app-hooks/post-installation/install-contacts-app.sh
@@ -1,3 +1,5 @@
 #!/bin/bash
 
+set -euox pipefail
+
 php /var/www/html/occ app:enable contacts
diff --git a/app-hooks/post-installation/install-deck-app.sh b/app-hooks/post-installation/install-deck-app.sh
index 8594e3b..75944e6 100755
--- a/app-hooks/post-installation/install-deck-app.sh
+++ b/app-hooks/post-installation/install-deck-app.sh
@@ -1,3 +1,5 @@
 #!/bin/bash
 
+set -euox pipefail
+
 php /var/www/html/occ app:enable deck
diff --git a/app-hooks/post-installation/install-notes-app.sh b/app-hooks/post-installation/install-notes-app.sh
index f32392e..8704e39 100755
--- a/app-hooks/post-installation/install-notes-app.sh
+++ b/app-hooks/post-installation/install-notes-app.sh
@@ -1,3 +1,5 @@
 #!/bin/bash
 
+set -euox pipefail
+
 php /var/www/html/occ app:enable notes
diff --git a/app-hooks/post-installation/install-oidc-app.sh b/app-hooks/post-installation/install-oidc-app.sh
index a09f708..3c18998 100755
--- a/app-hooks/post-installation/install-oidc-app.sh
+++ b/app-hooks/post-installation/install-oidc-app.sh
@@ -1,13 +1,21 @@
 #!/bin/bash
-set -e
 
-echo "Installing and configuring OIDC app for testing..."
+set -euox pipefail
 
-# Enable the OIDC app
+echo "Installing and configuring OIDC apps for testing..."
+
+# Enable the OIDC Identity Provider app
+php /var/www/html/occ app:install oidc || true
 php /var/www/html/occ app:enable oidc
 
-# Configure OIDC for testing with dynamic client registration enabled
-# Note: The correct config key is 'dynamic_client_registration', not 'allow_dynamic_client_registration'
+# Enable the user_oidc app (OIDC client for bearer token validation)
+php /var/www/html/occ app:install user_oidc || true
+php /var/www/html/occ app:enable user_oidc
+
+# Configure OIDC Identity Provider with dynamic client registration enabled
 php /var/www/html/occ config:app:set oidc dynamic_client_registration --value='true'
 
-echo "OIDC app installed and configured successfully"
+# Configure user_oidc to validate bearer tokens from the OIDC Identity Provider
+php /var/www/html/occ config:system:set user_oidc oidc_provider_bearer_validation --value=true --type=boolean
+
+echo "OIDC apps installed and configured successfully"
diff --git a/app-hooks/post-installation/install-tables-app.sh b/app-hooks/post-installation/install-tables-app.sh
index 53c8583..21dbe5a 100755
--- a/app-hooks/post-installation/install-tables-app.sh
+++ b/app-hooks/post-installation/install-tables-app.sh
@@ -1,3 +1,5 @@
 #!/bin/bash
 
+set -euox pipefail
+
 php /var/www/html/occ app:enable tables