diff --git a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-auth-v1/etc/nevis/k8s-ob-auth-d00b0dcbe241793d30daf91c.yaml b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-auth-v1/etc/nevis/k8s-ob-auth-d00b0dcbe241793d30daf91c.yaml
index 7976aeb..c12c870 100644
--- a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-auth-v1/etc/nevis/k8s-ob-auth-d00b0dcbe241793d30daf91c.yaml
+++ b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-auth-v1/etc/nevis/k8s-ob-auth-d00b0dcbe241793d30daf91c.yaml
@@ -45,14 +45,16 @@ spec:
   podDisruptionBudget:
     maxUnavailable: "50%"
   git:
-    tag: "r-9e206f8d793087e7a1996ae58b5ed2116e3e9af7"
+    tag: "r-6084449dd6cbd475bb25d36cf2a36e2ccd661824"
     dir: "DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-auth-v1"
     credentials: "git-credentials"
   keystores:
+  - "ob-auth-sh4r3d-default-default-signer"
   - "ob-auth-v1-default-identity"
   - "ob-auth-v1-ob-realm-accessapp-registration-nevisfido-tls-client"
   truststores:
   - "ob-auth-v1-ob-realm-accessapp-registration-nevisfido-tls-trust"
+  - "ob-auth-v1-default-default-signer-trust"
   - "ob-auth-v1-default-tls-client-trust"
   - "ob-auth-v1-agov-work-internal-trust-store"
   podSecurity:
