diff --git a/etherpad/application.yml b/etherpad/application.yml
index f7bfe6f..9a19f6c 100644
--- a/etherpad/application.yml
+++ b/etherpad/application.yml
@@ -1,9 +1,8 @@
 ---
-apiVersion: codemowers.io/v1alpha1
-kind: OIDCGWMiddlewareClient
+apiVersion: codemowers.cloud/v1beta1
+kind: OIDCMiddlewareClient
 metadata:
-  name: sso
-  namespace: etherpad
+  name: etherpad
 spec:
   displayName: Etherpad
   uri: 'https://pad.k-space.ee/'
diff --git a/whoami-oidc/application.yaml b/whoami-oidc/application.yaml
index a3b015b..32197dd 100644
--- a/whoami-oidc/application.yaml
+++ b/whoami-oidc/application.yaml
@@ -1,10 +1,11 @@
 ---
-apiVersion: codemowers.io/v1alpha1
-kind: OIDCGWClient
+apiVersion: codemowers.cloud/v1beta1
+kind: OIDCClient
 metadata:
   name: whoami-oidc
+  namespace: whoami-oidc
 spec:
-  displayName: Whoami (oidc-tester-app)
+  displayName: Whoami OIDC
   uri: https://whoami-oidc.k-space.ee
   redirectUris:
     - https://whoami-oidc.k-space.ee/auth/callback
@@ -16,7 +17,6 @@ spec:
   availableScopes:
     - openid
     - profile
-  tokenEndpointAuthMethod: client_secret_post
   pkce: false
 ---
 apiVersion: apps/v1