diff --git a/hiera/common.yaml b/hiera/common.yaml
index 9068bb9789..38a243cb7f 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -589,6 +589,7 @@ statusbot_auth_nicks:
 - ianw
 - Shrews
 - dmsimard
+- frickler
 mosquitto_tls_ca_file: |
   -----BEGIN CERTIFICATE-----
   MIIE/DCCA+SgAwIBAgIQFpDDKbZ4BgdRHwWwNEhGyzANBgkqhkiG9w0BAQUFADBv
diff --git a/modules/openstack_project/manifests/users.pp b/modules/openstack_project/manifests/users.pp
index 5a3758b3d4..b4f8abaf47 100644
--- a/modules/openstack_project/manifests/users.pp
+++ b/modules/openstack_project/manifests/users.pp
@@ -257,4 +257,13 @@ class openstack_project::users {
     gid      => 2028,
   }
 
+  @user::virtual::localuser { 'frickler':
+    realname => 'Jens Harbott',
+    key_type => 'ssh-ed25519',
+    sshkeys  => 'AAAAC3NzaC1lZDI1NTE5AAAAIGmc5fbzMptjAb5D86zSH13ZYCbf3QuV1jk9hL0r1qHw',
+    key_id   => 'frickler@os-infra-2017',
+    uid      => 2029,
+    gid      => 2029,
+  }
+
 }
diff --git a/modules/openstack_project/manifests/users_install.pp b/modules/openstack_project/manifests/users_install.pp
index 707da617da..bbb8324238 100644
--- a/modules/openstack_project/manifests/users_install.pp
+++ b/modules/openstack_project/manifests/users_install.pp
@@ -41,6 +41,7 @@ class openstack_project::users_install (
       User::Virtual::Localuser['ianw'],
       User::Virtual::Localuser['shrews'],
       User::Virtual::Localuser['dmsimard'],
+      User::Virtual::Localuser['frickler'],
     )
     user::virtual::disable{'slukjanov':}
     user::virtual::disable{'elizabeth':}
@@ -60,5 +61,6 @@ class openstack_project::users_install (
       user::virtual::disable{'ianw':}
       user::virtual::disable{'shrews':}
       user::virtual::disable{'dmsimard':}
+      user::virtual::disable{'frickler':}
   }
 }
diff --git a/playbooks/clouds_layouts.yml b/playbooks/clouds_layouts.yml
index 79c773f59f..c16989cf51 100644
--- a/playbooks/clouds_layouts.yml
+++ b/playbooks/clouds_layouts.yml
@@ -64,6 +64,8 @@ profiles:
 
             ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDDyXfFj44OTsJZnHbecbYrwA8zXuMiULb+o326maOh3wh5/6fk+MzivkUzJC2uZqAlKvBnNXsrb/07eV1gRjaIQBQJxaV9HQUwMNX7AkjkDzaMXVDjG/JOium90R23gVGMukzp9IamezUscAqAxVK+2C10k3tq8dZ/GeZfHl3NFGRHlIAXsJ/SIQoxJAEA0IQ/8Y50nR1Hp2mV2xsfxH9oZhLR/eiFdhJpNupdfw/oE9+vpCHS8SG88KGeLYbn+EhH6LSCD+6WNthF6oE7NANnScqn1Fl0ZpSd3RlRb+kDVKGqNxfB7EJTeimYvqaYmrTiTZTaTJua5Bj5yBTudqnBgdHCz3xMb2Nv2s2INNcJmP/CKpivYQ8AJs6cVlqRWnLJiNQQYCj+xAXBvY5T0Xq/qOhVifLiWZvZQOTHFWqFP9asZkrGa1mFWIaR9VPQY0FoYlUOT9t6J6TRbzktJIuP5AiOVoJLL6wjZuUMjghHfkYbqtyBqE4BbCY8YF3JSf8jx+9eWy+sD+dRwKXBCrGV0dNidioZR7ZJpBb6ye8wElebjPZizKhppsNpwtRxPfiAM52f55lXGD7IDpz9CZrOKUcV2uc3Rhl50u7T3psZfX7GysZvlnAH+Yr+UM+LPBAabXAfKlMnJp+SskLuOplTeQrvAwMluBmFnla8TnwnxQ== dmsimard@hostname
 
+            ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGmc5fbzMptjAb5D86zSH13ZYCbf3QuV1jk9hL0r1qHw frickler@os-infra-2017
+
   - name: openstackci-flavors
     flavors:
       - name: nodepool