diff --git a/.vib/mariadb/goss/goss.yaml b/.vib/mariadb/goss/goss.yaml
index 1f3483fb9c0e..a32e7f6707ac 100644
--- a/.vib/mariadb/goss/goss.yaml
+++ b/.vib/mariadb/goss/goss.yaml
@@ -10,6 +10,7 @@ gossfile:
   ../../common/goss/templates/check-broken-symlinks.yaml: {}
   ../../common/goss/templates/check-ca-certs.yaml: {}
   ../../common/goss/templates/check-directories.yaml: {}
+  ../../common/goss/templates/check-files.yaml: {}
   ../../common/goss/templates/check-linked-libraries.yaml: {}
   ../../common/goss/templates/check-sed-in-place.yaml: {}
   ../../common/goss/templates/check-spdx.yaml: {}
diff --git a/.vib/mariadb/goss/mariadb.yaml b/.vib/mariadb/goss/mariadb.yaml
index 8a202a84721d..3b0ce415b792 100644
--- a/.vib/mariadb/goss/mariadb.yaml
+++ b/.vib/mariadb/goss/mariadb.yaml
@@ -12,8 +12,3 @@ file:
   /opt/bitnami/mariadb/lib/plugin:
     exists: true
     filetype: symlink
-  # Check the plugins added at compilation time are available
-  /opt/bitnami/mariadb/plugin/auth_pam.so:
-    exists: true
-    filetype: file
-    mode: "0644"
diff --git a/.vib/mariadb/goss/vars.yaml b/.vib/mariadb/goss/vars.yaml
index 7773d1206478..ac03d5202fa3 100644
--- a/.vib/mariadb/goss/vars.yaml
+++ b/.vib/mariadb/goss/vars.yaml
@@ -10,6 +10,9 @@ directories:
       - /opt/bitnami/mariadb/conf/bitnami
       - /opt/bitnami/mariadb/logs
       - /opt/bitnami/mariadb/tmp
+files:
+  - paths:
+      - /opt/bitnami/mariadb/plugin/auth_pam.so
 root_dir: /opt/bitnami
 version:
   bin_name: mysql
diff --git a/.vib/postgresql-repmgr/goss/vars.yaml b/.vib/postgresql-repmgr/goss/vars.yaml
index a854170d99ef..a2dc97db4d71 100644
--- a/.vib/postgresql-repmgr/goss/vars.yaml
+++ b/.vib/postgresql-repmgr/goss/vars.yaml
@@ -21,7 +21,6 @@ directories:
   - paths:
       - /opt/bitnami/repmgr/events
 files:
-  - mode: "0775"
-    paths:
+  - paths:
       - /opt/bitnami/repmgr/events/router.sh
 root_dir: /opt/bitnami