diff --git a/roles/_meta/common_base/meta/main.yml b/roles/_meta/common_base/meta/main.yml
index 797ddeb67..38c92d945 100644
--- a/roles/_meta/common_base/meta/main.yml
+++ b/roles/_meta/common_base/meta/main.yml
@@ -47,3 +47,5 @@ dependencies:
     when: is_local is not defined or not is_local
   - role: debian/vim
     when: is_local is not defined or not is_local
+  - role: debian/bash
+    when: is_local is not defined or not is_local
diff --git a/roles/debian/bash/README.md b/roles/debian/bash/README.md
new file mode 100644
index 000000000..71f64b1f5
--- /dev/null
+++ b/roles/debian/bash/README.md
@@ -0,0 +1,9 @@
+# BASH options
+
+Set system options for the Bourne Again shell.
+
+<!--TOC-->
+<!--ENDTOC-->
+
+<!--ROLEVARS-->
+<!--ENDROLEVARS-->
diff --git a/roles/debian/bash/tasks/main.yml b/roles/debian/bash/tasks/main.yml
new file mode 100644
index 000000000..9fbdc8f74
--- /dev/null
+++ b/roles/debian/bash/tasks/main.yml
@@ -0,0 +1,5 @@
+- name: Copy bash histformat startup option.
+  ansible.builtin.lineinfile:
+    path: /etc/bash.bashrc
+    line: "export HISTTIMEFORMAT='%Y-%m-%d %T  '"
+    create: true
diff --git a/roles/debian/pam_ldap/templates/ldap.conf.j2 b/roles/debian/pam_ldap/templates/ldap.conf.j2
index 3ff87904e..4a1f67974 100644
--- a/roles/debian/pam_ldap/templates/ldap.conf.j2
+++ b/roles/debian/pam_ldap/templates/ldap.conf.j2
@@ -1,5 +1,4 @@
 BASE {{ pam_ldap.lookup_base }}
-URI {{ pam_ldap.endpoints | join(' ') }}
 
 URI {{ pam_ldap.endpoints | join(' ') }}
 {% if pam_ldap.ssl_use_system_ca %}
@@ -15,4 +14,4 @@ pam_lookup_policy yes
 
 {% if pam_ldap.ssl_certificate_check is defined and not pam_ldap.ssl_certificate_check %}
 TLS_REQCERT never
-{% endif %}
+{% endif %}
\ No newline at end of file