diff --git a/store_types.json b/store_types.json
index 3460b5b..cf7471a 100644
--- a/store_types.json
+++ b/store_types.json
@@ -180,7 +180,7 @@
       "StoreRequired": false,
       "Style": "Default"
     },
-    "PrivateKeyAllowed": "Optional",
+    "PrivateKeyAllowed": "Required",
     "ServerRequired": true,
     "PowerShell": false,
     "BlueprintAllowed": true,
@@ -951,14 +951,14 @@
   {
     "Name": "Bosch IP Camera",
     "ShortName": "BIPCamera",
-    "Capability": "BoschIpCamera",
+    "Capability": "BIPCamera",
     "LocalStore": false,
     "SupportedOperations": {
-      "Add": false,
+      "Add": true,
       "Create": false,
       "Discovery": false,
       "Enrollment": true,
-      "Remove": false
+      "Remove": true
     },
     "Properties": [
       {
@@ -2381,30 +2381,6 @@
         "DependsOn": "",
         "DefaultValue": "cert",
         "Required": true
-      },
-      {
-        "Name": "ServerUsername",
-        "DisplayName": "Server Username",
-        "Type": "Secret",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": false
-      },
-      {
-        "Name": "ServerPassword",
-        "DisplayName": "Server Password",
-        "Type": "Secret",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": true
-      },
-      {
-        "Name": "ServerUseSsl",
-        "DisplayName": "Use SSL",
-        "Type": "Bool",
-        "DependsOn": "",
-        "DefaultValue": "true",
-        "Required": true
       }
     ],
     "EntryParameters": null,
@@ -2436,28 +2412,18 @@
     },
     "Properties": [
       {
-        "Name": "ServerUsername",
-        "DisplayName": "Server Username",
-        "Type": "Secret",
-        "DependsOn": "",
-        "DefaultValue": null,
+        "Name": "SeparateChain",
+        "DisplayName": "Separate Certificate Chain",
+        "Type": "Bool",
+        "DefaultValue": "false",
         "Required": false
       },
       {
-        "Name": "ServerPassword",
-        "DisplayName": "Server Password",
-        "Type": "Secret",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": true
-      },
-      {
-        "Name": "ServerUseSsl",
-        "DisplayName": "Use SSL",
+        "Name": "IncludeCertChain",
+        "DisplayName": "Include Certificate Chain",
         "Type": "Bool",
-        "DependsOn": "",
         "DefaultValue": "true",
-        "Required": true
+        "Required": false
       }
     ],
     "EntryParameters": null,
@@ -2517,8 +2483,8 @@
         "DisplayName": "CertificateDataFieldName",
         "Type": "String",
         "DependsOn": "",
-        "DefaultValue": null,
-        "Required": false
+        "DefaultValue": ".jks",
+        "Required": true
       },
       {
         "Name": "PasswordFieldName",
@@ -2530,7 +2496,7 @@
       },
       {
         "Name": "PasswordIsK8SSecret",
-        "DisplayName": "PasswordIsK8SSecret",
+        "DisplayName": "Password Is K8S Secret",
         "Type": "Bool",
         "DependsOn": "",
         "DefaultValue": "false",
@@ -2543,36 +2509,12 @@
         "DependsOn": "",
         "DefaultValue": null,
         "Required": false
-      },
-      {
-        "Name": "ServerUsername",
-        "DisplayName": "Server Username",
-        "Type": "Secret",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": false
-      },
-      {
-        "Name": "ServerPassword",
-        "DisplayName": "Server Password",
-        "Type": "Secret",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": true
-      },
-      {
-        "Name": "ServerUseSsl",
-        "DisplayName": "Use SSL",
-        "Type": "Bool",
-        "DependsOn": "",
-        "DefaultValue": "true",
-        "Required": true
       }
     ],
     "EntryParameters": null,
     "PasswordOptions": {
       "EntrySupported": false,
-      "StoreRequired": true,
+      "StoreRequired": false,
       "Style": "Default"
     },
     "StorePathType": "",
@@ -2606,28 +2548,18 @@
         "Required": false
       },
       {
-        "Name": "ServerUsername",
-        "DisplayName": "Server Username",
-        "Type": "Secret",
-        "DependsOn": "",
-        "DefaultValue": null,
+        "Name": "SeparateChain",
+        "DisplayName": "Separate Certificate Chain",
+        "Type": "Bool",
+        "DefaultValue": "false",
         "Required": false
       },
       {
-        "Name": "ServerPassword",
-        "DisplayName": "Server Password",
-        "Type": "Secret",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": true
-      },
-      {
-        "Name": "ServerUseSsl",
-        "DisplayName": "Use SSL",
+        "Name": "IncludeCertChain",
+        "DisplayName": "Include Certificate Chain",
         "Type": "Bool",
-        "DependsOn": "",
         "DefaultValue": "true",
-        "Required": true
+        "Required": false
       }
     ],
     "EntryParameters": null,