diff --git a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-auth-v1/etc/nevis/k8s-ob-auth-sh4r3d-default-default-signer-d00b0dcbe241793d30daf91c.yaml b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-auth-v1/etc/nevis/k8s-ob-auth-sh4r3d-default-default-signer-d00b0dcbe241793d30daf91c.yaml
new file mode 100644
index 0000000..430d1bc
--- /dev/null
+++ b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-auth-v1/etc/nevis/k8s-ob-auth-sh4r3d-default-default-signer-d00b0dcbe241793d30daf91c.yaml
@@ -0,0 +1,16 @@
+apiVersion: "operator.nevis-security.ch/v1"
+kind: "NevisKeyStore"
+metadata:
+  name: "ob-auth-sh4r3d-default-default-signer"
+  namespace: "adn-agov-nevisidm-ob-01-uat"
+  labels:
+    deploymentTarget: "ob-auth-v1"
+  annotations:
+    projectKey: "DEFAULT-ADN-AGOV-WORK-OB-PROJECT"
+    patternId: "d00b0dcbe241793d30daf91c"
+spec:
+  cn: "signer"
+  usage: "signer"
+  san:
+    dns: []
+    email: []
diff --git a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-auth-v1/etc/nevis/k8s-ob-auth-v1-default-default-signer-trust-d00b0dcbe241793d30daf91c.yaml b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-auth-v1/etc/nevis/k8s-ob-auth-v1-default-default-signer-trust-d00b0dcbe241793d30daf91c.yaml
new file mode 100644
index 0000000..28a1f00
--- /dev/null
+++ b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-auth-v1/etc/nevis/k8s-ob-auth-v1-default-default-signer-trust-d00b0dcbe241793d30daf91c.yaml
@@ -0,0 +1,14 @@
+apiVersion: "operator.nevis-security.ch/v1"
+kind: "NevisTrustStore"
+metadata:
+  name: "ob-auth-v1-default-default-signer-trust"
+  namespace: "adn-agov-nevisidm-ob-01-uat"
+  labels:
+    deploymentTarget: "ob-auth-v1"
+  annotations:
+    projectKey: "DEFAULT-ADN-AGOV-WORK-OB-PROJECT"
+    patternId: "d00b0dcbe241793d30daf91c"
+spec:
+  keystores:
+  - name: "ob-auth-sh4r3d-default-default-signer"
+    namespace: "adn-agov-nevisidm-ob-01-uat"
diff --git a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-auth-v1/var/opt/keys/own/ob-auth-signer/cert.pem b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-auth-v1/var/opt/keys/own/ob-auth-signer/cert.pem
deleted file mode 100644
index f0e7cf2..0000000
--- a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-auth-v1/var/opt/keys/own/ob-auth-signer/cert.pem
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICwzCCAmmgAwIBAgIRAIgdSB3tN8ZLL8RUMEGevQQwCgYIKoZIzj0EAwIwGDEW
-MBQGA1UEAxMNc2VsZnNpZ25lZC1jYTAeFw0yNDA3MTcwNzI5MDFaFw0yNTA3MTcw
-NzI5MDFaMFYxCzAJBgNVBAYTAkNIMQwwCgYDVQQIEwNLOFMxDDAKBgNVBAcTA0s4
-UzEMMAoGA1UEChMDSzhTMQwwCgYDVQQLEwNLOFMxDzANBgNVBAMTBnNpZ25lcjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOyJFpEW1XRq43YwOU/e9ufh
-128Yct8Q3f6HoRaXpUmygAkUsyBwOLWmwNeS80SLyOVegco6kGOdoMvnZsLX3ujf
-cASkbN+93xhc2MpJXvfWbLbFGrpuQki3V5Banw+UulBuTltFLmxaIRXs1y4Ny2uh
-US98LjFY3YD+3d5WG7UpgRTJ+x+t+8nqnPVOJ5asfcirM8/lRB4drUAwCOv51XLR
-fRbqCaXKpVaiw/vD5KpAOUH2N1cikfOTOY6rce0wgVDGS7eoCfkCN4gT1LG+134M
-p0KT3FBikTGdkH6dQ52nTn7xm5byJvNYzq+2zKGdosYAGurdGGw+KLFsFKCpB40C
-AwEAAaOBijCBhzAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
-CCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHwYDVR0jBBgwFoAU+2EaFiIx8JLxYnML
-5NE8f8gOLlEwJwYDVR0RBCAwHoIGc2lnbmVygRRub3JlcGx5QGxvY2FsLmRvbWFp
-bjAKBggqhkjOPQQDAgNIADBFAiBxCyNHGWTpj8oma8cY/rUVMZu/BSDH7zzrDhh6
-Q9eJegIhAIGivTcBUZvogUDfNo7IXmmxDqZHrjpoLeu6+VgTY9Qs
------END CERTIFICATE-----
diff --git a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-auth-v1/var/opt/keys/own/ob-auth-signer/key.pem b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-auth-v1/var/opt/keys/own/ob-auth-signer/key.pem
deleted file mode 100644
index 865ac31..0000000
--- a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-auth-v1/var/opt/keys/own/ob-auth-signer/key.pem
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFKzBVBgkqhkiG9w0BBQ0wSDAnBgkqhkiG9w0BBQwwGgQU5G+vkuO2cctjh5w3
-9UCspxzos1oCAggAMB0GCWCGSAFlAwQBKgQQk38FPw+39UGxhLjFx1ZinwSCBNBF
-yCOvE7KGjMIkIEm1hm+Pi5VKUKUVh4spl3aT4BcYNtcGrQ6YSTHp5V5Y+O24GJTB
-3EzH0Cg1YqFZdu/O361nVd9wQrduk35n4pTfWZrBkZ7LnUIvIfmvwowCk/sIT2R+
-ei/ljQcXlzZB5He5SB4qu7OywIHArp13701sBGYyl4kUqPXx/FVC9gkiK5dzHfoi
-t6PK8nbykDYhiMn7L4CuDGItCjjcdfat/Il3ycPsnvQX6z3iX9sIOxHpLRSZqkB/
-Da/VLC7h+t6J5NpudpGXHhZBTq5ov6LOFsFesV8+ZkHaCqAeuZiUBFYKK9de5KUr
-wxb5HDjA595l/oeiPtbeH9yocZhNf0vza4520AeuwEqmzKYfvmKz/pKTwLy1VbK5
-88+bIPw3vz6VP1riP8ULVBOAV3kAKU0NRQd6lnIorDQ6MkEHO3JOyFNKYNswF8tu
-s7gEzSKg8eBA/B+L8liczo89ItImyudXCHwEWcJY6uzKEaHxg2HS1DDD/pI8w8Sl
-mU6OQnlL5sm2X82H75tAkni03aQueL43qE5LN5QCcXUrVO9Un737fX2/m2fZB/b9
-pmy4CWjwDrXXsABf3mgiaBFbXzxRO8zDtDmNzsZnuywLNepsv1nPEV8tI7WO6c+J
-Bwba8h/Vz9ulNd8u/bX3TPr/FGgAmfIwf8Hz2Rmy4Jy6Dt7nlLOYT6NSx5QNXujC
-0vEnF8WQaCt+KHxOERb/5zb/OlVS+4Fech9NGmmTSfmTakGbmN6H7VpHa20q98fL
-b8jLbQaDDrJ1wOumykfCAzsDpq5uGjLBu7qqTF9ZOFbNc00wAcLiZd7Oavmzocn5
-PbS22IdutIhqJtREqJaZYstXQ1bzdKfPjML+SPjDb9mbqlzDFvikqDyCMpje8X7v
-/bulMe/8ViEn6WemfCULrBbchFZpgRBmZFtUiNqYuv1Ib+mx83Wha8ApdvdclYn4
-S8FBeZ8u+6usCz5QvaiLTyI5CTKf6u8fnaJ3mfa2yPEyq4tKVjoIliVAGMAX2v6b
-Ky5Wq6UzhoRPnDdXxAsPsnypAVmfLBHea10VZd/cGH6eTKdi15PLnFqvlnFaSxVS
-irR77Ze0As/+CZ3sD6vxihHGw94y4gWYYjr3NJwTR9aUQHHondh0UYE0aNarQiRz
-DEVUhM6hCiQZAdp6VqgVlow4TCZ4KLAWlpXthOLml7dcZBPc+kLAhP30LFvbEDFS
-/3TCHZeedFJfyY99fQOe43Qz2cftJhQzYuCxTo+bLG8rR+x3MNY9Mj20a1fVNCDr
-/cc5jEu04tnr9g7UNBeGXXsTfX9oDAJeepp3w05AQKMoPBO1ow6REUDcrOoITmaj
-Xdfr1uY41WQEJGURE/edArpJDsamml5qfecuW18RLGKKN2uMbTPV6+xGhpwlxFyL
-pv08rFkSTuOr8EHCtA4I7YsPE8pwAcVQJX9eveP6JbebxLJcazX5BzYFcZe0fyye
-EvLYNM/ppExaajWNddvluvxiJ36MOXR7Kn4jQIRmRl4nzroQ8OsrNn9GlpXmn7zn
-8yHp19awVyjy5DTRq9b79Dj27bBxsB/nm85DhFUDLLNCBIA80msIg7+GwjCgy4dx
-6joKO6WQzBap8NP2Y5Vk3EA89wHWhw42I1G4s/mXug==
------END ENCRYPTED PRIVATE KEY-----
diff --git a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-auth-v1/var/opt/keys/own/ob-auth-signer/keypass b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-auth-v1/var/opt/keys/own/ob-auth-signer/keypass
deleted file mode 100755
index 5cd4a8f..0000000
--- a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-auth-v1/var/opt/keys/own/ob-auth-signer/keypass
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-echo 'yQ4X0JxsgxmmuG5j14vIdkdkqTJOEqog7Xs5UgVbo='
\ No newline at end of file
diff --git a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-auth-v1/var/opt/keys/own/ob-auth-signer/keystore.jks b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-auth-v1/var/opt/keys/own/ob-auth-signer/keystore.jks
deleted file mode 100644
index 9e9d9f0..0000000
Binary files a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-auth-v1/var/opt/keys/own/ob-auth-signer/keystore.jks and /dev/null differ
diff --git a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-auth-v1/var/opt/keys/own/ob-auth-signer/keystore.p12 b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-auth-v1/var/opt/keys/own/ob-auth-signer/keystore.p12
deleted file mode 100644
index 724979a..0000000
Binary files a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-auth-v1/var/opt/keys/own/ob-auth-signer/keystore.p12 and /dev/null differ
diff --git a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-auth-v1/var/opt/keys/own/ob-auth-signer/keystore.pem b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-auth-v1/var/opt/keys/own/ob-auth-signer/keystore.pem
deleted file mode 100644
index 35d73ac..0000000
--- a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-auth-v1/var/opt/keys/own/ob-auth-signer/keystore.pem
+++ /dev/null
@@ -1,48 +0,0 @@
------BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFKzBVBgkqhkiG9w0BBQ0wSDAnBgkqhkiG9w0BBQwwGgQU5G+vkuO2cctjh5w3
-9UCspxzos1oCAggAMB0GCWCGSAFlAwQBKgQQk38FPw+39UGxhLjFx1ZinwSCBNBF
-yCOvE7KGjMIkIEm1hm+Pi5VKUKUVh4spl3aT4BcYNtcGrQ6YSTHp5V5Y+O24GJTB
-3EzH0Cg1YqFZdu/O361nVd9wQrduk35n4pTfWZrBkZ7LnUIvIfmvwowCk/sIT2R+
-ei/ljQcXlzZB5He5SB4qu7OywIHArp13701sBGYyl4kUqPXx/FVC9gkiK5dzHfoi
-t6PK8nbykDYhiMn7L4CuDGItCjjcdfat/Il3ycPsnvQX6z3iX9sIOxHpLRSZqkB/
-Da/VLC7h+t6J5NpudpGXHhZBTq5ov6LOFsFesV8+ZkHaCqAeuZiUBFYKK9de5KUr
-wxb5HDjA595l/oeiPtbeH9yocZhNf0vza4520AeuwEqmzKYfvmKz/pKTwLy1VbK5
-88+bIPw3vz6VP1riP8ULVBOAV3kAKU0NRQd6lnIorDQ6MkEHO3JOyFNKYNswF8tu
-s7gEzSKg8eBA/B+L8liczo89ItImyudXCHwEWcJY6uzKEaHxg2HS1DDD/pI8w8Sl
-mU6OQnlL5sm2X82H75tAkni03aQueL43qE5LN5QCcXUrVO9Un737fX2/m2fZB/b9
-pmy4CWjwDrXXsABf3mgiaBFbXzxRO8zDtDmNzsZnuywLNepsv1nPEV8tI7WO6c+J
-Bwba8h/Vz9ulNd8u/bX3TPr/FGgAmfIwf8Hz2Rmy4Jy6Dt7nlLOYT6NSx5QNXujC
-0vEnF8WQaCt+KHxOERb/5zb/OlVS+4Fech9NGmmTSfmTakGbmN6H7VpHa20q98fL
-b8jLbQaDDrJ1wOumykfCAzsDpq5uGjLBu7qqTF9ZOFbNc00wAcLiZd7Oavmzocn5
-PbS22IdutIhqJtREqJaZYstXQ1bzdKfPjML+SPjDb9mbqlzDFvikqDyCMpje8X7v
-/bulMe/8ViEn6WemfCULrBbchFZpgRBmZFtUiNqYuv1Ib+mx83Wha8ApdvdclYn4
-S8FBeZ8u+6usCz5QvaiLTyI5CTKf6u8fnaJ3mfa2yPEyq4tKVjoIliVAGMAX2v6b
-Ky5Wq6UzhoRPnDdXxAsPsnypAVmfLBHea10VZd/cGH6eTKdi15PLnFqvlnFaSxVS
-irR77Ze0As/+CZ3sD6vxihHGw94y4gWYYjr3NJwTR9aUQHHondh0UYE0aNarQiRz
-DEVUhM6hCiQZAdp6VqgVlow4TCZ4KLAWlpXthOLml7dcZBPc+kLAhP30LFvbEDFS
-/3TCHZeedFJfyY99fQOe43Qz2cftJhQzYuCxTo+bLG8rR+x3MNY9Mj20a1fVNCDr
-/cc5jEu04tnr9g7UNBeGXXsTfX9oDAJeepp3w05AQKMoPBO1ow6REUDcrOoITmaj
-Xdfr1uY41WQEJGURE/edArpJDsamml5qfecuW18RLGKKN2uMbTPV6+xGhpwlxFyL
-pv08rFkSTuOr8EHCtA4I7YsPE8pwAcVQJX9eveP6JbebxLJcazX5BzYFcZe0fyye
-EvLYNM/ppExaajWNddvluvxiJ36MOXR7Kn4jQIRmRl4nzroQ8OsrNn9GlpXmn7zn
-8yHp19awVyjy5DTRq9b79Dj27bBxsB/nm85DhFUDLLNCBIA80msIg7+GwjCgy4dx
-6joKO6WQzBap8NP2Y5Vk3EA89wHWhw42I1G4s/mXug==
------END ENCRYPTED PRIVATE KEY-----
-
------BEGIN CERTIFICATE-----
-MIICwzCCAmmgAwIBAgIRAIgdSB3tN8ZLL8RUMEGevQQwCgYIKoZIzj0EAwIwGDEW
-MBQGA1UEAxMNc2VsZnNpZ25lZC1jYTAeFw0yNDA3MTcwNzI5MDFaFw0yNTA3MTcw
-NzI5MDFaMFYxCzAJBgNVBAYTAkNIMQwwCgYDVQQIEwNLOFMxDDAKBgNVBAcTA0s4
-UzEMMAoGA1UEChMDSzhTMQwwCgYDVQQLEwNLOFMxDzANBgNVBAMTBnNpZ25lcjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOyJFpEW1XRq43YwOU/e9ufh
-128Yct8Q3f6HoRaXpUmygAkUsyBwOLWmwNeS80SLyOVegco6kGOdoMvnZsLX3ujf
-cASkbN+93xhc2MpJXvfWbLbFGrpuQki3V5Banw+UulBuTltFLmxaIRXs1y4Ny2uh
-US98LjFY3YD+3d5WG7UpgRTJ+x+t+8nqnPVOJ5asfcirM8/lRB4drUAwCOv51XLR
-fRbqCaXKpVaiw/vD5KpAOUH2N1cikfOTOY6rce0wgVDGS7eoCfkCN4gT1LG+134M
-p0KT3FBikTGdkH6dQ52nTn7xm5byJvNYzq+2zKGdosYAGurdGGw+KLFsFKCpB40C
-AwEAAaOBijCBhzAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
-CCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHwYDVR0jBBgwFoAU+2EaFiIx8JLxYnML
-5NE8f8gOLlEwJwYDVR0RBCAwHoIGc2lnbmVygRRub3JlcGx5QGxvY2FsLmRvbWFp
-bjAKBggqhkjOPQQDAgNIADBFAiBxCyNHGWTpj8oma8cY/rUVMZu/BSDH7zzrDhh6
-Q9eJegIhAIGivTcBUZvogUDfNo7IXmmxDqZHrjpoLeu6+VgTY9Qs
------END CERTIFICATE-----
diff --git a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-auth-v1/var/opt/nevisauth/default/conf/esauth4.xml b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-auth-v1/var/opt/nevisauth/default/conf/esauth4.xml
index 76661f9..3a4cfa4 100644
--- a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-auth-v1/var/opt/nevisauth/default/conf/esauth4.xml
+++ b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-auth-v1/var/opt/nevisauth/default/conf/esauth4.xml
@@ -33,7 +33,9 @@
         <!-- source: pattern://d00b0dcbe241793d30daf91c -->
         <KeyStore name="DefaultKeyStore">
             <!-- source: pattern://d00b0dcbe241793d30daf91c -->
