diff --git a/kubescape-reports/cis-v1.23-t1.0.1.html b/kubescape-reports/cis-v1.23-t1.0.1.html
index 9eb54874..8aa1618e 100644
--- a/kubescape-reports/cis-v1.23-t1.0.1.html
+++ b/kubescape-reports/cis-v1.23-t1.0.1.html
@@ -320,10 +320,10 @@ <h2>Failed Resources:</h2>
     </br>
     
     
-    <h3>Name: -recruit-postgres</h3>
-      <p>ApiVersion: apps/v1</p>
-      <p>Kind: StatefulSet</p>
-      <p>Name: -recruit-postgres</p>
+    <h3>Name: -gateway-vfps-test-connection</h3>
+      <p>ApiVersion: v1</p>
+      <p>Kind: Pod</p>
+      <p>Name: -gateway-vfps-test-connection</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -340,24 +340,44 @@ <h3>Name: -recruit-postgres</h3>
           <td class="resourceSeverityCell">High</td>
           <td class="resourceNameCell">CIS-5.7.3 Apply Security Context to Your Pods and Containers</td>
           <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0211">C-0211</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.readOnlyRootFilesystem=true</p>  <p>spec.template.spec.containers[0].securityContext.runAsGroup=1000</p>  <p>spec.template.spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.fsGroupChangePolicy=Always</p>  <p>spec.template.spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
+          <td class="resourceRemediationCell"> <p>spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.containers[1].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
         </tr>
         
+        </tbody>
+      </table>
+    </div>
+    
+    <h3>Name: -vfps-test-connection</h3>
+      <p>ApiVersion: v1</p>
+      <p>Kind: Pod</p>
+      <p>Name: -vfps-test-connection</p>
+      <p>Namespace: </p>
+      <table>
+        <thead>
         <tr>
-          <td class="resourceSeverityCell">Medium</td>
-          <td class="resourceNameCell">CIS-5.4.1 Prefer using secrets as files over secrets as environment variables</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0207">C-0207</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].env[4].name</p> </td>
+          <th class="resourceSeverityCell">Severity</th>
+          <th class="resourceNameCell">Name</th>
+          <th class="resourceURLCell">Docs</th>
+          <th class="resourceRemediationCell">Assisted Remediation</th>
+        </tr>
+        </thead>
+        <tbody>
+        
+        <tr>
+          <td class="resourceSeverityCell">High</td>
+          <td class="resourceNameCell">CIS-5.7.3 Apply Security Context to Your Pods and Containers</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0211">C-0211</a></td>
+          <td class="resourceRemediationCell"> <p>spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.containers[1].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
         </tr>
         
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -ohdsi-postgres</h3>
-      <p>ApiVersion: apps/v1</p>
-      <p>Kind: StatefulSet</p>
-      <p>Name: -ohdsi-postgres</p>
+    <h3>Name: -vfps-migrations-v1-3-6</h3>
+      <p>ApiVersion: batch/v1</p>
+      <p>Kind: Job</p>
+      <p>Name: -vfps-migrations-v1-3-6</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -370,21 +390,28 @@ <h3>Name: -ohdsi-postgres</h3>
         </thead>
         <tbody>
         
+        <tr>
+          <td class="resourceSeverityCell">High</td>
+          <td class="resourceNameCell">CIS-5.7.3 Apply Security Context to Your Pods and Containers</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0211">C-0211</a></td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
+        </tr>
+        
         <tr>
           <td class="resourceSeverityCell">Medium</td>
           <td class="resourceNameCell">CIS-5.4.1 Prefer using secrets as files over secrets as environment variables</td>
           <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0207">C-0207</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].env[4].name</p> </td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].env[3].name</p> </td>
         </tr>
         
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -mailhog</h3>
+    <h3>Name: -ohdsi-test-connection</h3>
       <p>ApiVersion: v1</p>
-      <p>Kind: ServiceAccount</p>
-      <p>Name: -mailhog</p>
+      <p>Kind: Pod</p>
+      <p>Name: -ohdsi-test-connection</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -398,10 +425,10 @@ <h3>Name: -mailhog</h3>
         <tbody>
         
         <tr>
-          <td class="resourceSeverityCell">Medium</td>
-          <td class="resourceNameCell">CIS-5.1.6 Ensure that Service Account Tokens are only mounted where necessary</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0190">C-0190</a></td>
-          <td class="resourceRemediationCell"> <p>automountServiceAccountToken=false</p> </td>
+          <td class="resourceSeverityCell">High</td>
+          <td class="resourceNameCell">CIS-5.7.3 Apply Security Context to Your Pods and Containers</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0211">C-0211</a></td>
+          <td class="resourceRemediationCell"> <p>spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.containers[1].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
         </tr>
         
         </tbody>
@@ -435,10 +462,10 @@ <h3>Name: -recruit-list</h3>
       </table>
     </div>
     
-    <h3>Name: -vfps-postgres</h3>
+    <h3>Name: -datashield-rock</h3>
       <p>ApiVersion: apps/v1</p>
       <p>Kind: StatefulSet</p>
-      <p>Name: -vfps-postgres</p>
+      <p>Name: -datashield-rock</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -451,21 +478,28 @@ <h3>Name: -vfps-postgres</h3>
         </thead>
         <tbody>
         
+        <tr>
+          <td class="resourceSeverityCell">High</td>
+          <td class="resourceNameCell">CIS-5.7.3 Apply Security Context to Your Pods and Containers</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0211">C-0211</a></td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.containers[1].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.containers[2].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
+        </tr>
+        
         <tr>
           <td class="resourceSeverityCell">Medium</td>
           <td class="resourceNameCell">CIS-5.4.1 Prefer using secrets as files over secrets as environment variables</td>
           <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0207">C-0207</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].env[4].name</p> </td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[2].env[4].name</p>  <p>spec.template.spec.containers[2].env[6].name</p>  <p>spec.template.spec.containers[2].env[8].name</p> </td>
         </tr>
         
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -blaze-test-connection</h3>
-      <p>ApiVersion: v1</p>
-      <p>Kind: Pod</p>
-      <p>Name: -blaze-test-connection</p>
+    <h3>Name: -postgresql</h3>
+      <p>ApiVersion: apps/v1</p>
+      <p>Kind: StatefulSet</p>
+      <p>Name: -postgresql</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -482,17 +516,24 @@ <h3>Name: -blaze-test-connection</h3>
           <td class="resourceSeverityCell">High</td>
           <td class="resourceNameCell">CIS-5.7.3 Apply Security Context to Your Pods and Containers</td>
           <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0211">C-0211</a></td>
-          <td class="resourceRemediationCell"> <p>spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.containers[1].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.containers[2].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.runAsGroup=1000</p> </td>
+        </tr>
+        
+        <tr>
+          <td class="resourceSeverityCell">Medium</td>
+          <td class="resourceNameCell">CIS-5.4.1 Prefer using secrets as files over secrets as environment variables</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0207">C-0207</a></td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].env[4].name</p> </td>
         </tr>
         
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -recruit-test-health-probes</h3>
-      <p>ApiVersion: v1</p>
-      <p>Kind: Pod</p>
-      <p>Name: -recruit-test-health-probes</p>
+    <h3>Name: -fhir-gateway-gateway</h3>
+      <p>ApiVersion: apps/v1</p>
+      <p>Kind: Deployment</p>
+      <p>Name: -fhir-gateway-gateway</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -509,17 +550,24 @@ <h3>Name: -recruit-test-health-probes</h3>
           <td class="resourceSeverityCell">High</td>
           <td class="resourceNameCell">CIS-5.7.3 Apply Security Context to Your Pods and Containers</td>
           <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0211">C-0211</a></td>
-          <td class="resourceRemediationCell"> <p>spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.containers[1].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.containers[2].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.fsGroup=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.fsGroupChangePolicy=Always</p>  <p>spec.template.spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
+        </tr>
+        
+        <tr>
+          <td class="resourceSeverityCell">Medium</td>
+          <td class="resourceNameCell">CIS-5.4.1 Prefer using secrets as files over secrets as environment variables</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0207">C-0207</a></td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].env[3].name</p> </td>
         </tr>
         
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -recruit-notify</h3>
+    <h3>Name: -vfps</h3>
       <p>ApiVersion: apps/v1</p>
       <p>Kind: Deployment</p>
-      <p>Name: -recruit-notify</p>
+      <p>Name: -vfps</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -543,17 +591,17 @@ <h3>Name: -recruit-notify</h3>
           <td class="resourceSeverityCell">Medium</td>
           <td class="resourceNameCell">CIS-5.4.1 Prefer using secrets as files over secrets as environment variables</td>
           <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0207">C-0207</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].env[7].name</p> </td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].env[3].name</p> </td>
         </tr>
         
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -datashield-opal</h3>
+    <h3>Name: -postgresql</h3>
       <p>ApiVersion: apps/v1</p>
       <p>Kind: StatefulSet</p>
-      <p>Name: -datashield-opal</p>
+      <p>Name: -postgresql</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -566,28 +614,21 @@ <h3>Name: -datashield-opal</h3>
         </thead>
         <tbody>
         
-        <tr>
-          <td class="resourceSeverityCell">High</td>
-          <td class="resourceNameCell">CIS-5.7.3 Apply Security Context to Your Pods and Containers</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0211">C-0211</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[2].securityContext.readOnlyRootFilesystem=true</p>  <p>spec.template.spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.containers[1].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.containers[2].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.fsGroupChangePolicy=Always</p>  <p>spec.template.spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
-        </tr>
-        
         <tr>
           <td class="resourceSeverityCell">Medium</td>
           <td class="resourceNameCell">CIS-5.4.1 Prefer using secrets as files over secrets as environment variables</td>
           <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0207">C-0207</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[2].env[12].name</p>  <p>spec.template.spec.containers[2].env[16].name</p>  <p>spec.template.spec.containers[2].env[1].name</p>  <p>spec.template.spec.containers[2].env[4].name</p>  <p>spec.template.spec.containers[2].env[6].name</p>  <p>spec.template.spec.containers[2].env[8].name</p> </td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].env[4].name</p> </td>
         </tr>
         
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -fhir-gateway-test-connection</h3>
+    <h3>Name: -vfps-test-connection</h3>
       <p>ApiVersion: v1</p>
       <p>Kind: Pod</p>
