diff --git a/ansible/validate.yml b/ansible/validate.yml
index e307ec649..86873927d 100644
--- a/ansible/validate.yml
+++ b/ansible/validate.yml
@@ -26,14 +26,6 @@
     - import_role:
         name: stackhpc.openhpc
         tasks_from: validate.yml
-    - assert:
-        that: "'enable_configless' in openhpc_config.SlurmctldParameters | default([])"
-        fail_msg: |
-          'enable_configless' not found in openhpc_config.SlurmctldParameters - is variable openhpc_config overridden?
-          Additional slurm.conf parameters should be provided using variable openhpc_config_extra.
-        success_msg: Checked Slurm will be configured for configless operation
-      delegate_to: localhost
-      run_once: true
 
 - name: Validate filebeat configuration
   hosts: filebeat
diff --git a/environments/common/inventory/group_vars/all/openhpc.yml b/environments/common/inventory/group_vars/all/openhpc.yml
index 005bdf04d..aff8475e8 100644
--- a/environments/common/inventory/group_vars/all/openhpc.yml
+++ b/environments/common/inventory/group_vars/all/openhpc.yml
@@ -42,11 +42,9 @@ openhpc_packages_default:
   - podman-compose
 openhpc_packages_extra: []
 openhpc_packages: "{{ (openhpc_packages_default + openhpc_packages_extra) | select | list }}"
-openhpc_munge_key: "{{ vault_openhpc_mungekey | b64decode }}"
+openhpc_munge_key_b64: "{{ vault_openhpc_mungekey }}"
 openhpc_login_only_nodes: login
 openhpc_config_default:
-  SlurmctldParameters:
-    - enable_configless
   TaskPlugin: task/cgroup,task/affinity
   ReturnToService: 2 # is stackhpc.openhpc default, but templating bug means it is needed here too
 openhpc_config_rebuild:
diff --git a/requirements.yml b/requirements.yml
index 729280df5..45e60c226 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -4,7 +4,7 @@ roles:
     version: v25.3.2
     name: stackhpc.nfs
   - src: https://github.com/stackhpc/ansible-role-openhpc.git
-    version: v1.0.0
+    version: feat/only-configless # TODO: bump to release
     name: stackhpc.openhpc
   - src: https://github.com/stackhpc/ansible-node-exporter.git
     version: stackhpc