diff --git a/patterns/nevisFido-techuser-key_540faa8b8de855d32f179dac.yml b/patterns/nevisFido-techuser-key_540faa8b8de855d32f179dac.yml
deleted file mode 100644
index 411259c..0000000
--- a/patterns/nevisFido-techuser-key_540faa8b8de855d32f179dac.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-schemaVersion: "1.0"
-pattern:
-  id: "540faa8b8de855d32f179dac"
-  className: "ch.nevis.admin.v4.plugin.nevisproxy.patterns.PemKeyStoreProvider"
-  name: "nevisFido-techuser-key"
-  properties:
-    keystoreFiles: "var://nevisfido-techuser-key-key-store-content"
-    keyPass: "var://nevisfido-techuser-key-private-key-passphrase"
diff --git a/patterns/ob-auth-signer-trust-store_17743e3041d86717f2697c1c.yml b/patterns/ob-auth-signer-trust-store_17743e3041d86717f2697c1c.yml
deleted file mode 100644
index 4726750..0000000
--- a/patterns/ob-auth-signer-trust-store_17743e3041d86717f2697c1c.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-schemaVersion: "1.0"
-pattern:
-  id: "17743e3041d86717f2697c1c"
-  className: "ch.nevis.admin.v4.plugin.nevisproxy.patterns.PemTrustStoreProvider"
-  name: "ob-auth-signer-trust-store"
-  properties:
-    truststoreFile: "var://ob-auth-signer-trust-store"
diff --git a/patterns/ob-auth-signer_f94db670348c3abce35d473a.yml b/patterns/ob-auth-signer_f94db670348c3abce35d473a.yml
deleted file mode 100644
index 9c53e15..0000000
--- a/patterns/ob-auth-signer_f94db670348c3abce35d473a.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-schemaVersion: "1.0"
-pattern:
-  id: "f94db670348c3abce35d473a"
-  className: "ch.nevis.admin.v4.plugin.nevisproxy.patterns.PemKeyStoreProvider"
-  name: "ob-auth-signer"
-  properties:
-    keystoreFiles: "var://ob-auth-signer-key-store"
-    keyPass: "var://ob-auth-signer-private-key-passphrase"
diff --git a/patterns/ob-auth_d00b0dcbe241793d30daf91c.yml b/patterns/ob-auth_d00b0dcbe241793d30daf91c.yml
index 2a2ca39..19e5a5a 100644
--- a/patterns/ob-auth_d00b0dcbe241793d30daf91c.yml
+++ b/patterns/ob-auth_d00b0dcbe241793d30daf91c.yml
@@ -9,5 +9,3 @@ pattern:
     - "pattern://25dbf93ef96abab8182ebefc"
     backendTrustStore:
     - "pattern://6d7b43fa096a87eaa1a44952"
-    signerKeyStore:
-    - "pattern://f94db670348c3abce35d473a"
diff --git a/patterns/ob-fido-uaf-instance-settings_a3e412c0c4aaf7217c8f5994.yml b/patterns/ob-fido-uaf-instance-settings_a3e412c0c4aaf7217c8f5994.yml
deleted file mode 100644
index 8640666..0000000
--- a/patterns/ob-fido-uaf-instance-settings_a3e412c0c4aaf7217c8f5994.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-schemaVersion: "1.0"
-pattern:
-  id: "a3e412c0c4aaf7217c8f5994"
-  className: "ch.nevis.admin.v4.plugin.nevisfido.deployable.patterns.GenericNevisFIDOSettings"
-  name: "ob-fido-uaf-instance-settings"
-  properties: {}
diff --git a/patterns/ob-fido-uaf_d990accd4fedae1acbc7109d.yml b/patterns/ob-fido-uaf_d990accd4fedae1acbc7109d.yml
index 835ab8a..28ae0d6 100644
--- a/patterns/ob-fido-uaf_d990accd4fedae1acbc7109d.yml
+++ b/patterns/ob-fido-uaf_d990accd4fedae1acbc7109d.yml
@@ -8,8 +8,6 @@ pattern:
     logging:
     - "pattern://2c2ffee41da5095996e1f131"
     frontendAddress: "https://auth.agov-w.azure.adnovum.net"
-    signerTrustStore:
-    - "pattern://17743e3041d86717f2697c1c"
     database:
     - "pattern://e891ec2f4f924135261d22ce"
     link: "Custom URI"