-      <p>Name: -fhir-gateway-test-connection</p>
+      <p>Name: -vfps-test-connection</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -611,10 +652,10 @@ <h3>Name: -fhir-gateway-test-connection</h3>
       </table>
     </div>
     
-    <h3>Name: -vfps-migrations-v1-3-6</h3>
-      <p>ApiVersion: batch/v1</p>
-      <p>Kind: Job</p>
-      <p>Name: -vfps-migrations-v1-3-6</p>
+    <h3>Name: -fhir-gateway-loinc-converter</h3>
+      <p>ApiVersion: apps/v1</p>
+      <p>Kind: Deployment</p>
+      <p>Name: -fhir-gateway-loinc-converter</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -631,24 +672,44 @@ <h3>Name: -vfps-migrations-v1-3-6</h3>
           <td class="resourceSeverityCell">High</td>
           <td class="resourceNameCell">CIS-5.7.3 Apply Security Context to Your Pods and Containers</td>
           <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0211">C-0211</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.fsGroup=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.fsGroupChangePolicy=Always</p>  <p>spec.template.spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
+        </tr>
+        
+        </tbody>
+      </table>
+    </div>
+    
+    <h3>Name: -mailhog</h3>
+      <p>ApiVersion: apps/v1</p>
+      <p>Kind: Deployment</p>
+      <p>Name: -mailhog</p>
+      <p>Namespace: </p>
+      <table>
+        <thead>
+        <tr>
+          <th class="resourceSeverityCell">Severity</th>
+          <th class="resourceNameCell">Name</th>
+          <th class="resourceURLCell">Docs</th>
+          <th class="resourceRemediationCell">Assisted Remediation</th>
         </tr>
+        </thead>
+        <tbody>
         
         <tr>
-          <td class="resourceSeverityCell">Medium</td>
-          <td class="resourceNameCell">CIS-5.4.1 Prefer using secrets as files over secrets as environment variables</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0207">C-0207</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].env[3].name</p> </td>
+          <td class="resourceSeverityCell">High</td>
+          <td class="resourceNameCell">CIS-5.7.3 Apply Security Context to Your Pods and Containers</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0211">C-0211</a></td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.fsGroupChangePolicy=Always</p>  <p>spec.template.spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
         </tr>
         
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -fhir-gateway-gateway</h3>
+    <h3>Name: -vfps</h3>
       <p>ApiVersion: apps/v1</p>
       <p>Kind: Deployment</p>
-      <p>Name: -fhir-gateway-gateway</p>
+      <p>Name: -vfps</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -679,10 +740,10 @@ <h3>Name: -fhir-gateway-gateway</h3>
       </table>
     </div>
     
-    <h3>Name: -vfps</h3>
+    <h3>Name: -datashield-opal</h3>
       <p>ApiVersion: apps/v1</p>
-      <p>Kind: Deployment</p>
-      <p>Name: -vfps</p>
+      <p>Kind: StatefulSet</p>
+      <p>Name: -datashield-opal</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -699,14 +760,14 @@ <h3>Name: -vfps</h3>
           <td class="resourceSeverityCell">High</td>
           <td class="resourceNameCell">CIS-5.7.3 Apply Security Context to Your Pods and Containers</td>
           <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0211">C-0211</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.fsGroup=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.fsGroupChangePolicy=Always</p>  <p>spec.template.spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[2].securityContext.readOnlyRootFilesystem=true</p>  <p>spec.template.spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.containers[1].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.containers[2].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.fsGroupChangePolicy=Always</p>  <p>spec.template.spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
         </tr>
         
         <tr>
           <td class="resourceSeverityCell">Medium</td>
           <td class="resourceNameCell">CIS-5.4.1 Prefer using secrets as files over secrets as environment variables</td>
           <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0207">C-0207</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].env[3].name</p> </td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[2].env[12].name</p>  <p>spec.template.spec.containers[2].env[16].name</p>  <p>spec.template.spec.containers[2].env[1].name</p>  <p>spec.template.spec.containers[2].env[4].name</p>  <p>spec.template.spec.containers[2].env[6].name</p>  <p>spec.template.spec.containers[2].env[8].name</p> </td>
         </tr>
         
         </tbody>
@@ -740,10 +801,10 @@ <h3>Name: -postgresql</h3>
       </table>
     </div>
     
-    <h3>Name: -postgresql</h3>
+    <h3>Name: -recruit-postgres</h3>
       <p>ApiVersion: apps/v1</p>
       <p>Kind: StatefulSet</p>
-      <p>Name: -postgresql</p>
+      <p>Name: -recruit-postgres</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -756,6 +817,13 @@ <h3>Name: -postgresql</h3>
         </thead>
         <tbody>
         
+        <tr>
+          <td class="resourceSeverityCell">High</td>
+          <td class="resourceNameCell">CIS-5.7.3 Apply Security Context to Your Pods and Containers</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0211">C-0211</a></td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.readOnlyRootFilesystem=true</p>  <p>spec.template.spec.containers[0].securityContext.runAsGroup=1000</p>  <p>spec.template.spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.fsGroupChangePolicy=Always</p>  <p>spec.template.spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
+        </tr>
+        
         <tr>
           <td class="resourceSeverityCell">Medium</td>
           <td class="resourceNameCell">CIS-5.4.1 Prefer using secrets as files over secrets as environment variables</td>
@@ -767,10 +835,10 @@ <h3>Name: -postgresql</h3>
       </table>
     </div>
     
-    <h3>Name: -vfps-test-connection</h3>
-      <p>ApiVersion: v1</p>
-      <p>Kind: Pod</p>
-      <p>Name: -vfps-test-connection</p>
+    <h3>Name: -ohdsi-atlas</h3>
+      <p>ApiVersion: apps/v1</p>
+      <p>Kind: Deployment</p>
+      <p>Name: -ohdsi-atlas</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -787,17 +855,17 @@ <h3>Name: -vfps-test-connection</h3>
           <td class="resourceSeverityCell">High</td>
           <td class="resourceNameCell">CIS-5.7.3 Apply Security Context to Your Pods and Containers</td>
           <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0211">C-0211</a></td>
-          <td class="resourceRemediationCell"> <p>spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.containers[1].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.readOnlyRootFilesystem=true</p>  <p>spec.template.spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
         </tr>
         
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -datashield-test-connection</h3>
+    <h3>Name: -fhir-pseudonymizer-test-connection</h3>
       <p>ApiVersion: v1</p>
       <p>Kind: Pod</p>
-      <p>Name: -datashield-test-connection</p>
+      <p>Name: -fhir-pseudonymizer-test-connection</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -821,10 +889,10 @@ <h3>Name: -datashield-test-connection</h3>
       </table>
     </div>
     
-    <h3>Name: -fhir-pseudonymizer</h3>
+    <h3>Name: -recruit-notify</h3>
       <p>ApiVersion: apps/v1</p>
       <p>Kind: Deployment</p>
-      <p>Name: -fhir-pseudonymizer</p>
+      <p>Name: -recruit-notify</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -844,14 +912,21 @@ <h3>Name: -fhir-pseudonymizer</h3>
           <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.fsGroup=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.fsGroupChangePolicy=Always</p>  <p>spec.template.spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
         </tr>
         
+        <tr>
+          <td class="resourceSeverityCell">Medium</td>
+          <td class="resourceNameCell">CIS-5.4.1 Prefer using secrets as files over secrets as environment variables</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0207">C-0207</a></td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].env[7].name</p> </td>
+        </tr>
+        
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -fhir-pseudonymizer</h3>
+    <h3>Name: -gateway-vfps</h3>
       <p>ApiVersion: apps/v1</p>
       <p>Kind: Deployment</p>
-      <p>Name: -fhir-pseudonymizer</p>
+      <p>Name: -gateway-vfps</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -871,14 +946,21 @@ <h3>Name: -fhir-pseudonymizer</h3>
           <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.fsGroup=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.fsGroupChangePolicy=Always</p>  <p>spec.template.spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
         </tr>
         
+        <tr>
+          <td class="resourceSeverityCell">Medium</td>
+          <td class="resourceNameCell">CIS-5.4.1 Prefer using secrets as files over secrets as environment variables</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0207">C-0207</a></td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].env[3].name</p> </td>
+        </tr>
+        
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -fhir-gateway-loinc-converter</h3>
-      <p>ApiVersion: apps/v1</p>
-      <p>Kind: Deployment</p>
-      <p>Name: -fhir-gateway-loinc-converter</p>
+    <h3>Name: -hapi-fhir-jpaserver-test-endpoints</h3>
+      <p>ApiVersion: v1</p>
+      <p>Kind: Pod</p>
+      <p>Name: -hapi-fhir-jpaserver-test-endpoints</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -895,17 +977,17 @@ <h3>Name: -fhir-gateway-loinc-converter</h3>
           <td class="resourceSeverityCell">High</td>
           <td class="resourceNameCell">CIS-5.7.3 Apply Security Context to Your Pods and Containers</td>
           <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0211">C-0211</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.fsGroup=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.fsGroupChangePolicy=Always</p>  <p>spec.template.spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
+          <td class="resourceRemediationCell"> <p>spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.containers[1].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.containers[2].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
         </tr>
         
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -vfps-migrations-v1-3-5</h3>
-      <p>ApiVersion: batch/v1</p>
-      <p>Kind: Job</p>
-      <p>Name: -vfps-migrations-v1-3-5</p>
+    <h3>Name: -ohdsi-webapi</h3>
+      <p>ApiVersion: apps/v1</p>
+      <p>Kind: Deployment</p>
+      <p>Name: -ohdsi-webapi</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -922,24 +1004,24 @@ <h3>Name: -vfps-migrations-v1-3-5</h3>
           <td class="resourceSeverityCell">High</td>
           <td class="resourceNameCell">CIS-5.7.3 Apply Security Context to Your Pods and Containers</td>
           <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0211">C-0211</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.fsGroup=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.fsGroupChangePolicy=Always</p>  <p>spec.template.spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
         </tr>
         
         <tr>
           <td class="resourceSeverityCell">Medium</td>
           <td class="resourceNameCell">CIS-5.4.1 Prefer using secrets as files over secrets as environment variables</td>
           <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0207">C-0207</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].env[3].name</p> </td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].env[14].name</p>  <p>spec.template.spec.containers[0].env[4].name</p> </td>
         </tr>
         
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -fhir-pseudonymizer-test-connection</h3>
+    <h3>Name: -blaze-test-connection</h3>
       <p>ApiVersion: v1</p>
       <p>Kind: Pod</p>