-            <KeyObject name="DefaultSigner" certificate="/var/opt/keys/own/ob-auth-signer/cert.pem" privateKey="/var/opt/keys/own/ob-auth-signer/keystore.jks" passPhrase="pipe:///var/opt/keys/own/ob-auth-signer/keypass"/>
+            <KeyObject name="DefaultSigner" certificate="/var/opt/keys/own/ob-auth-sh4r3d-default-default-signer/cert.pem" privateKey="/var/opt/keys/own/ob-auth-sh4r3d-default-default-signer/keystore.jks" passPhrase="pipe:///var/opt/keys/own/ob-auth-sh4r3d-default-default-signer/keypass"/>
+            <!-- source: pattern://d00b0dcbe241793d30daf91c -->
+            <KeyObject name="DefaultSignerTrust" certificate="/var/opt/keys/trust/ob-auth-v1-default-default-signer-trust/truststore.jks"/>
         </KeyStore>
         <!-- source: pattern://25bdd7e6f5b76694f6688ab8 -->
         <KeyStore name="ob-realm-accessapp-registration-nevisfido-tls-trust-store">
@@ -348,9 +350,9 @@
         </AuthState>
         <AuthState name="nevisIDM_Connector" class="ch.nevis.esauth.auth.states.standard.AuthGeneric" final="false">
             <!-- source: pattern://e1784eecf2db74484dd1e1bb -->
-            <property name="login.service.connection.0" value="https://idm.adn-agov-nevisidm-01-uat:8989/nevisidm/services/v1/LoginService"/>
+            <property name="login.service.connection.0" value="https://idm.adn-agov-nevisidm-admin-01-uat:8989/nevisidm/services/v1/LoginService"/>
             <!-- source: pattern://e1784eecf2db74484dd1e1bb -->
-            <property name="admin.service.connection.0" value="https://idm.adn-agov-nevisidm-01-uat:8989/nevisidm/services/v1/AdminService"/>
+            <property name="admin.service.connection.0" value="https://idm.adn-agov-nevisidm-admin-01-uat:8989/nevisidm/services/v1/AdminService"/>
         </AuthState>
         <AuthState name="ob-realm_ob-realm-dispatch-cred-type" class="ch.nevis.esauth.auth.states.standard.AuthGeneric" final="true" resumeState="true">
             <!-- source: pattern://5f192f6e91687b30b5868750 -->
diff --git a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/etc/nevis/k8s-ob-fido-uaf-d990accd4fedae1acbc7109d.yaml b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/etc/nevis/k8s-ob-fido-uaf-d990accd4fedae1acbc7109d.yaml
index 1a83b7d..30e0f2b 100644
--- a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/etc/nevis/k8s-ob-fido-uaf-d990accd4fedae1acbc7109d.yaml
+++ b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/etc/nevis/k8s-ob-fido-uaf-d990accd4fedae1acbc7109d.yaml
@@ -46,7 +46,7 @@ spec:
   podDisruptionBudget:
     maxUnavailable: "50%"
   git:
-    tag: "r-9e206f8d793087e7a1996ae58b5ed2116e3e9af7"
+    tag: "r-6084449dd6cbd475bb25d36cf2a36e2ccd661824"
     dir: "DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1"
     credentials: "git-credentials"
   database:
@@ -54,7 +54,9 @@ spec:
     requiredVersion: "8.2411.1"
   keystores:
   - "ob-fido-uaf-v1-default-server-identity"
+  - "ob-fido-uaf-v1-default-client-identity"
   truststores:
+  - "ob-fido-uaf-v1-default-signer-trust"
   - "ob-fido-uaf-v1-default-client-trust"
   - "ob-fido-uaf-v1-agov-work-internal-trust-store"
   podSecurity:
diff --git a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/etc/nevis/k8s-ob-fido-uaf-v1-default-client-identity-d990accd4fedae1acbc7109d.yaml b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/etc/nevis/k8s-ob-fido-uaf-v1-default-client-identity-d990accd4fedae1acbc7109d.yaml
new file mode 100644
index 0000000..5cd6475
--- /dev/null
+++ b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/etc/nevis/k8s-ob-fido-uaf-v1-default-client-identity-d990accd4fedae1acbc7109d.yaml
@@ -0,0 +1,18 @@
+apiVersion: "operator.nevis-security.ch/v1"
+kind: "NevisKeyStore"
+metadata:
+  name: "ob-fido-uaf-v1-default-client-identity"
+  namespace: "adn-agov-nevisidm-ob-01-uat"
+  labels:
+    deploymentTarget: "ob-fido-uaf-v1"
+  annotations:
+    projectKey: "DEFAULT-ADN-AGOV-WORK-OB-PROJECT"
+    patternId: "d990accd4fedae1acbc7109d"
+spec:
+  cn: "ob-fido-uaf-v1"
+  usage: "<reserved for future use>"
+  san:
+    dns:
+    - "ob-fido-uaf-v1"
+    - "ob-fido-uaf-v1.adn-agov-nevisidm-ob-01-uat"
+    email: []
diff --git a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/etc/nevis/k8s-ob-fido-uaf-v1-default-signer-trust-d990accd4fedae1acbc7109d.yaml b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/etc/nevis/k8s-ob-fido-uaf-v1-default-signer-trust-d990accd4fedae1acbc7109d.yaml
new file mode 100644
index 0000000..c29a0e1
--- /dev/null
+++ b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/etc/nevis/k8s-ob-fido-uaf-v1-default-signer-trust-d990accd4fedae1acbc7109d.yaml
@@ -0,0 +1,14 @@
+apiVersion: "operator.nevis-security.ch/v1"
+kind: "NevisTrustStore"
+metadata:
+  name: "ob-fido-uaf-v1-default-signer-trust"
+  namespace: "adn-agov-nevisidm-ob-01-uat"
+  labels:
+    deploymentTarget: "ob-fido-uaf-v1"
+  annotations:
+    projectKey: "DEFAULT-ADN-AGOV-WORK-OB-PROJECT"
+    patternId: "d990accd4fedae1acbc7109d"
+spec:
+  keystores:
+  - name: "ob-auth-sh4r3d-default-default-signer"
+    namespace: "adn-agov-nevisidm-ob-01-uat"
diff --git a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/var/opt/keys/own/nevisfido-techuser-key/cert.pem b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/var/opt/keys/own/nevisfido-techuser-key/cert.pem
deleted file mode 100644
index 0d07b2a..0000000
--- a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/var/opt/keys/own/nevisfido-techuser-key/cert.pem
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC6TCCAo+gAwIBAgIQfcfd9dgdKT/5gdDbpAiKlDAKBggqhkjOPQQDAjAYMRYw
-FAYDVQQDEw1zZWxmc2lnbmVkLWNhMB4XDTI0MDUwNTE1NTAzOFoXDTI1MDUwNTE1
-NTAzOFowWDELMAkGA1UEBhMCQ0gxDDAKBgNVBAgTA0s4UzEMMAoGA1UEBxMDSzhT
-MQwwCgYDVQQKEwNLOFMxDDAKBgNVBAsTA0s4UzERMA8GA1UEAxMIZmlkby11YWYw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWcQPIzUN2zbPkB3yISIGw
-mDAd285YKm/ZLbE4WWw2SIHhjfh0XoYZ6QvLMENWcC8/iOX/6g6upQnYegzZKlST
-Lix0zJjEbtMlK8fITiPhwziWPSOeqtuW66Rj+13G6kKYVtZ8vviu73LBDkXKHSNi
-g4knNgACJpIItiDhOmtmD3Wsb8JAIQ161m7D3i2jr/kqBFKLc2DXcCHYSwxBXu3A
-99iqWxoHfprL/L7RfxBo7mKbk+xjRvw6wFHBb76m6hd8fe4yg3g9zZTsZ5KeKqtA
-8NT7CTG26F/MEBEmreU6NcNP62sYBkQiY+K5WweUs5qnDCAUPz+Upu0lX49ZDsvZ
-AgMBAAGjga8wgawwDgYDVR0PAQH/BAQDAgeAMB0GA1UdJQQWMBQGCCsGAQUFBwMB
-BggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB8GA1UdIwQYMBaAFPthGhYiMfCS8WJz
-C+TRPH/IDi5RMEwGA1UdEQRFMEOCCGZpZG8tdWFmgiFmaWRvLXVhZi5hZG4tYWdv
-di1uZXZpc2lkbS0wMS11YXSBFG5vcmVwbHlAbG9jYWwuZG9tYWluMAoGCCqGSM49
-BAMCA0gAMEUCIBCueTTUwnN53/dIs6W4FpbFtF/wkAhYjLZGuKgY08ZAAiEA9VFz
-WoaxaINHqGPR10Sh1hqeuCHRzHxnQUt07sZf2DU=
------END CERTIFICATE-----
diff --git a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/var/opt/keys/own/nevisfido-techuser-key/key.pem b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/var/opt/keys/own/nevisfido-techuser-key/key.pem
deleted file mode 100644
index 261a170..0000000
--- a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/var/opt/keys/own/nevisfido-techuser-key/key.pem
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFKzBVBgkqhkiG9w0BBQ0wSDAnBgkqhkiG9w0BBQwwGgQUA8Ytt1cRwiCjGKC1
-2OMoR6wY3WECAggAMB0GCWCGSAFlAwQBKgQQFK48c+H7S8tVJ5n3O1UdwwSCBNAu
-o9BbycGa6LAWyjEK77S3eyKkNHatAaPE+yKklEN22HY9GOTId9wnhyQ0pZgan9ml
-VtHxyz0ExfveT8gajbyV4ezE/OXVFsmx+i1P0aIRCHHRCY0MVbZFgBEhLH73EJVn
-E/+3RUEjz9XJphCDK/Bg2DhYpPN1WnplksRSRCcpsSw7U5qfmbfb2T5ZLmho1oJr
-M6kU+gvtqJ+cZ+rMT7zpDLDz6bzT6O2HRPl4MuvzbrSg5nbBlAnW2kVZzguIqqc9
-9KiY6sKziYhGSdPwJEcek/VyMVJm8gn1Bz4CQdKOrVGIOstSSoXYClCUjOLowL6F
-MxGk25NJJBUy2uApfOQOIs5vvgu55CY1JRcQwL4dSy+5Ueqcw3VG17ExfFqGk5cZ
-b001DIdiL+ResgwvHdrC5mwKZ1mtjLGnX8uL6Uch3C+ullPU592yUXnDsFZn9An1
-UDCjFCbtUFKAi6TcYf3yOCMgfa3iAzhae7CIvC7I9JVJjA8MyNTlWgAqGeM2HalI
-84TEb09r8KotqtlAvD8Hs5uO4Iwf/sjOhSxP2SIG016oXU8KsH8pGvlYyLfA1WkX
-uI+46zAk1AHoAEiTox9tNtWYnIeGukbNBkNuzeWkS56GEZJto6ji7DIj3xsBnhJt
-3ciJnUR46z0SyofDexU60dsduliMeExVe2qde8XS3oKcOnTLBtCHxgIb8T73Zr22
-VkYPcjRF8Aur207DThKJ+D2dRQ0DTj+DBeT1q5gTCAwZUb/tuwEw9CEBGmy9wR5C
-C3M2auRL9QHaXU+kKpnbFPI4xkonJbLCC/VWE/qY60wsHdrL9TFuBOw4Mt+Q/gjC
-w8Vi1V+/2DBIIums/teBbLeeEy/B97k8N5lJwCcp8mGiAl/hXQfHbetksObWNqpj
-V4zl7NCylTgyh2UqzZtQQGLeBT3Q1u4EaQIPt8xwxLrR+wne6wjuLGaM4OqKOVUa
-gWdXdi55q0S1aluqoHTWK0VYy+5BMpBgHREpnZDtAJ06YljAmRk2j8IjFrZi1COK
-quL+Uj6g1iBy2zUZYMLUb73I3f8VX7Qmps0iCrNAwpJjpsWYJOf+HzJFgC+YiYs0
-J1uJcm5ypggCDSP4PRDgvbcs7pIkbQFHZQ1Y7EesX4m61f7Xc72J6Y4lNRfhEjKP
-c2n8XDj6dkxtEDsmegrGfDmUZ9z6PjKjMRWUxHMQIs2FxnCbdZuoDX3IN5EJtW3w
-iEAmOYCcV4Vep4Vckfwz6aTSfbmwmDcH56yYckDBQq2bCuySOgdSUUWXn+MshTUW
-Ef+LvCW0BSqz4p3D0vBySnauzh9YCbva7b9ibuhavwB+Ys2Qn2cWfzcvUPqmXUOb
-mnkq3k9FjgKM4vej7FxdbCffeU8tiAuYSKFZS/CiZU8Qoqy75BwT4bxa7Qfvdmgk
-NkzCkyGV9xYlCiT1gqbX6XU9bmotUuP3VSSO7ehpMW0k99W6ml/NJqEBmZ0f9/Ax
-qaYheAy+9TtHbcSLOcZj6+7SYZNsvayE3HKnGCuKV0TgSi9VOQLZ6QDxkNU/3oHo
-I2g49KDqyvvx/BmZwEKnFsDpKLluCklwLUf8qKm+Kji8W95+JQC2k3qumIZ6Ao8Z
-OKoJStGgA8ZjuENxatZJk42BI++oNZOBA08uKvW1Mw==
------END ENCRYPTED PRIVATE KEY-----
diff --git a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/var/opt/keys/own/nevisfido-techuser-key/keypass b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/var/opt/keys/own/nevisfido-techuser-key/keypass
deleted file mode 100755
index 85ccc28..0000000
--- a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/var/opt/keys/own/nevisfido-techuser-key/keypass
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-echo 'Hsk+IJIkp1oGu8i1S+w6p2QMDB+9WFSNjNlSYdUCfA8='
\ No newline at end of file
diff --git a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/var/opt/keys/own/nevisfido-techuser-key/keystore.jks b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/var/opt/keys/own/nevisfido-techuser-key/keystore.jks
deleted file mode 100644
index 9641839..0000000
Binary files a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/var/opt/keys/own/nevisfido-techuser-key/keystore.jks and /dev/null differ
diff --git a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/var/opt/keys/own/nevisfido-techuser-key/keystore.p12 b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/var/opt/keys/own/nevisfido-techuser-key/keystore.p12
deleted file mode 100644
index 3ca00a3..0000000
Binary files a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/var/opt/keys/own/nevisfido-techuser-key/keystore.p12 and /dev/null differ
diff --git a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/var/opt/keys/own/nevisfido-techuser-key/keystore.pem b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/var/opt/keys/own/nevisfido-techuser-key/keystore.pem
deleted file mode 100644
index 6911903..0000000
--- a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/var/opt/keys/own/nevisfido-techuser-key/keystore.pem
+++ /dev/null
@@ -1,49 +0,0 @@
------BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFKzBVBgkqhkiG9w0BBQ0wSDAnBgkqhkiG9w0BBQwwGgQUA8Ytt1cRwiCjGKC1
-2OMoR6wY3WECAggAMB0GCWCGSAFlAwQBKgQQFK48c+H7S8tVJ5n3O1UdwwSCBNAu
-o9BbycGa6LAWyjEK77S3eyKkNHatAaPE+yKklEN22HY9GOTId9wnhyQ0pZgan9ml
-VtHxyz0ExfveT8gajbyV4ezE/OXVFsmx+i1P0aIRCHHRCY0MVbZFgBEhLH73EJVn
-E/+3RUEjz9XJphCDK/Bg2DhYpPN1WnplksRSRCcpsSw7U5qfmbfb2T5ZLmho1oJr
-M6kU+gvtqJ+cZ+rMT7zpDLDz6bzT6O2HRPl4MuvzbrSg5nbBlAnW2kVZzguIqqc9
-9KiY6sKziYhGSdPwJEcek/VyMVJm8gn1Bz4CQdKOrVGIOstSSoXYClCUjOLowL6F
-MxGk25NJJBUy2uApfOQOIs5vvgu55CY1JRcQwL4dSy+5Ueqcw3VG17ExfFqGk5cZ
-b001DIdiL+ResgwvHdrC5mwKZ1mtjLGnX8uL6Uch3C+ullPU592yUXnDsFZn9An1
-UDCjFCbtUFKAi6TcYf3yOCMgfa3iAzhae7CIvC7I9JVJjA8MyNTlWgAqGeM2HalI
-84TEb09r8KotqtlAvD8Hs5uO4Iwf/sjOhSxP2SIG016oXU8KsH8pGvlYyLfA1WkX
-uI+46zAk1AHoAEiTox9tNtWYnIeGukbNBkNuzeWkS56GEZJto6ji7DIj3xsBnhJt
-3ciJnUR46z0SyofDexU60dsduliMeExVe2qde8XS3oKcOnTLBtCHxgIb8T73Zr22
-VkYPcjRF8Aur207DThKJ+D2dRQ0DTj+DBeT1q5gTCAwZUb/tuwEw9CEBGmy9wR5C
-C3M2auRL9QHaXU+kKpnbFPI4xkonJbLCC/VWE/qY60wsHdrL9TFuBOw4Mt+Q/gjC
-w8Vi1V+/2DBIIums/teBbLeeEy/B97k8N5lJwCcp8mGiAl/hXQfHbetksObWNqpj
-V4zl7NCylTgyh2UqzZtQQGLeBT3Q1u4EaQIPt8xwxLrR+wne6wjuLGaM4OqKOVUa
-gWdXdi55q0S1aluqoHTWK0VYy+5BMpBgHREpnZDtAJ06YljAmRk2j8IjFrZi1COK
-quL+Uj6g1iBy2zUZYMLUb73I3f8VX7Qmps0iCrNAwpJjpsWYJOf+HzJFgC+YiYs0
-J1uJcm5ypggCDSP4PRDgvbcs7pIkbQFHZQ1Y7EesX4m61f7Xc72J6Y4lNRfhEjKP
-c2n8XDj6dkxtEDsmegrGfDmUZ9z6PjKjMRWUxHMQIs2FxnCbdZuoDX3IN5EJtW3w
-iEAmOYCcV4Vep4Vckfwz6aTSfbmwmDcH56yYckDBQq2bCuySOgdSUUWXn+MshTUW
-Ef+LvCW0BSqz4p3D0vBySnauzh9YCbva7b9ibuhavwB+Ys2Qn2cWfzcvUPqmXUOb
-mnkq3k9FjgKM4vej7FxdbCffeU8tiAuYSKFZS/CiZU8Qoqy75BwT4bxa7Qfvdmgk
-NkzCkyGV9xYlCiT1gqbX6XU9bmotUuP3VSSO7ehpMW0k99W6ml/NJqEBmZ0f9/Ax
-qaYheAy+9TtHbcSLOcZj6+7SYZNsvayE3HKnGCuKV0TgSi9VOQLZ6QDxkNU/3oHo
-I2g49KDqyvvx/BmZwEKnFsDpKLluCklwLUf8qKm+Kji8W95+JQC2k3qumIZ6Ao8Z
-OKoJStGgA8ZjuENxatZJk42BI++oNZOBA08uKvW1Mw==
------END ENCRYPTED PRIVATE KEY-----
-
------BEGIN CERTIFICATE-----
-MIIC6TCCAo+gAwIBAgIQfcfd9dgdKT/5gdDbpAiKlDAKBggqhkjOPQQDAjAYMRYw
-FAYDVQQDEw1zZWxmc2lnbmVkLWNhMB4XDTI0MDUwNTE1NTAzOFoXDTI1MDUwNTE1
-NTAzOFowWDELMAkGA1UEBhMCQ0gxDDAKBgNVBAgTA0s4UzEMMAoGA1UEBxMDSzhT
-MQwwCgYDVQQKEwNLOFMxDDAKBgNVBAsTA0s4UzERMA8GA1UEAxMIZmlkby11YWYw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWcQPIzUN2zbPkB3yISIGw
-mDAd285YKm/ZLbE4WWw2SIHhjfh0XoYZ6QvLMENWcC8/iOX/6g6upQnYegzZKlST
-Lix0zJjEbtMlK8fITiPhwziWPSOeqtuW66Rj+13G6kKYVtZ8vviu73LBDkXKHSNi
-g4knNgACJpIItiDhOmtmD3Wsb8JAIQ161m7D3i2jr/kqBFKLc2DXcCHYSwxBXu3A
-99iqWxoHfprL/L7RfxBo7mKbk+xjRvw6wFHBb76m6hd8fe4yg3g9zZTsZ5KeKqtA
-8NT7CTG26F/MEBEmreU6NcNP62sYBkQiY+K5WweUs5qnDCAUPz+Upu0lX49ZDsvZ
-AgMBAAGjga8wgawwDgYDVR0PAQH/BAQDAgeAMB0GA1UdJQQWMBQGCCsGAQUFBwMB
-BggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB8GA1UdIwQYMBaAFPthGhYiMfCS8WJz
-C+TRPH/IDi5RMEwGA1UdEQRFMEOCCGZpZG8tdWFmgiFmaWRvLXVhZi5hZG4tYWdv
-di1uZXZpc2lkbS0wMS11YXSBFG5vcmVwbHlAbG9jYWwuZG9tYWluMAoGCCqGSM49
-BAMCA0gAMEUCIBCueTTUwnN53/dIs6W4FpbFtF/wkAhYjLZGuKgY08ZAAiEA9VFz
-WoaxaINHqGPR10Sh1hqeuCHRzHxnQUt07sZf2DU=
------END CERTIFICATE-----
diff --git a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/var/opt/keys/trust/ob-auth-signer-trust-store/keypass b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/var/opt/keys/trust/ob-auth-signer-trust-store/keypass
deleted file mode 100755
index 5b0d317..0000000
--- a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/var/opt/keys/trust/ob-auth-signer-trust-store/keypass
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-echo 'password'
\ No newline at end of file
diff --git a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/var/opt/keys/trust/ob-auth-signer-trust-store/truststore.jks b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/var/opt/keys/trust/ob-auth-signer-trust-store/truststore.jks
deleted file mode 100644
index 6243945..0000000
Binary files a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/var/opt/keys/trust/ob-auth-signer-trust-store/truststore.jks and /dev/null differ
diff --git a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/var/opt/keys/trust/ob-auth-signer-trust-store/truststore.p12 b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/var/opt/keys/trust/ob-auth-signer-trust-store/truststore.p12
deleted file mode 100644
index ab169dc..0000000
Binary files a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/var/opt/keys/trust/ob-auth-signer-trust-store/truststore.p12 and /dev/null differ
diff --git a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/var/opt/keys/trust/ob-auth-signer-trust-store/truststore.pem b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/var/opt/keys/trust/ob-auth-signer-trust-store/truststore.pem
deleted file mode 100644
index 0bcf943..0000000
--- a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/var/opt/keys/trust/ob-auth-signer-trust-store/truststore.pem
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICwzCCAmmgAwIBAgIRAIgdSB3tN8ZLL8RUMEGevQQwCgYIKoZIzj0EAwIwGDEW
-MBQGA1UEAxMNc2VsZnNpZ25lZC1jYTAeFw0yNDA3MTcwNzI5MDFaFw0yNTA3MTcw
-NzI5MDFaMFYxCzAJBgNVBAYTAkNIMQwwCgYDVQQIEwNLOFMxDDAKBgNVBAcTA0s4
-UzEMMAoGA1UEChMDSzhTMQwwCgYDVQQLEwNLOFMxDzANBgNVBAMTBnNpZ25lcjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOyJFpEW1XRq43YwOU/e9ufh
-128Yct8Q3f6HoRaXpUmygAkUsyBwOLWmwNeS80SLyOVegco6kGOdoMvnZsLX3ujf
-cASkbN+93xhc2MpJXvfWbLbFGrpuQki3V5Banw+UulBuTltFLmxaIRXs1y4Ny2uh
-US98LjFY3YD+3d5WG7UpgRTJ+x+t+8nqnPVOJ5asfcirM8/lRB4drUAwCOv51XLR
-fRbqCaXKpVaiw/vD5KpAOUH2N1cikfOTOY6rce0wgVDGS7eoCfkCN4gT1LG+134M
-p0KT3FBikTGdkH6dQ52nTn7xm5byJvNYzq+2zKGdosYAGurdGGw+KLFsFKCpB40C
-AwEAAaOBijCBhzAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
-CCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHwYDVR0jBBgwFoAU+2EaFiIx8JLxYnML
-5NE8f8gOLlEwJwYDVR0RBCAwHoIGc2lnbmVygRRub3JlcGx5QGxvY2FsLmRvbWFp
-bjAKBggqhkjOPQQDAgNIADBFAiBxCyNHGWTpj8oma8cY/rUVMZu/BSDH7zzrDhh6
-Q9eJegIhAIGivTcBUZvogUDfNo7IXmmxDqZHrjpoLeu6+VgTY9Qs
------END CERTIFICATE-----
diff --git a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/var/opt/nevisfido/default/conf/nevisfido.yml b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/var/opt/nevisfido/default/conf/nevisfido.yml
index e5b4e2a..0206544 100644
--- a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/var/opt/nevisfido/default/conf/nevisfido.yml
+++ b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido-uaf-v1/var/opt/nevisfido/default/conf/nevisfido.yml
@@ -45,9 +45,9 @@ fido-uaf:
   authorization:
     registration:
       type: "sectoken"
