diff --git a/roles/irods_icat/defaults/main.yml b/roles/irods_icat/defaults/main.yml
index dab8668b8..50e6b70e9 100644
--- a/roles/irods_icat/defaults/main.yml
+++ b/roles/irods_icat/defaults/main.yml
@@ -11,7 +11,7 @@ irods_database_name: ICAT
 irods_database_port: "{{ 6432 if enable_pgbouncer else 5432 }}"
 irods_database_user: irodsdb               # The iRODS database username
 irods_database_password: irodsdev          # The password for the iRODS database username
-irods_authentication_scheme: PAM           # iRODS authentication method: "Native" or "PAM"
+irods_authentication_scheme: pam_password  # iRODS authentication method: "native" or "pam_password"
 irods_zone: tempZone                       # The name of the iRODS Zone
 irods_default_resc: irodsResc              # iRODS default resource name
 irods_port_range_begin: 20000
diff --git a/roles/irods_icat/tasks/main.yml b/roles/irods_icat/tasks/main.yml
index f01eec9d7..057e55260 100644
--- a/roles/irods_icat/tasks/main.yml
+++ b/roles/irods_icat/tasks/main.yml
@@ -539,4 +539,4 @@
 
 - name: Setup PAM
   ansible.builtin.include_tasks: setup_pam.yml
-  when: irods_authentication_scheme == "PAM"
+  when: irods_authentication_scheme == "pam_password"
diff --git a/roles/irods_resource/defaults/main.yml b/roles/irods_resource/defaults/main.yml
index 8d8afc24b..fc9e31826 100644
--- a/roles/irods_resource/defaults/main.yml
+++ b/roles/irods_resource/defaults/main.yml
@@ -5,7 +5,7 @@
 irods_admin: rods                          # iRODS admin username
 irods_password: rods                       # iRODS admin password
 irods_icat_fqdn: icat.yoda.test
-irods_authentication_scheme: PAM           # iRODS authentication method: "Native" or "PAM"
+irods_authentication_scheme: pam_password  # iRODS authentication method: "native" or "pam_password"
 irods_zone: tempZone                       # The name of the iRODS Zone
 irods_default_resc: irodsResc              # iRODS default resource name
 irods_port_range_begin: 20000
diff --git a/roles/yoda_davrods/defaults/main.yml b/roles/yoda_davrods/defaults/main.yml
index ca449292c..57c2ededa 100644
--- a/roles/yoda_davrods/defaults/main.yml
+++ b/roles/yoda_davrods/defaults/main.yml
@@ -14,7 +14,7 @@ yoda_portal_fqdn: portal.yoda.test          # Yoda Portal fully qualified domain
 
 # iRODS configuration.
 irods_icat_fqdn: icat.yoda.test
-irods_authentication_scheme: PAM           # iRODS authentication method: "Native" or "PAM"
+irods_authentication_scheme: pam_password  # iRODS authentication method: "native" or "pam_password"
 irods_zone: tempZone                       # The name of the iRODS Zone
 irods_default_resc: irodsResc              # iRODS default resource name
 irods_icat_port: 1247
diff --git a/roles/yoda_portal/defaults/main.yml b/roles/yoda_portal/defaults/main.yml
index 73326c45f..a779ee017 100644
--- a/roles/yoda_portal/defaults/main.yml
+++ b/roles/yoda_portal/defaults/main.yml
@@ -42,7 +42,7 @@ yoda_portal_wsgi_daemon_threads: 15
 
 # iRODS configuration.
 irods_default_resc: irodsResc              # iRODS default resource name
-irods_authentication_scheme: PAM           # iRODS authentication method: "Native" or "PAM"
+irods_authentication_scheme: pam_password  # iRODS authentication method: "native" or "pam_password"
 irods_zone: tempZone                       # The name of the iRODS Zone
 irods_icat_fqdn: icat.yoda.test            # iRODS iCAT fully qualified domain name (FQDN)
 irods_icat_port: 1247