@@ -2659,12 +2591,20 @@
     },
     "Properties": [
       {
-        "Name": "KubeSecretKey",
-        "DisplayName": "Kube Secret Key",
+        "Name": "KubeSecretType",
+        "DisplayName": "Kube Secret Type",
         "Type": "String",
         "DependsOn": "",
-        "DefaultValue": "pfx",
-        "Required": false
+        "DefaultValue": "pkcs12",
+        "Required": true
+      },
+      {
+        "Name": "CertificateDataFieldName",
+        "DisplayName": "CertificateDataFieldName",
+        "Type": "String",
+        "DependsOn": "",
+        "DefaultValue": ".p12",
+        "Required": true
       },
       {
         "Name": "PasswordFieldName",
@@ -2698,38 +2638,6 @@
         "DefaultValue": null,
         "Required": false
       },
-      {
-        "Name": "ServerUsername",
-        "DisplayName": "Server Username",
-        "Type": "Secret",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": false
-      },
-      {
-        "Name": "ServerPassword",
-        "DisplayName": "Server Password",
-        "Type": "Secret",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": true
-      },
-      {
-        "Name": "ServerUseSsl",
-        "DisplayName": "Use SSL",
-        "Type": "Bool",
-        "DependsOn": "",
-        "DefaultValue": "true",
-        "Required": true
-      },
-      {
-        "Name": "KubeSecretType",
-        "DisplayName": "Kube Secret Type",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": "pkcs12",
-        "Required": true
-      },
       {
         "Name": "StorePasswordPath",
         "DisplayName": "StorePasswordPath",
@@ -2742,7 +2650,7 @@
     "EntryParameters": null,
     "PasswordOptions": {
       "EntrySupported": false,
-      "StoreRequired": true,
+      "StoreRequired": false,
       "Style": "Default"
     },
     "StorePathType": "",
@@ -2792,28 +2700,18 @@
         "Required": true
       },
       {
-        "Name": "ServerUsername",
-        "DisplayName": "Server Username",
-        "Type": "Secret",
-        "DependsOn": "",
-        "DefaultValue": null,
+        "Name": "SeparateChain",
+        "DisplayName": "Separate Certificate Chain",
+        "Type": "Bool",
+        "DefaultValue": "false",
         "Required": false
       },
       {
-        "Name": "ServerPassword",
-        "DisplayName": "Server Password",
-        "Type": "Secret",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": true
-      },
-      {
-        "Name": "ServerUseSsl",
-        "DisplayName": "Use SSL",
+        "Name": "IncludeCertChain",
+        "DisplayName": "Include Certificate Chain",
         "Type": "Bool",
-        "DependsOn": "",
         "DefaultValue": "true",
-        "Required": true
+        "Required": false
       }
     ],
     "EntryParameters": null,
@@ -2869,28 +2767,18 @@
         "Required": true
       },
       {
-        "Name": "ServerUsername",
-        "DisplayName": "Server Username",
-        "Type": "Secret",
-        "DependsOn": "",
-        "DefaultValue": null,
+        "Name": "SeparateChain",
+        "DisplayName": "Separate Certificate Chain",
+        "Type": "Bool",
+        "DefaultValue": "false",
         "Required": false
       },
       {
-        "Name": "ServerPassword",
-        "DisplayName": "Server Password",
-        "Type": "Secret",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": true
-      },
-      {
-        "Name": "ServerUseSsl",
-        "DisplayName": "Use SSL",
+        "Name": "IncludeCertChain",
+        "DisplayName": "Include Certificate Chain",
         "Type": "Bool",
-        "DependsOn": "",
         "DefaultValue": "true",
-        "Required": true
+        "Required": false
       }
     ],
     "EntryParameters": null,
@@ -3028,49 +2916,14 @@
         "Required": false
       }
     ],
-    "EntryParameters": [
-      {
-        "Name": "TlsMinVersion",
-        "DisplayName": "TLS Min Version",
-        "Type": "MultipleChoice",
-        "RequiredWhen": {
-          "HasPrivateKey": false,
-          "OnAdd": false,
-          "OnRemove": false,
-          "OnReenrollment": false
-        },
-        "Options": ",tls1-0,tls1-1,tls1-2"
-      },
-      {
-        "Name": "TLSMaxVersion",
-        "DisplayName": "TLS Max Version",
-        "Type": "MultipleChoice",
-        "RequiredWhen": {
-          "HasPrivateKey": false,
-          "OnAdd": false,
-          "OnRemove": false,
-          "OnReenrollment": false
-        },
-        "Options": ",tls1-0,tls1-1,tls1-2,max"
-      },
-      {
-        "Name": "TlsProfileName",
-        "DisplayName": "TLS Profile Name",
-        "Type": "String",
-        "RequiredWhen": {
-          "HasPrivateKey": false,
-          "OnAdd": false,
-          "OnRemove": false,
-          "OnReenrollment": false
-        }
-      }
-    ],
+    "EntryParameters": [],
     "PasswordOptions": {
       "EntrySupported": false,
       "StoreRequired": false,
       "Style": "Default"
     },
     "PrivateKeyAllowed": "Optional",
+    "JobProperties": [],
     "ServerRequired": true,
     "PowerShell": false,
     "BlueprintAllowed": false,