-      truststore: "/var/opt/keys/trust/ob-auth-signer-trust-store/truststore.p12"
+      truststore: "/var/opt/keys/trust/ob-fido-uaf-v1-default-signer-trust/truststore.p12"
       truststore-type: "pkcs12"
-      truststore-passphrase: "${exec:/var/opt/keys/trust/ob-auth-signer-trust-store/keypass}"
+      truststore-passphrase: "${exec:/var/opt/keys/trust/ob-fido-uaf-v1-default-signer-trust/keypass}"
       username-attribute-names:
       - "loginId"
       - "userid"
@@ -55,17 +55,17 @@ fido-uaf:
       type: "none"
     deregistration:
       type: "sectoken"
-      truststore: "/var/opt/keys/trust/ob-auth-signer-trust-store/truststore.p12"
+      truststore: "/var/opt/keys/trust/ob-fido-uaf-v1-default-signer-trust/truststore.p12"
       truststore-type: "pkcs12"
-      truststore-passphrase: "${exec:/var/opt/keys/trust/ob-auth-signer-trust-store/keypass}"
+      truststore-passphrase: "${exec:/var/opt/keys/trust/ob-fido-uaf-v1-default-signer-trust/keypass}"
       username-attribute-names:
       - "loginId"
       - "userid"
     create-dispatch-target:
       type: "sectoken"
-      truststore: "/var/opt/keys/trust/ob-auth-signer-trust-store/truststore.p12"
+      truststore: "/var/opt/keys/trust/ob-fido-uaf-v1-default-signer-trust/truststore.p12"
       truststore-type: "pkcs12"
-      truststore-passphrase: "${exec:/var/opt/keys/trust/ob-auth-signer-trust-store/keypass}"
+      truststore-passphrase: "${exec:/var/opt/keys/trust/ob-fido-uaf-v1-default-signer-trust/keypass}"
       username-attribute-names:
       - "loginId"
       - "userid"
@@ -73,9 +73,9 @@ fido-uaf:
       type: "none"
     delete-dispatch-target:
       type: "sectoken"
-      truststore: "/var/opt/keys/trust/ob-auth-signer-trust-store/truststore.p12"
+      truststore: "/var/opt/keys/trust/ob-fido-uaf-v1-default-signer-trust/truststore.p12"
       truststore-type: "pkcs12"
-      truststore-passphrase: "${exec:/var/opt/keys/trust/ob-auth-signer-trust-store/keypass}"
+      truststore-passphrase: "${exec:/var/opt/keys/trust/ob-fido-uaf-v1-default-signer-trust/keypass}"
       username-attribute-names:
       - "userid"
 session-repository:
@@ -91,12 +91,12 @@ credential-repository:
   type: "nevisidm"
   client-id: "cfa9c9b9-119f-4dff-9bb8-86d7c0cf2720"
   user-attribute: "extId"
-  administration-url: "https://idm.adn-agov-nevisidm-01-uat:8989/nevisidm/services/v1_46/AdminService"
+  administration-url: "https://idm.adn-agov-nevisidm-admin-01-uat:8989/nevisidm/services/v1_46/AdminService"
   admin-service-version: "v1_46"
-  rest-url: "https://idm.adn-agov-nevisidm-01-uat:8989/nevisidm"
-  keystore: "/var/opt/keys/own/nevisfido-techuser-key/keystore.p12"
+  rest-url: "https://idm.adn-agov-nevisidm-admin-01-uat:8989/nevisidm"
+  keystore: "/var/opt/keys/own/ob-fido-uaf-v1-default-client-identity/keystore.p12"
   keystore-type: "pkcs12"
-  keystore-passphrase: "${exec:/var/opt/keys/own/nevisfido-techuser-key/keypass}"
+  keystore-passphrase: "${exec:/var/opt/keys/own/ob-fido-uaf-v1-default-client-identity/keypass}"
   truststore: "/var/opt/keys/trust/ob-fido-uaf-v1-agov-work-internal-trust-store/truststore.p12"
   truststore-type: "pkcs12"
   truststore-passphrase: "${exec:/var/opt/keys/trust/ob-fido-uaf-v1-agov-work-internal-trust-store/keypass}"
diff --git a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido2-v1/etc/nevis/k8s-ob-fido2-a2d03bb46b87b90160dc83d7.yaml b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido2-v1/etc/nevis/k8s-ob-fido2-a2d03bb46b87b90160dc83d7.yaml
index dd7f521..082bfea 100644
--- a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido2-v1/etc/nevis/k8s-ob-fido2-a2d03bb46b87b90160dc83d7.yaml
+++ b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido2-v1/etc/nevis/k8s-ob-fido2-a2d03bb46b87b90160dc83d7.yaml
@@ -46,10 +46,11 @@ spec:
   podDisruptionBudget:
     maxUnavailable: "50%"
   git:
-    tag: "r-9e206f8d793087e7a1996ae58b5ed2116e3e9af7"
+    tag: "r-6084449dd6cbd475bb25d36cf2a36e2ccd661824"
     dir: "DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido2-v1"
     credentials: "git-credentials"
   keystores:
+  - "ob-fido2-v1-default-client-identity"
   - "ob-fido2-v1-default-identity"
   truststores:
   - "ob-fido2-v1-default-tls-client-trust"
diff --git a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido2-v1/etc/nevis/k8s-ob-fido2-v1-default-client-identity-a2d03bb46b87b90160dc83d7.yaml b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido2-v1/etc/nevis/k8s-ob-fido2-v1-default-client-identity-a2d03bb46b87b90160dc83d7.yaml
new file mode 100644
index 0000000..572c60e
--- /dev/null
+++ b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido2-v1/etc/nevis/k8s-ob-fido2-v1-default-client-identity-a2d03bb46b87b90160dc83d7.yaml
@@ -0,0 +1,18 @@
+apiVersion: "operator.nevis-security.ch/v1"
+kind: "NevisKeyStore"
+metadata:
+  name: "ob-fido2-v1-default-client-identity"
+  namespace: "adn-agov-nevisidm-ob-01-uat"
+  labels:
+    deploymentTarget: "ob-fido2-v1"
+  annotations:
+    projectKey: "DEFAULT-ADN-AGOV-WORK-OB-PROJECT"
+    patternId: "a2d03bb46b87b90160dc83d7"
+spec:
+  cn: "ob-fido2-v1"
+  usage: "<reserved for future use>"
+  san:
+    dns:
+    - "ob-fido2-v1"
+    - "ob-fido2-v1.adn-agov-nevisidm-ob-01-uat"
+    email: []
diff --git a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido2-v1/var/opt/keys/own/nevisfido-techuser-key/cert.pem b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido2-v1/var/opt/keys/own/nevisfido-techuser-key/cert.pem
deleted file mode 100644
index 0d07b2a..0000000
--- a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido2-v1/var/opt/keys/own/nevisfido-techuser-key/cert.pem
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC6TCCAo+gAwIBAgIQfcfd9dgdKT/5gdDbpAiKlDAKBggqhkjOPQQDAjAYMRYw
-FAYDVQQDEw1zZWxmc2lnbmVkLWNhMB4XDTI0MDUwNTE1NTAzOFoXDTI1MDUwNTE1
-NTAzOFowWDELMAkGA1UEBhMCQ0gxDDAKBgNVBAgTA0s4UzEMMAoGA1UEBxMDSzhT
-MQwwCgYDVQQKEwNLOFMxDDAKBgNVBAsTA0s4UzERMA8GA1UEAxMIZmlkby11YWYw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWcQPIzUN2zbPkB3yISIGw
-mDAd285YKm/ZLbE4WWw2SIHhjfh0XoYZ6QvLMENWcC8/iOX/6g6upQnYegzZKlST
-Lix0zJjEbtMlK8fITiPhwziWPSOeqtuW66Rj+13G6kKYVtZ8vviu73LBDkXKHSNi
-g4knNgACJpIItiDhOmtmD3Wsb8JAIQ161m7D3i2jr/kqBFKLc2DXcCHYSwxBXu3A
-99iqWxoHfprL/L7RfxBo7mKbk+xjRvw6wFHBb76m6hd8fe4yg3g9zZTsZ5KeKqtA
-8NT7CTG26F/MEBEmreU6NcNP62sYBkQiY+K5WweUs5qnDCAUPz+Upu0lX49ZDsvZ
-AgMBAAGjga8wgawwDgYDVR0PAQH/BAQDAgeAMB0GA1UdJQQWMBQGCCsGAQUFBwMB
-BggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB8GA1UdIwQYMBaAFPthGhYiMfCS8WJz
-C+TRPH/IDi5RMEwGA1UdEQRFMEOCCGZpZG8tdWFmgiFmaWRvLXVhZi5hZG4tYWdv
-di1uZXZpc2lkbS0wMS11YXSBFG5vcmVwbHlAbG9jYWwuZG9tYWluMAoGCCqGSM49
-BAMCA0gAMEUCIBCueTTUwnN53/dIs6W4FpbFtF/wkAhYjLZGuKgY08ZAAiEA9VFz
-WoaxaINHqGPR10Sh1hqeuCHRzHxnQUt07sZf2DU=
------END CERTIFICATE-----
diff --git a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido2-v1/var/opt/keys/own/nevisfido-techuser-key/key.pem b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido2-v1/var/opt/keys/own/nevisfido-techuser-key/key.pem
deleted file mode 100644
index 261a170..0000000
--- a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido2-v1/var/opt/keys/own/nevisfido-techuser-key/key.pem
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFKzBVBgkqhkiG9w0BBQ0wSDAnBgkqhkiG9w0BBQwwGgQUA8Ytt1cRwiCjGKC1
-2OMoR6wY3WECAggAMB0GCWCGSAFlAwQBKgQQFK48c+H7S8tVJ5n3O1UdwwSCBNAu
-o9BbycGa6LAWyjEK77S3eyKkNHatAaPE+yKklEN22HY9GOTId9wnhyQ0pZgan9ml
-VtHxyz0ExfveT8gajbyV4ezE/OXVFsmx+i1P0aIRCHHRCY0MVbZFgBEhLH73EJVn
-E/+3RUEjz9XJphCDK/Bg2DhYpPN1WnplksRSRCcpsSw7U5qfmbfb2T5ZLmho1oJr
-M6kU+gvtqJ+cZ+rMT7zpDLDz6bzT6O2HRPl4MuvzbrSg5nbBlAnW2kVZzguIqqc9
-9KiY6sKziYhGSdPwJEcek/VyMVJm8gn1Bz4CQdKOrVGIOstSSoXYClCUjOLowL6F
-MxGk25NJJBUy2uApfOQOIs5vvgu55CY1JRcQwL4dSy+5Ueqcw3VG17ExfFqGk5cZ
-b001DIdiL+ResgwvHdrC5mwKZ1mtjLGnX8uL6Uch3C+ullPU592yUXnDsFZn9An1
-UDCjFCbtUFKAi6TcYf3yOCMgfa3iAzhae7CIvC7I9JVJjA8MyNTlWgAqGeM2HalI
-84TEb09r8KotqtlAvD8Hs5uO4Iwf/sjOhSxP2SIG016oXU8KsH8pGvlYyLfA1WkX
-uI+46zAk1AHoAEiTox9tNtWYnIeGukbNBkNuzeWkS56GEZJto6ji7DIj3xsBnhJt
-3ciJnUR46z0SyofDexU60dsduliMeExVe2qde8XS3oKcOnTLBtCHxgIb8T73Zr22
-VkYPcjRF8Aur207DThKJ+D2dRQ0DTj+DBeT1q5gTCAwZUb/tuwEw9CEBGmy9wR5C
-C3M2auRL9QHaXU+kKpnbFPI4xkonJbLCC/VWE/qY60wsHdrL9TFuBOw4Mt+Q/gjC
-w8Vi1V+/2DBIIums/teBbLeeEy/B97k8N5lJwCcp8mGiAl/hXQfHbetksObWNqpj
-V4zl7NCylTgyh2UqzZtQQGLeBT3Q1u4EaQIPt8xwxLrR+wne6wjuLGaM4OqKOVUa
-gWdXdi55q0S1aluqoHTWK0VYy+5BMpBgHREpnZDtAJ06YljAmRk2j8IjFrZi1COK
-quL+Uj6g1iBy2zUZYMLUb73I3f8VX7Qmps0iCrNAwpJjpsWYJOf+HzJFgC+YiYs0
-J1uJcm5ypggCDSP4PRDgvbcs7pIkbQFHZQ1Y7EesX4m61f7Xc72J6Y4lNRfhEjKP
-c2n8XDj6dkxtEDsmegrGfDmUZ9z6PjKjMRWUxHMQIs2FxnCbdZuoDX3IN5EJtW3w
-iEAmOYCcV4Vep4Vckfwz6aTSfbmwmDcH56yYckDBQq2bCuySOgdSUUWXn+MshTUW
-Ef+LvCW0BSqz4p3D0vBySnauzh9YCbva7b9ibuhavwB+Ys2Qn2cWfzcvUPqmXUOb
-mnkq3k9FjgKM4vej7FxdbCffeU8tiAuYSKFZS/CiZU8Qoqy75BwT4bxa7Qfvdmgk
-NkzCkyGV9xYlCiT1gqbX6XU9bmotUuP3VSSO7ehpMW0k99W6ml/NJqEBmZ0f9/Ax
-qaYheAy+9TtHbcSLOcZj6+7SYZNsvayE3HKnGCuKV0TgSi9VOQLZ6QDxkNU/3oHo
-I2g49KDqyvvx/BmZwEKnFsDpKLluCklwLUf8qKm+Kji8W95+JQC2k3qumIZ6Ao8Z
-OKoJStGgA8ZjuENxatZJk42BI++oNZOBA08uKvW1Mw==
------END ENCRYPTED PRIVATE KEY-----
diff --git a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido2-v1/var/opt/keys/own/nevisfido-techuser-key/keypass b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido2-v1/var/opt/keys/own/nevisfido-techuser-key/keypass
deleted file mode 100755
index 85ccc28..0000000
--- a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido2-v1/var/opt/keys/own/nevisfido-techuser-key/keypass
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-echo 'Hsk+IJIkp1oGu8i1S+w6p2QMDB+9WFSNjNlSYdUCfA8='
\ No newline at end of file
diff --git a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido2-v1/var/opt/keys/own/nevisfido-techuser-key/keystore.jks b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido2-v1/var/opt/keys/own/nevisfido-techuser-key/keystore.jks
deleted file mode 100644
index 9641839..0000000
Binary files a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido2-v1/var/opt/keys/own/nevisfido-techuser-key/keystore.jks and /dev/null differ
diff --git a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido2-v1/var/opt/keys/own/nevisfido-techuser-key/keystore.p12 b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido2-v1/var/opt/keys/own/nevisfido-techuser-key/keystore.p12
deleted file mode 100644
index 3ca00a3..0000000
Binary files a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido2-v1/var/opt/keys/own/nevisfido-techuser-key/keystore.p12 and /dev/null differ
diff --git a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido2-v1/var/opt/keys/own/nevisfido-techuser-key/keystore.pem b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido2-v1/var/opt/keys/own/nevisfido-techuser-key/keystore.pem
deleted file mode 100644
index 6911903..0000000
--- a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido2-v1/var/opt/keys/own/nevisfido-techuser-key/keystore.pem
+++ /dev/null
@@ -1,49 +0,0 @@
------BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFKzBVBgkqhkiG9w0BBQ0wSDAnBgkqhkiG9w0BBQwwGgQUA8Ytt1cRwiCjGKC1
-2OMoR6wY3WECAggAMB0GCWCGSAFlAwQBKgQQFK48c+H7S8tVJ5n3O1UdwwSCBNAu
-o9BbycGa6LAWyjEK77S3eyKkNHatAaPE+yKklEN22HY9GOTId9wnhyQ0pZgan9ml
-VtHxyz0ExfveT8gajbyV4ezE/OXVFsmx+i1P0aIRCHHRCY0MVbZFgBEhLH73EJVn
-E/+3RUEjz9XJphCDK/Bg2DhYpPN1WnplksRSRCcpsSw7U5qfmbfb2T5ZLmho1oJr
-M6kU+gvtqJ+cZ+rMT7zpDLDz6bzT6O2HRPl4MuvzbrSg5nbBlAnW2kVZzguIqqc9
-9KiY6sKziYhGSdPwJEcek/VyMVJm8gn1Bz4CQdKOrVGIOstSSoXYClCUjOLowL6F
-MxGk25NJJBUy2uApfOQOIs5vvgu55CY1JRcQwL4dSy+5Ueqcw3VG17ExfFqGk5cZ
-b001DIdiL+ResgwvHdrC5mwKZ1mtjLGnX8uL6Uch3C+ullPU592yUXnDsFZn9An1
-UDCjFCbtUFKAi6TcYf3yOCMgfa3iAzhae7CIvC7I9JVJjA8MyNTlWgAqGeM2HalI
-84TEb09r8KotqtlAvD8Hs5uO4Iwf/sjOhSxP2SIG016oXU8KsH8pGvlYyLfA1WkX
-uI+46zAk1AHoAEiTox9tNtWYnIeGukbNBkNuzeWkS56GEZJto6ji7DIj3xsBnhJt
-3ciJnUR46z0SyofDexU60dsduliMeExVe2qde8XS3oKcOnTLBtCHxgIb8T73Zr22
-VkYPcjRF8Aur207DThKJ+D2dRQ0DTj+DBeT1q5gTCAwZUb/tuwEw9CEBGmy9wR5C
-C3M2auRL9QHaXU+kKpnbFPI4xkonJbLCC/VWE/qY60wsHdrL9TFuBOw4Mt+Q/gjC
-w8Vi1V+/2DBIIums/teBbLeeEy/B97k8N5lJwCcp8mGiAl/hXQfHbetksObWNqpj
-V4zl7NCylTgyh2UqzZtQQGLeBT3Q1u4EaQIPt8xwxLrR+wne6wjuLGaM4OqKOVUa
-gWdXdi55q0S1aluqoHTWK0VYy+5BMpBgHREpnZDtAJ06YljAmRk2j8IjFrZi1COK
-quL+Uj6g1iBy2zUZYMLUb73I3f8VX7Qmps0iCrNAwpJjpsWYJOf+HzJFgC+YiYs0
-J1uJcm5ypggCDSP4PRDgvbcs7pIkbQFHZQ1Y7EesX4m61f7Xc72J6Y4lNRfhEjKP
-c2n8XDj6dkxtEDsmegrGfDmUZ9z6PjKjMRWUxHMQIs2FxnCbdZuoDX3IN5EJtW3w
-iEAmOYCcV4Vep4Vckfwz6aTSfbmwmDcH56yYckDBQq2bCuySOgdSUUWXn+MshTUW
-Ef+LvCW0BSqz4p3D0vBySnauzh9YCbva7b9ibuhavwB+Ys2Qn2cWfzcvUPqmXUOb
-mnkq3k9FjgKM4vej7FxdbCffeU8tiAuYSKFZS/CiZU8Qoqy75BwT4bxa7Qfvdmgk
-NkzCkyGV9xYlCiT1gqbX6XU9bmotUuP3VSSO7ehpMW0k99W6ml/NJqEBmZ0f9/Ax
-qaYheAy+9TtHbcSLOcZj6+7SYZNsvayE3HKnGCuKV0TgSi9VOQLZ6QDxkNU/3oHo
-I2g49KDqyvvx/BmZwEKnFsDpKLluCklwLUf8qKm+Kji8W95+JQC2k3qumIZ6Ao8Z
-OKoJStGgA8ZjuENxatZJk42BI++oNZOBA08uKvW1Mw==
------END ENCRYPTED PRIVATE KEY-----
-
------BEGIN CERTIFICATE-----
-MIIC6TCCAo+gAwIBAgIQfcfd9dgdKT/5gdDbpAiKlDAKBggqhkjOPQQDAjAYMRYw
-FAYDVQQDEw1zZWxmc2lnbmVkLWNhMB4XDTI0MDUwNTE1NTAzOFoXDTI1MDUwNTE1
-NTAzOFowWDELMAkGA1UEBhMCQ0gxDDAKBgNVBAgTA0s4UzEMMAoGA1UEBxMDSzhT
-MQwwCgYDVQQKEwNLOFMxDDAKBgNVBAsTA0s4UzERMA8GA1UEAxMIZmlkby11YWYw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWcQPIzUN2zbPkB3yISIGw
-mDAd285YKm/ZLbE4WWw2SIHhjfh0XoYZ6QvLMENWcC8/iOX/6g6upQnYegzZKlST
-Lix0zJjEbtMlK8fITiPhwziWPSOeqtuW66Rj+13G6kKYVtZ8vviu73LBDkXKHSNi
-g4knNgACJpIItiDhOmtmD3Wsb8JAIQ161m7D3i2jr/kqBFKLc2DXcCHYSwxBXu3A
-99iqWxoHfprL/L7RfxBo7mKbk+xjRvw6wFHBb76m6hd8fe4yg3g9zZTsZ5KeKqtA
-8NT7CTG26F/MEBEmreU6NcNP62sYBkQiY+K5WweUs5qnDCAUPz+Upu0lX49ZDsvZ
-AgMBAAGjga8wgawwDgYDVR0PAQH/BAQDAgeAMB0GA1UdJQQWMBQGCCsGAQUFBwMB
-BggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB8GA1UdIwQYMBaAFPthGhYiMfCS8WJz
-C+TRPH/IDi5RMEwGA1UdEQRFMEOCCGZpZG8tdWFmgiFmaWRvLXVhZi5hZG4tYWdv
-di1uZXZpc2lkbS0wMS11YXSBFG5vcmVwbHlAbG9jYWwuZG9tYWluMAoGCCqGSM49
-BAMCA0gAMEUCIBCueTTUwnN53/dIs6W4FpbFtF/wkAhYjLZGuKgY08ZAAiEA9VFz
-WoaxaINHqGPR10Sh1hqeuCHRzHxnQUt07sZf2DU=
------END CERTIFICATE-----
diff --git a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido2-v1/var/opt/nevisfido/default/conf/nevisfido.yml b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido2-v1/var/opt/nevisfido/default/conf/nevisfido.yml
index 0a6f0ae..b5cc058 100644
--- a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido2-v1/var/opt/nevisfido/default/conf/nevisfido.yml
+++ b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-fido2-v1/var/opt/nevisfido/default/conf/nevisfido.yml
@@ -16,9 +16,9 @@ management:
 credential-repository:
   type: "nevisidm"
   client-id: "cfa9c9b9-119f-4dff-9bb8-86d7c0cf2720"