@@ -17,9 +15,5 @@ pattern:
     nevisidm:
     - "pattern://30b947532c14be9f85f63a55"
     client: "var://agov-client-id"
-    backendKeyStore:
-    - "pattern://540faa8b8de855d32f179dac"
     backendTrustStore:
     - "pattern://6d7b43fa096a87eaa1a44952"
-    addons:
-    - "pattern://a3e412c0c4aaf7217c8f5994"
diff --git a/patterns/ob-fido2_a2d03bb46b87b90160dc83d7.yml b/patterns/ob-fido2_a2d03bb46b87b90160dc83d7.yml
index f5021c5..88c7e19 100644
--- a/patterns/ob-fido2_a2d03bb46b87b90160dc83d7.yml
+++ b/patterns/ob-fido2_a2d03bb46b87b90160dc83d7.yml
@@ -5,15 +5,11 @@ pattern:
   name: "ob-fido2"
   deploymentHosts: "ob-fido2"
   properties:
-    signerTrustStore:
-    - "pattern://17743e3041d86717f2697c1c"
     relyingPartyName: "var://nevisfido2-relying-party-name"
     relyingPartyId: "var://nevisfido2-relying-party-id"
     relyingPartyOrigins: "var://nevisfido2-relying-party-origins"
     idm:
     - "pattern://30b947532c14be9f85f63a55"
     client: "var://agov-client-id"
-    clientKeyStore:
-    - "pattern://540faa8b8de855d32f179dac"
     serverTrustStore:
     - "pattern://6d7b43fa096a87eaa1a44952"
diff --git a/patterns/work-idm-connector_30b947532c14be9f85f63a55.yml b/patterns/work-idm-connector_30b947532c14be9f85f63a55.yml
index e7c2250..6d31e82 100644
--- a/patterns/work-idm-connector_30b947532c14be9f85f63a55.yml
+++ b/patterns/work-idm-connector_30b947532c14be9f85f63a55.yml
@@ -6,4 +6,4 @@ pattern:
   properties:
     url: "idm:8989"
     kubernetes: "other_namespace"
-    kubernetesNamespace: "adn-agov-nevisidm-01-uat"
+    kubernetesNamespace: "adn-agov-nevisidm-admin-01-uat"
diff --git a/variables.yml b/variables.yml
index 08dd464..8f8d6f4 100644
--- a/variables.yml
+++ b/variables.yml
@@ -57,21 +57,6 @@ variables:
       maxAllowed: 1
     value: "ns"
     requireOverloading: true
-  nevisfido-techuser-key-key-store-content:
-    className: "ch.nevis.admin.v4.plugin.base.generation.property.AttachmentProperty"
-    parameters:
-      minRequired: 0
-      secretPreserving: true
-    value: null
-    requireOverloading: true
-  nevisfido-techuser-key-private-key-passphrase:
-    className: "ch.nevis.admin.v4.plugin.base.generation.property.SimpleTextProperty"
-    parameters:
-      minRequired: 0
-      maxAllowed: 1
-      secret: true
-    value: "sample password"
-    requireOverloading: true
   nevisfido2-relying-party-id:
     className: "ch.nevis.admin.v4.plugin.base.generation.property.HostProperty"
     parameters:
@@ -96,25 +81,3 @@ variables:
     - "https://nevisidm.agov-w.azure.adnovum.net"
     - "https://auth.agov-w.azure.adnovum.net"
     requireOverloading: true
-  ob-auth-signer-key-store:
-    className: "ch.nevis.admin.v4.plugin.base.generation.property.AttachmentProperty"
-    parameters:
-      minRequired: 0
-      secretPreserving: true
-    value: null
-    requireOverloading: true
-  ob-auth-signer-private-key-passphrase:
-    className: "ch.nevis.admin.v4.plugin.base.generation.property.SimpleTextProperty"
-    parameters:
-      minRequired: 0
-      maxAllowed: 1
-      secret: true
-    value: "sample password"
-    requireOverloading: true
-  ob-auth-signer-trust-store:
-    className: "ch.nevis.admin.v4.plugin.base.generation.property.AttachmentProperty"
-    parameters:
-      minRequired: 0
-      secretPreserving: true
-    value: null
-    requireOverloading: true