-      <p>Name: -fhir-pseudonymizer-test-connection</p>
+      <p>Name: -blaze-test-connection</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -956,17 +1038,17 @@ <h3>Name: -fhir-pseudonymizer-test-connection</h3>
           <td class="resourceSeverityCell">High</td>
           <td class="resourceNameCell">CIS-5.7.3 Apply Security Context to Your Pods and Containers</td>
           <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0211">C-0211</a></td>
-          <td class="resourceRemediationCell"> <p>spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.containers[1].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
+          <td class="resourceRemediationCell"> <p>spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.containers[1].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.containers[2].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
         </tr>
         
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -recruit-query</h3>
+    <h3>Name: -postgresql</h3>
       <p>ApiVersion: apps/v1</p>
-      <p>Kind: Deployment</p>
-      <p>Name: -recruit-query</p>
+      <p>Kind: StatefulSet</p>
+      <p>Name: -postgresql</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -979,28 +1061,21 @@ <h3>Name: -recruit-query</h3>
         </thead>
         <tbody>
         
-        <tr>
-          <td class="resourceSeverityCell">High</td>
-          <td class="resourceNameCell">CIS-5.7.3 Apply Security Context to Your Pods and Containers</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0211">C-0211</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.fsGroup=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.fsGroupChangePolicy=Always</p>  <p>spec.template.spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
-        </tr>
-        
         <tr>
           <td class="resourceSeverityCell">Medium</td>
           <td class="resourceNameCell">CIS-5.4.1 Prefer using secrets as files over secrets as environment variables</td>
           <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0207">C-0207</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].env[3].name</p> </td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].env[4].name</p> </td>
         </tr>
         
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -vfps-test-connection</h3>
-      <p>ApiVersion: v1</p>
-      <p>Kind: Pod</p>
-      <p>Name: -vfps-test-connection</p>
+    <h3>Name: -blaze</h3>
+      <p>ApiVersion: apps/v1</p>
+      <p>Kind: StatefulSet</p>
+      <p>Name: -blaze</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -1017,17 +1092,17 @@ <h3>Name: -vfps-test-connection</h3>
           <td class="resourceSeverityCell">High</td>
           <td class="resourceNameCell">CIS-5.7.3 Apply Security Context to Your Pods and Containers</td>
           <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0211">C-0211</a></td>
-          <td class="resourceRemediationCell"> <p>spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.containers[1].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.fsGroupChangePolicy=Always</p>  <p>spec.template.spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
         </tr>
         
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -gateway-vfps-test-connection</h3>
-      <p>ApiVersion: v1</p>
-      <p>Kind: Pod</p>
-      <p>Name: -gateway-vfps-test-connection</p>
+    <h3>Name: -fhir-pseudonymizer</h3>
+      <p>ApiVersion: apps/v1</p>
+      <p>Kind: Deployment</p>
+      <p>Name: -fhir-pseudonymizer</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -1044,17 +1119,17 @@ <h3>Name: -gateway-vfps-test-connection</h3>
           <td class="resourceSeverityCell">High</td>
           <td class="resourceNameCell">CIS-5.7.3 Apply Security Context to Your Pods and Containers</td>
           <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0211">C-0211</a></td>
-          <td class="resourceRemediationCell"> <p>spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.containers[1].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.fsGroup=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.fsGroupChangePolicy=Always</p>  <p>spec.template.spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
         </tr>
         
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -vfps</h3>
-      <p>ApiVersion: apps/v1</p>
-      <p>Kind: Deployment</p>
-      <p>Name: -vfps</p>
+    <h3>Name: -vfps-migrations-v1-3-5</h3>
+      <p>ApiVersion: batch/v1</p>
+      <p>Kind: Job</p>
+      <p>Name: -vfps-migrations-v1-3-5</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -1071,7 +1146,7 @@ <h3>Name: -vfps</h3>
           <td class="resourceSeverityCell">High</td>
           <td class="resourceNameCell">CIS-5.7.3 Apply Security Context to Your Pods and Containers</td>
           <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0211">C-0211</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.fsGroup=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.fsGroupChangePolicy=Always</p>  <p>spec.template.spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
         </tr>
         
         <tr>
@@ -1085,10 +1160,10 @@ <h3>Name: -vfps</h3>
       </table>
     </div>
     
-    <h3>Name: -gateway-vfps</h3>
+    <h3>Name: -hapi-fhir-jpaserver</h3>
       <p>ApiVersion: apps/v1</p>
       <p>Kind: Deployment</p>
-      <p>Name: -gateway-vfps</p>
+      <p>Name: -hapi-fhir-jpaserver</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -1112,17 +1187,17 @@ <h3>Name: -gateway-vfps</h3>
           <td class="resourceSeverityCell">Medium</td>
           <td class="resourceNameCell">CIS-5.4.1 Prefer using secrets as files over secrets as environment variables</td>
           <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0207">C-0207</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].env[3].name</p> </td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].env[2].name</p> </td>
         </tr>
         
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -ohdsi-atlas</h3>
+    <h3>Name: -vfps</h3>
       <p>ApiVersion: apps/v1</p>
       <p>Kind: Deployment</p>
-      <p>Name: -ohdsi-atlas</p>
+      <p>Name: -vfps</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -1139,17 +1214,24 @@ <h3>Name: -ohdsi-atlas</h3>
           <td class="resourceSeverityCell">High</td>
           <td class="resourceNameCell">CIS-5.7.3 Apply Security Context to Your Pods and Containers</td>
           <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0211">C-0211</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.readOnlyRootFilesystem=true</p>  <p>spec.template.spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.fsGroup=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.fsGroupChangePolicy=Always</p>  <p>spec.template.spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
+        </tr>
+        
+        <tr>
+          <td class="resourceSeverityCell">Medium</td>
+          <td class="resourceNameCell">CIS-5.4.1 Prefer using secrets as files over secrets as environment variables</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0207">C-0207</a></td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].env[3].name</p> </td>
         </tr>
         
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -ohdsi-test-connection</h3>
-      <p>ApiVersion: v1</p>
-      <p>Kind: Pod</p>
-      <p>Name: -ohdsi-test-connection</p>
+    <h3>Name: -fhir-pseudonymizer</h3>
+      <p>ApiVersion: apps/v1</p>
+      <p>Kind: Deployment</p>
+      <p>Name: -fhir-pseudonymizer</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -1166,17 +1248,17 @@ <h3>Name: -ohdsi-test-connection</h3>
           <td class="resourceSeverityCell">High</td>
           <td class="resourceNameCell">CIS-5.7.3 Apply Security Context to Your Pods and Containers</td>
           <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0211">C-0211</a></td>
-          <td class="resourceRemediationCell"> <p>spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.containers[1].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.fsGroup=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.fsGroupChangePolicy=Always</p>  <p>spec.template.spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
         </tr>
         
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -postgresql</h3>
-      <p>ApiVersion: apps/v1</p>
-      <p>Kind: StatefulSet</p>
-      <p>Name: -postgresql</p>
+    <h3>Name: -recruit-test-health-probes</h3>
+      <p>ApiVersion: v1</p>
+      <p>Kind: Pod</p>
+      <p>Name: -recruit-test-health-probes</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -1190,20 +1272,20 @@ <h3>Name: -postgresql</h3>
         <tbody>
         
         <tr>
-          <td class="resourceSeverityCell">Medium</td>
-          <td class="resourceNameCell">CIS-5.4.1 Prefer using secrets as files over secrets as environment variables</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0207">C-0207</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].env[4].name</p> </td>
+          <td class="resourceSeverityCell">High</td>
+          <td class="resourceNameCell">CIS-5.7.3 Apply Security Context to Your Pods and Containers</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0211">C-0211</a></td>
+          <td class="resourceRemediationCell"> <p>spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.containers[1].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.containers[2].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
         </tr>
         
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -gateway-vfps-migrations-v1-3-5</h3>
+    <h3>Name: -vfps-migrations-v1-3-6</h3>
       <p>ApiVersion: batch/v1</p>
       <p>Kind: Job</p>
-      <p>Name: -gateway-vfps-migrations-v1-3-5</p>
+      <p>Name: -vfps-migrations-v1-3-6</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -1234,10 +1316,10 @@ <h3>Name: -gateway-vfps-migrations-v1-3-5</h3>
       </table>
     </div>
     
-    <h3>Name: -datashield-rock</h3>
-      <p>ApiVersion: apps/v1</p>
-      <p>Kind: StatefulSet</p>
-      <p>Name: -datashield-rock</p>
+    <h3>Name: -fhir-gateway-test-connection</h3>
+      <p>ApiVersion: v1</p>
+      <p>Kind: Pod</p>
+      <p>Name: -fhir-gateway-test-connection</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -1254,24 +1336,17 @@ <h3>Name: -datashield-rock</h3>
           <td class="resourceSeverityCell">High</td>
           <td class="resourceNameCell">CIS-5.7.3 Apply Security Context to Your Pods and Containers</td>
           <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0211">C-0211</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.containers[1].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.containers[2].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
-        </tr>
-        
-        <tr>
-          <td class="resourceSeverityCell">Medium</td>
-          <td class="resourceNameCell">CIS-5.4.1 Prefer using secrets as files over secrets as environment variables</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0207">C-0207</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[2].env[4].name</p>  <p>spec.template.spec.containers[2].env[6].name</p>  <p>spec.template.spec.containers[2].env[8].name</p> </td>
+          <td class="resourceRemediationCell"> <p>spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.containers[1].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
         </tr>
         
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -postgresql</h3>
+    <h3>Name: -vfps-postgres</h3>
       <p>ApiVersion: apps/v1</p>
       <p>Kind: StatefulSet</p>
-      <p>Name: -postgresql</p>
+      <p>Name: -vfps-postgres</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -1284,13 +1359,6 @@ <h3>Name: -postgresql</h3>
         </thead>
         <tbody>
         