-  rest-url: "https://idm.adn-agov-nevisidm-01-uat:8989/nevisidm"
-  keystore: "/var/opt/keys/own/nevisfido-techuser-key/keystore.p12"
-  keystore-passphrase: "${exec:/var/opt/keys/own/nevisfido-techuser-key/keypass}"
+  rest-url: "https://idm.adn-agov-nevisidm-admin-01-uat:8989/nevisidm"
+  keystore: "/var/opt/keys/own/ob-fido2-v1-default-client-identity/keystore.p12"
+  keystore-passphrase: "${exec:/var/opt/keys/own/ob-fido2-v1-default-client-identity/keypass}"
   keystore-type: "pkcs12"
   truststore: "/var/opt/keys/trust/ob-fido2-v1-agov-work-internal-trust-store/truststore.p12"
   truststore-passphrase: "${exec:/var/opt/keys/trust/ob-fido2-v1-agov-work-internal-trust-store/keypass}"
diff --git a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-proxy-v1/etc/nevis/k8s-ob-proxy-b4d2da2fa2d0b060752a1fe2.yaml b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-proxy-v1/etc/nevis/k8s-ob-proxy-b4d2da2fa2d0b060752a1fe2.yaml
index 1ba2a7a..a7824d0 100644
--- a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-proxy-v1/etc/nevis/k8s-ob-proxy-b4d2da2fa2d0b060752a1fe2.yaml
+++ b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-proxy-v1/etc/nevis/k8s-ob-proxy-b4d2da2fa2d0b060752a1fe2.yaml
@@ -46,7 +46,7 @@ spec:
   podDisruptionBudget:
     maxUnavailable: "50%"
   git:
-    tag: "r-9e206f8d793087e7a1996ae58b5ed2116e3e9af7"
+    tag: "r-6084449dd6cbd475bb25d36cf2a36e2ccd661824"
     dir: "DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-proxy-v1"
     credentials: "git-credentials"
   keystores:
diff --git a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-proxy-v1/etc/nevis/k8s-ob-proxy-v1-ob-mock-me-realm-signer-trust-b4d2da2fa2d0b060752a1fe2.yaml b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-proxy-v1/etc/nevis/k8s-ob-proxy-v1-ob-mock-me-realm-signer-trust-b4d2da2fa2d0b060752a1fe2.yaml
index a9c4798..8f08d37 100644
--- a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-proxy-v1/etc/nevis/k8s-ob-proxy-v1-ob-mock-me-realm-signer-trust-b4d2da2fa2d0b060752a1fe2.yaml
+++ b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-proxy-v1/etc/nevis/k8s-ob-proxy-v1-ob-mock-me-realm-signer-trust-b4d2da2fa2d0b060752a1fe2.yaml
@@ -9,4 +9,6 @@ metadata:
     projectKey: "DEFAULT-ADN-AGOV-WORK-OB-PROJECT"
     patternId: "b4d2da2fa2d0b060752a1fe2"
 spec:
-  keystores: []
+  keystores:
+  - name: "ob-auth-sh4r3d-default-default-signer"
+    namespace: "adn-agov-nevisidm-ob-01-uat"
diff --git a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-proxy-v1/etc/nevis/k8s-ob-proxy-v1-ob-realm-signer-trust-b4d2da2fa2d0b060752a1fe2.yaml b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-proxy-v1/etc/nevis/k8s-ob-proxy-v1-ob-realm-signer-trust-b4d2da2fa2d0b060752a1fe2.yaml
index 24047b0..19c0d4d 100644
--- a/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-proxy-v1/etc/nevis/k8s-ob-proxy-v1-ob-realm-signer-trust-b4d2da2fa2d0b060752a1fe2.yaml
+++ b/DEFAULT-ADN-AGOV-WORK-OB-PROJECT/DEFAULT-DEFAULT-ADN-AGOV-OB-INV/ob-proxy-v1/etc/nevis/k8s-ob-proxy-v1-ob-realm-signer-trust-b4d2da2fa2d0b060752a1fe2.yaml
@@ -9,4 +9,6 @@ metadata:
     projectKey: "DEFAULT-ADN-AGOV-WORK-OB-PROJECT"
     patternId: "b4d2da2fa2d0b060752a1fe2"
 spec:
-  keystores: []
+  keystores:
+  - name: "ob-auth-sh4r3d-default-default-signer"
+    namespace: "adn-agov-nevisidm-ob-01-uat"