diff --git a/argocd/applications/whoami.yaml b/argocd/applications/whoami.yaml
new file mode 100644
index 0000000..37862c7
--- /dev/null
+++ b/argocd/applications/whoami.yaml
@@ -0,0 +1,20 @@
+---
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: whoami
+  namespace: argocd
+spec:
+  project: default
+  source:
+    repoURL: 'git@git.k-space.ee:k-space/kube.git'
+    path: whoami
+    targetRevision: HEAD
+  destination:
+    server: 'https://kubernetes.default.svc'
+    namespace: whoami
+  syncPolicy:
+    automated:
+      prune: true
+    syncOptions:
+      - CreateNamespace=true
diff --git a/oidc-gateway/whoami.yml b/whoami/application.yml
similarity index 87%
rename from oidc-gateway/whoami.yml
rename to whoami/application.yml
index 92117e1..cf03e08 100644
--- a/oidc-gateway/whoami.yml
+++ b/whoami/application.yml
@@ -45,11 +45,8 @@ metadata:
     kubernetes.io/ingress.class: traefik
     traefik.ingress.kubernetes.io/router.entrypoints: websecure
     traefik.ingress.kubernetes.io/router.tls: "true"
-    traefik.ingress.kubernetes.io/router.middlewares: oidc-gateway-whoami@kubernetescrd
+    traefik.ingress.kubernetes.io/router.middlewares: whoami-whoami@kubernetescrd
 spec:
-  tls:
-  - hosts:
-    - "*.k-space.ee"
   rules:
   - host: "whoami.k-space.ee"
     http:
@@ -61,9 +58,12 @@ spec:
             name: whoami
             port:
               number: 80
+  tls:
+    - hosts:
+      - "*.k-space.ee"
 ---
-apiVersion: codemowers.io/v1alpha1
-kind: OIDCGWMiddlewareClient
+apiVersion: codemowers.cloud/v1beta1
+kind: OIDCMiddlewareClient
 metadata:
   name: whoami
 spec: