diff --git a/defaults/openstack/policy/all.yml b/defaults/openstack/policy/all.yml
index 3e0975a..ccb81a4 100644
--- a/defaults/openstack/policy/all.yml
+++ b/defaults/openstack/policy/all.yml
@@ -1448,6 +1448,13 @@
       "load-balancer:read-quota-global": "rule:load-balancer:global_observer or role:load-balancer_quota_admin or rule:load-balancer:admin"
       "load-balancer:write-quota": "role:load-balancer_quota_admin or rule:load-balancer:admin"
       "os_load-balancer_api:loadbalancer:put_failover": "rule:load-balancer:admin"
+    panko_default_policy_ocata: {}
+    panko_default_policy_pike:
+      "context_is_admin": "role:admin"
+      "segregation": "rule:context_is_admin"
+      "telemetry:events:index": ""
+      "telemetry:events:show": ""
+    panko_default_policy_queens: ${_param:panko_default_policy_pike}
     telemetry_default_policy_ocata: {}
     telemetry_default_policy_pike:
       "context_is_admin": "role:admin"
diff --git a/defaults/openstack/policy/panko.yml b/defaults/openstack/policy/panko.yml
new file mode 100644
index 0000000..d2c88ae
--- /dev/null
+++ b/defaults/openstack/policy/panko.yml
@@ -0,0 +1,6 @@
+classes:
+- system.defaults.openstack.policy.all
+parameters:
+  panko:
+    server:
+      policy: ${_param:panko_default_policy_${_param:openstack_version}}
diff --git a/keystone/client/core.yml b/keystone/client/core.yml
index c965e6f..0e0c46d 100644
--- a/keystone/client/core.yml
+++ b/keystone/client/core.yml
@@ -38,6 +38,7 @@
                   options: ${_param:openstack_service_user_options}
         admin_identity:
           admin:
+            api_version: ''
             user: admin
             password: ${_param:keystone_admin_password}
             project: admin
diff --git a/keystone/client/single.yml b/keystone/client/single.yml
index 20b2b91..b69d030 100644
--- a/keystone/client/single.yml
+++ b/keystone/client/single.yml
@@ -46,6 +46,7 @@
                   options: ${_param:openstack_service_user_options}
         admin_identity:
           admin:
+            api_version: ''
             user: admin
             password: ${_param:keystone_admin_password}
             project: admin