-        <tr>
-          <td class="resourceSeverityCell">High</td>
-          <td class="resourceNameCell">CIS-5.7.3 Apply Security Context to Your Pods and Containers</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0211">C-0211</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.runAsGroup=1000</p> </td>
-        </tr>
-        
         <tr>
           <td class="resourceSeverityCell">Medium</td>
           <td class="resourceNameCell">CIS-5.4.1 Prefer using secrets as files over secrets as environment variables</td>
@@ -1302,10 +1370,10 @@ <h3>Name: -postgresql</h3>
       </table>
     </div>
     
-    <h3>Name: -vfps</h3>
+    <h3>Name: -recruit-query</h3>
       <p>ApiVersion: apps/v1</p>
       <p>Kind: Deployment</p>
-      <p>Name: -vfps</p>
+      <p>Name: -recruit-query</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -1336,10 +1404,10 @@ <h3>Name: -vfps</h3>
       </table>
     </div>
     
-    <h3>Name: -ohdsi-webapi</h3>
+    <h3>Name: -fhir-pseudonymizer</h3>
       <p>ApiVersion: apps/v1</p>
       <p>Kind: Deployment</p>
-      <p>Name: -ohdsi-webapi</p>
+      <p>Name: -fhir-pseudonymizer</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -1359,21 +1427,14 @@ <h3>Name: -ohdsi-webapi</h3>
           <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.fsGroup=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.fsGroupChangePolicy=Always</p>  <p>spec.template.spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
         </tr>
         
-        <tr>
-          <td class="resourceSeverityCell">Medium</td>
-          <td class="resourceNameCell">CIS-5.4.1 Prefer using secrets as files over secrets as environment variables</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0207">C-0207</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].env[14].name</p>  <p>spec.template.spec.containers[0].env[4].name</p> </td>
-        </tr>
-        
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -fhir-pseudonymizer-test-connection</h3>
+    <h3>Name: -vfps-test-connection</h3>
       <p>ApiVersion: v1</p>
       <p>Kind: Pod</p>
-      <p>Name: -fhir-pseudonymizer-test-connection</p>
+      <p>Name: -vfps-test-connection</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -1397,37 +1458,10 @@ <h3>Name: -fhir-pseudonymizer-test-connection</h3>
       </table>
     </div>
     
-    <h3>Name: -mailhog</h3>
+    <h3>Name: -postgresql</h3>
       <p>ApiVersion: apps/v1</p>
-      <p>Kind: Deployment</p>
-      <p>Name: -mailhog</p>
-      <p>Namespace: </p>
-      <table>
-        <thead>
-        <tr>
-          <th class="resourceSeverityCell">Severity</th>
-          <th class="resourceNameCell">Name</th>
-          <th class="resourceURLCell">Docs</th>
-          <th class="resourceRemediationCell">Assisted Remediation</th>
-        </tr>
-        </thead>
-        <tbody>
-        
-        <tr>
-          <td class="resourceSeverityCell">High</td>
-          <td class="resourceNameCell">CIS-5.7.3 Apply Security Context to Your Pods and Containers</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0211">C-0211</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.fsGroupChangePolicy=Always</p>  <p>spec.template.spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
-        </tr>
-        
-        </tbody>
-      </table>
-    </div>
-    
-    <h3>Name: -vfps-migrations-v1-3-6</h3>
-      <p>ApiVersion: batch/v1</p>
-      <p>Kind: Job</p>
-      <p>Name: -vfps-migrations-v1-3-6</p>
+      <p>Kind: StatefulSet</p>
+      <p>Name: -postgresql</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -1440,55 +1474,21 @@ <h3>Name: -vfps-migrations-v1-3-6</h3>
         </thead>
         <tbody>
         
-        <tr>
-          <td class="resourceSeverityCell">High</td>
-          <td class="resourceNameCell">CIS-5.7.3 Apply Security Context to Your Pods and Containers</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0211">C-0211</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
-        </tr>
-        
         <tr>
           <td class="resourceSeverityCell">Medium</td>
           <td class="resourceNameCell">CIS-5.4.1 Prefer using secrets as files over secrets as environment variables</td>
           <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0207">C-0207</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].env[3].name</p> </td>
-        </tr>
-        
-        </tbody>
-      </table>
-    </div>
-    
-    <h3>Name: -hapi-fhir-jpaserver-test-endpoints</h3>
-      <p>ApiVersion: v1</p>
-      <p>Kind: Pod</p>
-      <p>Name: -hapi-fhir-jpaserver-test-endpoints</p>
-      <p>Namespace: </p>
-      <table>
-        <thead>
-        <tr>
-          <th class="resourceSeverityCell">Severity</th>
-          <th class="resourceNameCell">Name</th>
-          <th class="resourceURLCell">Docs</th>
-          <th class="resourceRemediationCell">Assisted Remediation</th>
-        </tr>
-        </thead>
-        <tbody>
-        
-        <tr>
-          <td class="resourceSeverityCell">High</td>
-          <td class="resourceNameCell">CIS-5.7.3 Apply Security Context to Your Pods and Containers</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0211">C-0211</a></td>
-          <td class="resourceRemediationCell"> <p>spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.containers[1].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.containers[2].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].env[4].name</p> </td>
         </tr>
         
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -vfps-test-connection</h3>
+    <h3>Name: -fhir-pseudonymizer-test-connection</h3>
       <p>ApiVersion: v1</p>
       <p>Kind: Pod</p>
-      <p>Name: -vfps-test-connection</p>
+      <p>Name: -fhir-pseudonymizer-test-connection</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -1539,10 +1539,10 @@ <h3>Name: -postgresql</h3>
       </table>
     </div>
     
-    <h3>Name: -hapi-fhir-jpaserver</h3>
-      <p>ApiVersion: apps/v1</p>
-      <p>Kind: Deployment</p>
-      <p>Name: -hapi-fhir-jpaserver</p>
+    <h3>Name: -gateway-vfps-migrations-v1-3-5</h3>
+      <p>ApiVersion: batch/v1</p>
+      <p>Kind: Job</p>
+      <p>Name: -gateway-vfps-migrations-v1-3-5</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -1559,24 +1559,24 @@ <h3>Name: -hapi-fhir-jpaserver</h3>
           <td class="resourceSeverityCell">High</td>
           <td class="resourceNameCell">CIS-5.7.3 Apply Security Context to Your Pods and Containers</td>
           <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0211">C-0211</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.fsGroup=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.fsGroupChangePolicy=Always</p>  <p>spec.template.spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
         </tr>
         
         <tr>
           <td class="resourceSeverityCell">Medium</td>
           <td class="resourceNameCell">CIS-5.4.1 Prefer using secrets as files over secrets as environment variables</td>
           <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0207">C-0207</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].env[2].name</p> </td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].env[3].name</p> </td>
         </tr>
         
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -fhir-pseudonymizer</h3>
-      <p>ApiVersion: apps/v1</p>
-      <p>Kind: Deployment</p>
-      <p>Name: -fhir-pseudonymizer</p>
+    <h3>Name: -mailhog</h3>
+      <p>ApiVersion: v1</p>
+      <p>Kind: ServiceAccount</p>
+      <p>Name: -mailhog</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -1590,20 +1590,20 @@ <h3>Name: -fhir-pseudonymizer</h3>
         <tbody>
         
         <tr>
-          <td class="resourceSeverityCell">High</td>
-          <td class="resourceNameCell">CIS-5.7.3 Apply Security Context to Your Pods and Containers</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0211">C-0211</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.fsGroup=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.fsGroupChangePolicy=Always</p>  <p>spec.template.spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
+          <td class="resourceSeverityCell">Medium</td>
+          <td class="resourceNameCell">CIS-5.1.6 Ensure that Service Account Tokens are only mounted where necessary</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0190">C-0190</a></td>
+          <td class="resourceRemediationCell"> <p>automountServiceAccountToken=false</p> </td>
         </tr>
         
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -fhir-pseudonymizer-test-connection</h3>
-      <p>ApiVersion: v1</p>
-      <p>Kind: Pod</p>
-      <p>Name: -fhir-pseudonymizer-test-connection</p>
+    <h3>Name: -ohdsi-postgres</h3>
+      <p>ApiVersion: apps/v1</p>
+      <p>Kind: StatefulSet</p>
+      <p>Name: -ohdsi-postgres</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -1617,20 +1617,20 @@ <h3>Name: -fhir-pseudonymizer-test-connection</h3>
         <tbody>
         
         <tr>
-          <td class="resourceSeverityCell">High</td>
-          <td class="resourceNameCell">CIS-5.7.3 Apply Security Context to Your Pods and Containers</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0211">C-0211</a></td>
-          <td class="resourceRemediationCell"> <p>spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.containers[1].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
+          <td class="resourceSeverityCell">Medium</td>
+          <td class="resourceNameCell">CIS-5.4.1 Prefer using secrets as files over secrets as environment variables</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0207">C-0207</a></td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].env[4].name</p> </td>
         </tr>
         
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -postgresql</h3>
-      <p>ApiVersion: apps/v1</p>
-      <p>Kind: StatefulSet</p>
-      <p>Name: -postgresql</p>
+    <h3>Name: -fhir-pseudonymizer-test-connection</h3>
+      <p>ApiVersion: v1</p>
+      <p>Kind: Pod</p>
+      <p>Name: -fhir-pseudonymizer-test-connection</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -1644,20 +1644,20 @@ <h3>Name: -postgresql</h3>
         <tbody>
         
         <tr>
-          <td class="resourceSeverityCell">Medium</td>
-          <td class="resourceNameCell">CIS-5.4.1 Prefer using secrets as files over secrets as environment variables</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0207">C-0207</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].env[4].name</p> </td>
+          <td class="resourceSeverityCell">High</td>
+          <td class="resourceNameCell">CIS-5.7.3 Apply Security Context to Your Pods and Containers</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0211">C-0211</a></td>
+          <td class="resourceRemediationCell"> <p>spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.containers[1].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
         </tr>
         
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -blaze</h3>
-      <p>ApiVersion: apps/v1</p>
-      <p>Kind: StatefulSet</p>
-      <p>Name: -blaze</p>
+    <h3>Name: -datashield-test-connection</h3>
+      <p>ApiVersion: v1</p>
+      <p>Kind: Pod</p>
+      <p>Name: -datashield-test-connection</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -1674,7 +1674,7 @@ <h3>Name: -blaze</h3>
           <td class="resourceSeverityCell">High</td>
           <td class="resourceNameCell">CIS-5.7.3 Apply Security Context to Your Pods and Containers</td>
           <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0211">C-0211</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.fsGroupChangePolicy=Always</p>  <p>spec.template.spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.template.spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
