diff --git a/modules/openstack_project/files/bash-history.sh b/modules/openstack_project/files/bash-history.sh
new file mode 100644
index 0000000000..16ec2e4e13
--- /dev/null
+++ b/modules/openstack_project/files/bash-history.sh
@@ -0,0 +1 @@
+export HISTTIMEFORMAT="%Y-%m-%dT%T%z "
\ No newline at end of file
diff --git a/modules/openstack_project/manifests/server.pp b/modules/openstack_project/manifests/server.pp
index 3e2213d9ef..746f996789 100644
--- a/modules/openstack_project/manifests/server.pp
+++ b/modules/openstack_project/manifests/server.pp
@@ -248,6 +248,15 @@ class openstack_project::server (
     ensure => absent,
   }
 
+  # Setup RFC3339 bash history timestamps
+  file { '/etc/profile.d/bash-history.sh':
+      ensure  => present,
+      owner   => 'root',
+      group   => 'root',
+      mode    => '0644',
+      source  => 'puppet:///modules/openstack_project/bash-history.sh',
+  }
+
   if $::osfamily == 'Debian' {
     # Ubuntu installs their whoopsie package by default, but it eats through
     # memory and we don't need it on servers