+          <td class="resourceRemediationCell"> <p>spec.containers[0].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.containers[1].securityContext.seLinuxOptions=YOUR_VALUE</p>  <p>spec.securityContext.sysctls.name=YOUR_VALUE</p>  <p>spec.securityContext.sysctls.value=YOUR_VALUE</p>  <p>spec.securityContext.supplementalGroups=YOUR_VALUE</p> </td>
         </tr>
         
         </tbody>
diff --git a/kubescape-reports/nsa.html b/kubescape-reports/nsa.html
index 4ce773b2..d98b29c9 100644
--- a/kubescape-reports/nsa.html
+++ b/kubescape-reports/nsa.html
@@ -284,10 +284,10 @@ <h2>Failed Resources:</h2>
     </br>
     
     
-    <h3>Name: -recruit-postgres</h3>
-      <p>ApiVersion: apps/v1</p>
-      <p>Kind: StatefulSet</p>
-      <p>Name: -recruit-postgres</p>
+    <h3>Name: -gateway-vfps-test-connection</h3>
+      <p>ApiVersion: v1</p>
+      <p>Kind: Pod</p>
+      <p>Name: -gateway-vfps-test-connection</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -307,42 +307,14 @@ <h3>Name: -recruit-postgres</h3>
           <td class="resourceRemediationCell"></td>
         </tr>
         
-        <tr>
-          <td class="resourceSeverityCell">High</td>
-          <td class="resourceNameCell">Ensure CPU limits are set</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0270">C-0270</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].resources.limits.cpu=YOUR_VALUE</p> </td>
-        </tr>
-        
-        <tr>
-          <td class="resourceSeverityCell">High</td>
-          <td class="resourceNameCell">Ensure memory limits are set</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0271">C-0271</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].resources.limits.memory=YOUR_VALUE</p> </td>
-        </tr>
-        
-        <tr>
-          <td class="resourceSeverityCell">Medium</td>
-          <td class="resourceNameCell">Non-root containers</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0013">C-0013</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.runAsGroup=1000</p> </td>
-        </tr>
-        
-        <tr>
-          <td class="resourceSeverityCell">Low</td>
-          <td class="resourceNameCell">Immutable container filesystem</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0017">C-0017</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.readOnlyRootFilesystem=true</p> </td>
-        </tr>
-        
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -postgresql</h3>
+    <h3>Name: -fhir-pseudonymizer</h3>
       <p>ApiVersion: apps/v1</p>
-      <p>Kind: StatefulSet</p>
-      <p>Name: -postgresql</p>
+      <p>Kind: Deployment</p>
+      <p>Name: -fhir-pseudonymizer</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -355,35 +327,21 @@ <h3>Name: -postgresql</h3>
         </thead>
         <tbody>
         
-        <tr>
-          <td class="resourceSeverityCell">High</td>
-          <td class="resourceNameCell">Ensure CPU limits are set</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0270">C-0270</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].resources.limits.cpu=YOUR_VALUE</p> </td>
-        </tr>
-        
-        <tr>
-          <td class="resourceSeverityCell">High</td>
-          <td class="resourceNameCell">Ensure memory limits are set</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0271">C-0271</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].resources.limits.memory=YOUR_VALUE</p> </td>
-        </tr>
-        
         <tr>
           <td class="resourceSeverityCell">Medium</td>
-          <td class="resourceNameCell">Non-root containers</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0013">C-0013</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.runAsGroup=1000</p> </td>
+          <td class="resourceNameCell">Ingress and Egress blocked</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0030">C-0030</a></td>
+          <td class="resourceRemediationCell"></td>
         </tr>
         
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -vfps-test-connection</h3>
-      <p>ApiVersion: v1</p>
-      <p>Kind: Pod</p>
-      <p>Name: -vfps-test-connection</p>
+    <h3>Name: -mailhog</h3>
+      <p>ApiVersion: apps/v1</p>
+      <p>Kind: Deployment</p>
+      <p>Name: -mailhog</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -403,14 +361,28 @@ <h3>Name: -vfps-test-connection</h3>
           <td class="resourceRemediationCell"></td>
         </tr>
         
+        <tr>
+          <td class="resourceSeverityCell">High</td>
+          <td class="resourceNameCell">Ensure CPU limits are set</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0270">C-0270</a></td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].resources.limits.cpu=YOUR_VALUE</p> </td>
+        </tr>
+        
+        <tr>
+          <td class="resourceSeverityCell">High</td>
+          <td class="resourceNameCell">Ensure memory limits are set</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0271">C-0271</a></td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].resources.limits.memory=YOUR_VALUE</p> </td>
+        </tr>
+        
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -gateway-vfps</h3>
-      <p>ApiVersion: apps/v1</p>
-      <p>Kind: Deployment</p>
-      <p>Name: -gateway-vfps</p>
+    <h3>Name: -gateway-vfps-migrations-v1-3-5</h3>
+      <p>ApiVersion: batch/v1</p>
+      <p>Kind: Job</p>
+      <p>Name: -gateway-vfps-migrations-v1-3-5</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -434,10 +406,10 @@ <h3>Name: -gateway-vfps</h3>
       </table>
     </div>
     
-    <h3>Name: -vfps</h3>
+    <h3>Name: -hapi-fhir-jpaserver</h3>
       <p>ApiVersion: apps/v1</p>
       <p>Kind: Deployment</p>
-      <p>Name: -vfps</p>
+      <p>Name: -hapi-fhir-jpaserver</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -457,14 +429,28 @@ <h3>Name: -vfps</h3>
           <td class="resourceRemediationCell"></td>
         </tr>
         
+        <tr>
+          <td class="resourceSeverityCell">High</td>
+          <td class="resourceNameCell">Ensure CPU limits are set</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0270">C-0270</a></td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].resources.limits.cpu=YOUR_VALUE</p> </td>
+        </tr>
+        
+        <tr>
+          <td class="resourceSeverityCell">High</td>
+          <td class="resourceNameCell">Ensure memory limits are set</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0271">C-0271</a></td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].resources.limits.memory=YOUR_VALUE</p> </td>
+        </tr>
+        
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -gateway-vfps-migrations-v1-3-5</h3>
-      <p>ApiVersion: batch/v1</p>
-      <p>Kind: Job</p>
-      <p>Name: -gateway-vfps-migrations-v1-3-5</p>
+    <h3>Name: -hapi-fhir-jpaserver-test-endpoints</h3>
+      <p>ApiVersion: v1</p>
+      <p>Kind: Pod</p>
+      <p>Name: -hapi-fhir-jpaserver-test-endpoints</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -484,14 +470,28 @@ <h3>Name: -gateway-vfps-migrations-v1-3-5</h3>
           <td class="resourceRemediationCell"></td>
         </tr>
         
+        <tr>
+          <td class="resourceSeverityCell">High</td>
+          <td class="resourceNameCell">Ensure CPU limits are set</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0270">C-0270</a></td>
+          <td class="resourceRemediationCell"> <p>spec.containers[0].resources.limits.cpu=YOUR_VALUE</p>  <p>spec.containers[2].resources.limits.cpu=YOUR_VALUE</p>  <p>spec.containers[1].resources.limits.cpu=YOUR_VALUE</p> </td>
+        </tr>
+        
+        <tr>
+          <td class="resourceSeverityCell">High</td>
+          <td class="resourceNameCell">Ensure memory limits are set</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0271">C-0271</a></td>
+          <td class="resourceRemediationCell"> <p>spec.containers[0].resources.limits.memory=YOUR_VALUE</p>  <p>spec.containers[2].resources.limits.memory=YOUR_VALUE</p>  <p>spec.containers[1].resources.limits.memory=YOUR_VALUE</p> </td>
+        </tr>
+        
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -vfps</h3>
+    <h3>Name: -recruit-postgres</h3>
       <p>ApiVersion: apps/v1</p>
-      <p>Kind: Deployment</p>
-      <p>Name: -vfps</p>
+      <p>Kind: StatefulSet</p>
+      <p>Name: -recruit-postgres</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -504,6 +504,20 @@ <h3>Name: -vfps</h3>
         </thead>
         <tbody>
         
+        <tr>
+          <td class="resourceSeverityCell">Medium</td>
+          <td class="resourceNameCell">Non-root containers</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0013">C-0013</a></td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.runAsGroup=1000</p> </td>
+        </tr>
+        
+        <tr>
+          <td class="resourceSeverityCell">Low</td>
+          <td class="resourceNameCell">Immutable container filesystem</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0017">C-0017</a></td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.readOnlyRootFilesystem=true</p> </td>
+        </tr>
+        
         <tr>
           <td class="resourceSeverityCell">Medium</td>
           <td class="resourceNameCell">Ingress and Egress blocked</td>
@@ -529,10 +543,10 @@ <h3>Name: -vfps</h3>
       </table>
     </div>
     
-    <h3>Name: -fhir-pseudonymizer</h3>
+    <h3>Name: -vfps</h3>
       <p>ApiVersion: apps/v1</p>
       <p>Kind: Deployment</p>
-      <p>Name: -fhir-pseudonymizer</p>
+      <p>Name: -vfps</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -556,10 +570,10 @@ <h3>Name: -fhir-pseudonymizer</h3>
       </table>
     </div>
     
-    <h3>Name: -datashield-test-connection</h3>
-      <p>ApiVersion: v1</p>
-      <p>Kind: Pod</p>
-      <p>Name: -datashield-test-connection</p>
+    <h3>Name: -fhir-pseudonymizer</h3>
+      <p>ApiVersion: apps/v1</p>
+      <p>Kind: Deployment</p>
+      <p>Name: -fhir-pseudonymizer</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -579,14 +593,28 @@ <h3>Name: -datashield-test-connection</h3>
           <td class="resourceRemediationCell"></td>
         </tr>
         
+        <tr>
+          <td class="resourceSeverityCell">High</td>
+          <td class="resourceNameCell">Ensure CPU limits are set</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0270">C-0270</a></td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].resources.limits.cpu=YOUR_VALUE</p> </td>
+        </tr>
+        
+        <tr>
+          <td class="resourceSeverityCell">High</td>
+          <td class="resourceNameCell">Ensure memory limits are set</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0271">C-0271</a></td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].resources.limits.memory=YOUR_VALUE</p> </td>
+        </tr>
+        
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -fhir-gateway-test-connection</h3>
-      <p>ApiVersion: v1</p>
-      <p>Kind: Pod</p>
-      <p>Name: -fhir-gateway-test-connection</p>
+    <h3>Name: -vfps</h3>
+      <p>ApiVersion: apps/v1</p>
+      <p>Kind: Deployment</p>
+      <p>Name: -vfps</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -606,14 +634,28 @@ <h3>Name: -fhir-gateway-test-connection</h3>
           <td class="resourceRemediationCell"></td>
         </tr>
         
+        <tr>
+          <td class="resourceSeverityCell">High</td>
+          <td class="resourceNameCell">Ensure CPU limits are set</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0270">C-0270</a></td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].resources.limits.cpu=YOUR_VALUE</p> </td>
+        </tr>
+        
+        <tr>
+          <td class="resourceSeverityCell">High</td>
+          <td class="resourceNameCell">Ensure memory limits are set</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0271">C-0271</a></td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].resources.limits.memory=YOUR_VALUE</p> </td>
+        </tr>
+        
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -gateway-vfps-test-connection</h3>
-      <p>ApiVersion: v1</p>
-      <p>Kind: Pod</p>
-      <p>Name: -gateway-vfps-test-connection</p>
+    <h3>Name: -vfps-migrations-v1-3-6</h3>
+      <p>ApiVersion: batch/v1</p>
+      <p>Kind: Job</p>
+      <p>Name: -vfps-migrations-v1-3-6</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -637,10 +679,10 @@ <h3>Name: -gateway-vfps-test-connection</h3>
       </table>
     </div>
     
-    <h3>Name: -datashield-opal</h3>
-      <p>ApiVersion: apps/v1</p>
-      <p>Kind: StatefulSet</p>
-      <p>Name: -datashield-opal</p>
+    <h3>Name: -datashield-test-connection</h3>
+      <p>ApiVersion: v1</p>
+      <p>Kind: Pod</p>
+      <p>Name: -datashield-test-connection</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -660,21 +702,14 @@ <h3>Name: -datashield-opal</h3>
           <td class="resourceRemediationCell"></td>
         </tr>
         
-        <tr>
-          <td class="resourceSeverityCell">Low</td>
-          <td class="resourceNameCell">Immutable container filesystem</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0017">C-0017</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[2].securityContext.readOnlyRootFilesystem=true</p> </td>
-        </tr>
-        
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -fhir-gateway-loinc-converter</h3>
-      <p>ApiVersion: apps/v1</p>
-      <p>Kind: Deployment</p>
-      <p>Name: -fhir-gateway-loinc-converter</p>
+    <h3>Name: -vfps-migrations-v1-3-6</h3>
+      <p>ApiVersion: batch/v1</p>
+      <p>Kind: Job</p>
+      <p>Name: -vfps-migrations-v1-3-6</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -698,10 +733,10 @@ <h3>Name: -fhir-gateway-loinc-converter</h3>
       </table>
     </div>
     
-    <h3>Name: -ohdsi-webapi</h3>
+    <h3>Name: -recruit-notify</h3>
       <p>ApiVersion: apps/v1</p>
       <p>Kind: Deployment</p>
-      <p>Name: -ohdsi-webapi</p>
+      <p>Name: -recruit-notify</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -739,10 +774,10 @@ <h3>Name: -ohdsi-webapi</h3>
       </table>
     </div>
     
-    <h3>Name: -vfps</h3>
+    <h3>Name: -fhir-pseudonymizer</h3>
       <p>ApiVersion: apps/v1</p>
       <p>Kind: Deployment</p>
-      <p>Name: -vfps</p>
+      <p>Name: -fhir-pseudonymizer</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -766,10 +801,10 @@ <h3>Name: -vfps</h3>
       </table>
     </div>
     
-    <h3>Name: -fhir-pseudonymizer</h3>
-      <p>ApiVersion: apps/v1</p>
-      <p>Kind: Deployment</p>
-      <p>Name: -fhir-pseudonymizer</p>
+    <h3>Name: -vfps-migrations-v1-3-5</h3>
+      <p>ApiVersion: batch/v1</p>
+      <p>Kind: Job</p>
+      <p>Name: -vfps-migrations-v1-3-5</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -807,10 +842,10 @@ <h3>Name: -fhir-pseudonymizer</h3>
       </table>
     </div>
     
-    <h3>Name: -mailhog</h3>
-      <p>ApiVersion: apps/v1</p>
-      <p>Kind: Deployment</p>
-      <p>Name: -mailhog</p>
+    <h3>Name: -fhir-pseudonymizer-test-connection</h3>
+      <p>ApiVersion: v1</p>
+      <p>Kind: Pod</p>
+      <p>Name: -fhir-pseudonymizer-test-connection</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -830,28 +865,14 @@ <h3>Name: -mailhog</h3>
           <td class="resourceRemediationCell"></td>
         </tr>
         
-        <tr>
-          <td class="resourceSeverityCell">High</td>
-          <td class="resourceNameCell">Ensure CPU limits are set</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0270">C-0270</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].resources.limits.cpu=YOUR_VALUE</p> </td>
-        </tr>
-        
-        <tr>
-          <td class="resourceSeverityCell">High</td>
-          <td class="resourceNameCell">Ensure memory limits are set</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0271">C-0271</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].resources.limits.memory=YOUR_VALUE</p> </td>
-        </tr>
-        
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -vfps-test-connection</h3>
-      <p>ApiVersion: v1</p>
-      <p>Kind: Pod</p>
-      <p>Name: -vfps-test-connection</p>
+    <h3>Name: -gateway-vfps</h3>
+      <p>ApiVersion: apps/v1</p>
+      <p>Kind: Deployment</p>
+      <p>Name: -gateway-vfps</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -875,10 +896,10 @@ <h3>Name: -vfps-test-connection</h3>
       </table>
     </div>
     
-    <h3>Name: -fhir-pseudonymizer-test-connection</h3>
+    <h3>Name: -mailhog</h3>
       <p>ApiVersion: v1</p>
-      <p>Kind: Pod</p>
-      <p>Name: -fhir-pseudonymizer-test-connection</p>
+      <p>Kind: ServiceAccount</p>
+      <p>Name: -mailhog</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -893,33 +914,46 @@ <h3>Name: -fhir-pseudonymizer-test-connection</h3>
         
         <tr>
           <td class="resourceSeverityCell">Medium</td>
-          <td class="resourceNameCell">Ingress and Egress blocked</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0030">C-0030</a></td>
-          <td class="resourceRemediationCell"></td>
+          <td class="resourceNameCell">Automatic mapping of service account</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0034">C-0034</a></td>
+          <td class="resourceRemediationCell"> <p>automountServiceAccountToken=false</p> </td>
         </tr>
         
+        </tbody>
+      </table>
+    </div>
+    
+    <h3>Name: -blaze</h3>
+      <p>ApiVersion: apps/v1</p>
+      <p>Kind: StatefulSet</p>
+      <p>Name: -blaze</p>
+      <p>Namespace: </p>
+      <table>
+        <thead>
         <tr>
-          <td class="resourceSeverityCell">High</td>
-          <td class="resourceNameCell">Ensure CPU limits are set</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0270">C-0270</a></td>
-          <td class="resourceRemediationCell"> <p>spec.containers[1].resources.limits.cpu=YOUR_VALUE</p>  <p>spec.containers[0].resources.limits.cpu=YOUR_VALUE</p> </td>
+          <th class="resourceSeverityCell">Severity</th>
+          <th class="resourceNameCell">Name</th>
+          <th class="resourceURLCell">Docs</th>
+          <th class="resourceRemediationCell">Assisted Remediation</th>
         </tr>
+        </thead>
+        <tbody>
         
         <tr>
-          <td class="resourceSeverityCell">High</td>
-          <td class="resourceNameCell">Ensure memory limits are set</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0271">C-0271</a></td>
-          <td class="resourceRemediationCell"> <p>spec.containers[1].resources.limits.memory=YOUR_VALUE</p>  <p>spec.containers[0].resources.limits.memory=YOUR_VALUE</p> </td>
+          <td class="resourceSeverityCell">Medium</td>
+          <td class="resourceNameCell">Ingress and Egress blocked</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0030">C-0030</a></td>
+          <td class="resourceRemediationCell"></td>
         </tr>
         
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -vfps-test-connection</h3>
+    <h3>Name: -recruit-test-health-probes</h3>
       <p>ApiVersion: v1</p>
       <p>Kind: Pod</p>
-      <p>Name: -vfps-test-connection</p>
+      <p>Name: -recruit-test-health-probes</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -943,24 +977,24 @@ <h3>Name: -vfps-test-connection</h3>
           <td class="resourceSeverityCell">High</td>
           <td class="resourceNameCell">Ensure CPU limits are set</td>
           <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0270">C-0270</a></td>
-          <td class="resourceRemediationCell"> <p>spec.containers[0].resources.limits.cpu=YOUR_VALUE</p>  <p>spec.containers[1].resources.limits.cpu=YOUR_VALUE</p> </td>
+          <td class="resourceRemediationCell"> <p>spec.containers[0].resources.limits.cpu=YOUR_VALUE</p>  <p>spec.containers[2].resources.limits.cpu=YOUR_VALUE</p>  <p>spec.containers[1].resources.limits.cpu=YOUR_VALUE</p> </td>
         </tr>
         
         <tr>
           <td class="resourceSeverityCell">High</td>
           <td class="resourceNameCell">Ensure memory limits are set</td>
           <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0271">C-0271</a></td>
-          <td class="resourceRemediationCell"> <p>spec.containers[0].resources.limits.memory=YOUR_VALUE</p>  <p>spec.containers[1].resources.limits.memory=YOUR_VALUE</p> </td>
+          <td class="resourceRemediationCell"> <p>spec.containers[0].resources.limits.memory=YOUR_VALUE</p>  <p>spec.containers[2].resources.limits.memory=YOUR_VALUE</p>  <p>spec.containers[1].resources.limits.memory=YOUR_VALUE</p> </td>
         </tr>
         
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -vfps-migrations-v1-3-6</h3>
-      <p>ApiVersion: batch/v1</p>
-      <p>Kind: Job</p>
-      <p>Name: -vfps-migrations-v1-3-6</p>
+    <h3>Name: -ohdsi-atlas</h3>
+      <p>ApiVersion: apps/v1</p>
+      <p>Kind: Deployment</p>
+      <p>Name: -ohdsi-atlas</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -973,6 +1007,13 @@ <h3>Name: -vfps-migrations-v1-3-6</h3>
         </thead>
         <tbody>
         
+        <tr>
+          <td class="resourceSeverityCell">Low</td>
+          <td class="resourceNameCell">Immutable container filesystem</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0017">C-0017</a></td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.readOnlyRootFilesystem=true</p> </td>
+        </tr>
+        
         <tr>
           <td class="resourceSeverityCell">Medium</td>
           <td class="resourceNameCell">Ingress and Egress blocked</td>
@@ -980,14 +1021,28 @@ <h3>Name: -vfps-migrations-v1-3-6</h3>
           <td class="resourceRemediationCell"></td>
         </tr>
         
+        <tr>
+          <td class="resourceSeverityCell">High</td>
+          <td class="resourceNameCell">Ensure CPU limits are set</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0270">C-0270</a></td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].resources.limits.cpu=YOUR_VALUE</p> </td>
+        </tr>
+        
+        <tr>
+          <td class="resourceSeverityCell">High</td>
+          <td class="resourceNameCell">Ensure memory limits are set</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0271">C-0271</a></td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].resources.limits.memory=YOUR_VALUE</p> </td>
+        </tr>
+        
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -blaze-test-connection</h3>
+    <h3>Name: -ohdsi-test-connection</h3>
       <p>ApiVersion: v1</p>
       <p>Kind: Pod</p>
-      <p>Name: -blaze-test-connection</p>
+      <p>Name: -ohdsi-test-connection</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -1007,14 +1062,28 @@ <h3>Name: -blaze-test-connection</h3>
           <td class="resourceRemediationCell"></td>
         </tr>
         
+        <tr>
+          <td class="resourceSeverityCell">High</td>
+          <td class="resourceNameCell">Ensure CPU limits are set</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0270">C-0270</a></td>
+          <td class="resourceRemediationCell"> <p>spec.containers[1].resources.limits.cpu=YOUR_VALUE</p>  <p>spec.containers[0].resources.limits.cpu=YOUR_VALUE</p> </td>
+        </tr>
+        
+        <tr>
+          <td class="resourceSeverityCell">High</td>
+          <td class="resourceNameCell">Ensure memory limits are set</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0271">C-0271</a></td>
+          <td class="resourceRemediationCell"> <p>spec.containers[1].resources.limits.memory=YOUR_VALUE</p>  <p>spec.containers[0].resources.limits.memory=YOUR_VALUE</p> </td>
+        </tr>
+        
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -fhir-gateway-gateway</h3>
-      <p>ApiVersion: apps/v1</p>
-      <p>Kind: Deployment</p>
-      <p>Name: -fhir-gateway-gateway</p>
+    <h3>Name: -vfps-test-connection</h3>
+      <p>ApiVersion: v1</p>
+      <p>Kind: Pod</p>
+      <p>Name: -vfps-test-connection</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -1038,10 +1107,10 @@ <h3>Name: -fhir-gateway-gateway</h3>
       </table>
     </div>
     
-    <h3>Name: -datashield-rock</h3>
+    <h3>Name: -fhir-gateway-gateway</h3>
       <p>ApiVersion: apps/v1</p>
-      <p>Kind: StatefulSet</p>
-      <p>Name: -datashield-rock</p>
+      <p>Kind: Deployment</p>
+      <p>Name: -fhir-gateway-gateway</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -1065,10 +1134,10 @@ <h3>Name: -datashield-rock</h3>
       </table>
     </div>
     
-    <h3>Name: -recruit-query</h3>
-      <p>ApiVersion: apps/v1</p>
-      <p>Kind: Deployment</p>
-      <p>Name: -recruit-query</p>
+    <h3>Name: -blaze-test-connection</h3>
+      <p>ApiVersion: v1</p>
+      <p>Kind: Pod</p>
+      <p>Name: -blaze-test-connection</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -1088,28 +1157,14 @@ <h3>Name: -recruit-query</h3>
           <td class="resourceRemediationCell"></td>
         </tr>
         
-        <tr>
-          <td class="resourceSeverityCell">High</td>
-          <td class="resourceNameCell">Ensure CPU limits are set</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0270">C-0270</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].resources.limits.cpu=YOUR_VALUE</p> </td>
-        </tr>
-        
-        <tr>
-          <td class="resourceSeverityCell">High</td>
-          <td class="resourceNameCell">Ensure memory limits are set</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0271">C-0271</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].resources.limits.memory=YOUR_VALUE</p> </td>
-        </tr>
-        
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -recruit-notify</h3>
-      <p>ApiVersion: apps/v1</p>
-      <p>Kind: Deployment</p>
-      <p>Name: -recruit-notify</p>
+    <h3>Name: -fhir-pseudonymizer-test-connection</h3>
+      <p>ApiVersion: v1</p>
+      <p>Kind: Pod</p>
+      <p>Name: -fhir-pseudonymizer-test-connection</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -1129,28 +1184,14 @@ <h3>Name: -recruit-notify</h3>
           <td class="resourceRemediationCell"></td>
         </tr>
         
-        <tr>
-          <td class="resourceSeverityCell">High</td>
-          <td class="resourceNameCell">Ensure CPU limits are set</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0270">C-0270</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].resources.limits.cpu=YOUR_VALUE</p> </td>
-        </tr>
-        
-        <tr>
-          <td class="resourceSeverityCell">High</td>
-          <td class="resourceNameCell">Ensure memory limits are set</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0271">C-0271</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].resources.limits.memory=YOUR_VALUE</p> </td>
-        </tr>
-        
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -fhir-pseudonymizer-test-connection</h3>
-      <p>ApiVersion: v1</p>
-      <p>Kind: Pod</p>
-      <p>Name: -fhir-pseudonymizer-test-connection</p>
+    <h3>Name: -vfps</h3>
+      <p>ApiVersion: apps/v1</p>
+      <p>Kind: Deployment</p>
+      <p>Name: -vfps</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -1174,10 +1215,10 @@ <h3>Name: -fhir-pseudonymizer-test-connection</h3>
       </table>
     </div>
     
-    <h3>Name: -recruit-list</h3>
+    <h3>Name: -recruit-query</h3>
       <p>ApiVersion: apps/v1</p>
       <p>Kind: Deployment</p>
-      <p>Name: -recruit-list</p>
+      <p>Name: -recruit-query</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -1190,13 +1231,6 @@ <h3>Name: -recruit-list</h3>
         </thead>
         <tbody>
         
-        <tr>
-          <td class="resourceSeverityCell">High</td>
-          <td class="resourceNameCell">Applications credentials in configuration files</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0012">C-0012</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].env[1].name</p>  <p>spec.template.spec.containers[0].env[1].value</p> </td>
-        </tr>
-        
         <tr>
           <td class="resourceSeverityCell">Medium</td>
           <td class="resourceNameCell">Ingress and Egress blocked</td>
@@ -1222,10 +1256,10 @@ <h3>Name: -recruit-list</h3>
       </table>
     </div>
     
-    <h3>Name: -hapi-fhir-jpaserver-test-endpoints</h3>
-      <p>ApiVersion: v1</p>
-      <p>Kind: Pod</p>
-      <p>Name: -hapi-fhir-jpaserver-test-endpoints</p>
+    <h3>Name: -recruit-list</h3>
+      <p>ApiVersion: apps/v1</p>
+      <p>Kind: Deployment</p>
+      <p>Name: -recruit-list</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -1249,24 +1283,31 @@ <h3>Name: -hapi-fhir-jpaserver-test-endpoints</h3>
           <td class="resourceSeverityCell">High</td>
           <td class="resourceNameCell">Ensure CPU limits are set</td>
           <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0270">C-0270</a></td>
-          <td class="resourceRemediationCell"> <p>spec.containers[0].resources.limits.cpu=YOUR_VALUE</p>  <p>spec.containers[2].resources.limits.cpu=YOUR_VALUE</p>  <p>spec.containers[1].resources.limits.cpu=YOUR_VALUE</p> </td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].resources.limits.cpu=YOUR_VALUE</p> </td>
         </tr>
         
         <tr>
           <td class="resourceSeverityCell">High</td>
           <td class="resourceNameCell">Ensure memory limits are set</td>
           <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0271">C-0271</a></td>
-          <td class="resourceRemediationCell"> <p>spec.containers[0].resources.limits.memory=YOUR_VALUE</p>  <p>spec.containers[2].resources.limits.memory=YOUR_VALUE</p>  <p>spec.containers[1].resources.limits.memory=YOUR_VALUE</p> </td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].resources.limits.memory=YOUR_VALUE</p> </td>
+        </tr>
+        
+        <tr>
+          <td class="resourceSeverityCell">High</td>
+          <td class="resourceNameCell">Applications credentials in configuration files</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0012">C-0012</a></td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].env[1].name</p>  <p>spec.template.spec.containers[0].env[1].value</p> </td>
         </tr>
         
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -blaze</h3>
+    <h3>Name: -ohdsi-webapi</h3>
       <p>ApiVersion: apps/v1</p>
-      <p>Kind: StatefulSet</p>
-      <p>Name: -blaze</p>
+      <p>Kind: Deployment</p>
+      <p>Name: -ohdsi-webapi</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -1286,41 +1327,28 @@ <h3>Name: -blaze</h3>
           <td class="resourceRemediationCell"></td>
         </tr>
         
-        </tbody>
-      </table>
-    </div>
-    
-    <h3>Name: -mailhog</h3>
-      <p>ApiVersion: v1</p>
-      <p>Kind: ServiceAccount</p>
-      <p>Name: -mailhog</p>
-      <p>Namespace: </p>
-      <table>
-        <thead>
         <tr>
-          <th class="resourceSeverityCell">Severity</th>
-          <th class="resourceNameCell">Name</th>
-          <th class="resourceURLCell">Docs</th>
-          <th class="resourceRemediationCell">Assisted Remediation</th>
+          <td class="resourceSeverityCell">High</td>
+          <td class="resourceNameCell">Ensure CPU limits are set</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0270">C-0270</a></td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].resources.limits.cpu=YOUR_VALUE</p> </td>
         </tr>
-        </thead>
-        <tbody>
         
         <tr>
-          <td class="resourceSeverityCell">Medium</td>
-          <td class="resourceNameCell">Automatic mapping of service account</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0034">C-0034</a></td>
-          <td class="resourceRemediationCell"> <p>automountServiceAccountToken=false</p> </td>
+          <td class="resourceSeverityCell">High</td>
+          <td class="resourceNameCell">Ensure memory limits are set</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0271">C-0271</a></td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].resources.limits.memory=YOUR_VALUE</p> </td>
         </tr>
         
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -vfps-migrations-v1-3-5</h3>
-      <p>ApiVersion: batch/v1</p>
-      <p>Kind: Job</p>
-      <p>Name: -vfps-migrations-v1-3-5</p>
+    <h3>Name: -fhir-pseudonymizer-test-connection</h3>
+      <p>ApiVersion: v1</p>
+      <p>Kind: Pod</p>
+      <p>Name: -fhir-pseudonymizer-test-connection</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -1344,24 +1372,24 @@ <h3>Name: -vfps-migrations-v1-3-5</h3>
           <td class="resourceSeverityCell">High</td>
           <td class="resourceNameCell">Ensure CPU limits are set</td>
           <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0270">C-0270</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].resources.limits.cpu=YOUR_VALUE</p> </td>
+          <td class="resourceRemediationCell"> <p>spec.containers[1].resources.limits.cpu=YOUR_VALUE</p>  <p>spec.containers[0].resources.limits.cpu=YOUR_VALUE</p> </td>
         </tr>
         
         <tr>
           <td class="resourceSeverityCell">High</td>
           <td class="resourceNameCell">Ensure memory limits are set</td>
           <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0271">C-0271</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].resources.limits.memory=YOUR_VALUE</p> </td>
+          <td class="resourceRemediationCell"> <p>spec.containers[1].resources.limits.memory=YOUR_VALUE</p>  <p>spec.containers[0].resources.limits.memory=YOUR_VALUE</p> </td>
         </tr>
         
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -fhir-pseudonymizer</h3>
-      <p>ApiVersion: apps/v1</p>
-      <p>Kind: Deployment</p>
-      <p>Name: -fhir-pseudonymizer</p>
+    <h3>Name: -vfps-test-connection</h3>
+      <p>ApiVersion: v1</p>
+      <p>Kind: Pod</p>
+      <p>Name: -vfps-test-connection</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -1385,10 +1413,10 @@ <h3>Name: -fhir-pseudonymizer</h3>
       </table>
     </div>
     
-    <h3>Name: -ohdsi-atlas</h3>
+    <h3>Name: -datashield-opal</h3>
       <p>ApiVersion: apps/v1</p>
-      <p>Kind: Deployment</p>
-      <p>Name: -ohdsi-atlas</p>
+      <p>Kind: StatefulSet</p>
+      <p>Name: -datashield-opal</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -1401,6 +1429,13 @@ <h3>Name: -ohdsi-atlas</h3>
         </thead>
         <tbody>
         
+        <tr>
+          <td class="resourceSeverityCell">Low</td>
+          <td class="resourceNameCell">Immutable container filesystem</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0017">C-0017</a></td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[2].securityContext.readOnlyRootFilesystem=true</p> </td>
+        </tr>
+        
         <tr>
           <td class="resourceSeverityCell">Medium</td>
           <td class="resourceNameCell">Ingress and Egress blocked</td>
@@ -1408,35 +1443,14 @@ <h3>Name: -ohdsi-atlas</h3>
           <td class="resourceRemediationCell"></td>
         </tr>
         
-        <tr>
-          <td class="resourceSeverityCell">High</td>
-          <td class="resourceNameCell">Ensure CPU limits are set</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0270">C-0270</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].resources.limits.cpu=YOUR_VALUE</p> </td>
-        </tr>
-        
-        <tr>
-          <td class="resourceSeverityCell">High</td>
-          <td class="resourceNameCell">Ensure memory limits are set</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0271">C-0271</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].resources.limits.memory=YOUR_VALUE</p> </td>
-        </tr>
-        
-        <tr>
-          <td class="resourceSeverityCell">Low</td>
-          <td class="resourceNameCell">Immutable container filesystem</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0017">C-0017</a></td>
-          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.readOnlyRootFilesystem=true</p> </td>
-        </tr>
-        
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -recruit-test-health-probes</h3>
+    <h3>Name: -fhir-gateway-test-connection</h3>
       <p>ApiVersion: v1</p>
       <p>Kind: Pod</p>
-      <p>Name: -recruit-test-health-probes</p>
+      <p>Name: -fhir-gateway-test-connection</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -1456,28 +1470,14 @@ <h3>Name: -recruit-test-health-probes</h3>
           <td class="resourceRemediationCell"></td>
         </tr>
         
-        <tr>
-          <td class="resourceSeverityCell">High</td>
-          <td class="resourceNameCell">Ensure CPU limits are set</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0270">C-0270</a></td>
-          <td class="resourceRemediationCell"> <p>spec.containers[0].resources.limits.cpu=YOUR_VALUE</p>  <p>spec.containers[2].resources.limits.cpu=YOUR_VALUE</p>  <p>spec.containers[1].resources.limits.cpu=YOUR_VALUE</p> </td>
-        </tr>
-        
-        <tr>
-          <td class="resourceSeverityCell">High</td>
-          <td class="resourceNameCell">Ensure memory limits are set</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0271">C-0271</a></td>
-          <td class="resourceRemediationCell"> <p>spec.containers[0].resources.limits.memory=YOUR_VALUE</p>  <p>spec.containers[2].resources.limits.memory=YOUR_VALUE</p>  <p>spec.containers[1].resources.limits.memory=YOUR_VALUE</p> </td>
-        </tr>
-        
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -ohdsi-test-connection</h3>
-      <p>ApiVersion: v1</p>
-      <p>Kind: Pod</p>
-      <p>Name: -ohdsi-test-connection</p>
+    <h3>Name: -fhir-gateway-loinc-converter</h3>
+      <p>ApiVersion: apps/v1</p>
+      <p>Kind: Deployment</p>
+      <p>Name: -fhir-gateway-loinc-converter</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -1497,28 +1497,14 @@ <h3>Name: -ohdsi-test-connection</h3>
           <td class="resourceRemediationCell"></td>
         </tr>
         
-        <tr>
-          <td class="resourceSeverityCell">High</td>
-          <td class="resourceNameCell">Ensure CPU limits are set</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0270">C-0270</a></td>
-          <td class="resourceRemediationCell"> <p>spec.containers[1].resources.limits.cpu=YOUR_VALUE</p>  <p>spec.containers[0].resources.limits.cpu=YOUR_VALUE</p> </td>
-        </tr>
-        
-        <tr>
-          <td class="resourceSeverityCell">High</td>
-          <td class="resourceNameCell">Ensure memory limits are set</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0271">C-0271</a></td>
-          <td class="resourceRemediationCell"> <p>spec.containers[1].resources.limits.memory=YOUR_VALUE</p>  <p>spec.containers[0].resources.limits.memory=YOUR_VALUE</p> </td>
-        </tr>
-        
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -fhir-pseudonymizer-test-connection</h3>
-      <p>ApiVersion: v1</p>
-      <p>Kind: Pod</p>
-      <p>Name: -fhir-pseudonymizer-test-connection</p>
+    <h3>Name: -datashield-rock</h3>
+      <p>ApiVersion: apps/v1</p>
+      <p>Kind: StatefulSet</p>
+      <p>Name: -datashield-rock</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -1542,10 +1528,10 @@ <h3>Name: -fhir-pseudonymizer-test-connection</h3>
       </table>
     </div>
     
-    <h3>Name: -vfps-migrations-v1-3-6</h3>
-      <p>ApiVersion: batch/v1</p>
-      <p>Kind: Job</p>
-      <p>Name: -vfps-migrations-v1-3-6</p>
+    <h3>Name: -vfps-test-connection</h3>
+      <p>ApiVersion: v1</p>
+      <p>Kind: Pod</p>
+      <p>Name: -vfps-test-connection</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -1565,14 +1551,28 @@ <h3>Name: -vfps-migrations-v1-3-6</h3>
           <td class="resourceRemediationCell"></td>
         </tr>
         
+        <tr>
+          <td class="resourceSeverityCell">High</td>
+          <td class="resourceNameCell">Ensure CPU limits are set</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0270">C-0270</a></td>
+          <td class="resourceRemediationCell"> <p>spec.containers[0].resources.limits.cpu=YOUR_VALUE</p>  <p>spec.containers[1].resources.limits.cpu=YOUR_VALUE</p> </td>
+        </tr>
+        
+        <tr>
+          <td class="resourceSeverityCell">High</td>
+          <td class="resourceNameCell">Ensure memory limits are set</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0271">C-0271</a></td>
+          <td class="resourceRemediationCell"> <p>spec.containers[0].resources.limits.memory=YOUR_VALUE</p>  <p>spec.containers[1].resources.limits.memory=YOUR_VALUE</p> </td>
+        </tr>
+        
         </tbody>
       </table>
     </div>
     
-    <h3>Name: -hapi-fhir-jpaserver</h3>
+    <h3>Name: -postgresql</h3>
       <p>ApiVersion: apps/v1</p>
-      <p>Kind: Deployment</p>
-      <p>Name: -hapi-fhir-jpaserver</p>
+      <p>Kind: StatefulSet</p>
+      <p>Name: -postgresql</p>
       <p>Namespace: </p>
       <table>
         <thead>
@@ -1587,9 +1587,9 @@ <h3>Name: -hapi-fhir-jpaserver</h3>
         
         <tr>
           <td class="resourceSeverityCell">Medium</td>
-          <td class="resourceNameCell">Ingress and Egress blocked</td>
-          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0030">C-0030</a></td>
-          <td class="resourceRemediationCell"></td>
+          <td class="resourceNameCell">Non-root containers</td>
+          <td class="resourceURLCell"><a href="https://hub.armosec.io/docs/c-0013">C-0013</a></td>
+          <td class="resourceRemediationCell"> <p>spec.template.spec.containers[0].securityContext.runAsGroup=1000</p> </td>
         </tr>
         
         <tr>