diff --git a/installers/mgmt-cluster/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/ksu-management-wft.yaml b/installers/mgmt-cluster/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/ksu-management-wft.yaml
index 67a4f87..71dc58b 100644
--- a/installers/mgmt-cluster/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/ksu-management-wft.yaml
+++ b/installers/mgmt-cluster/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/ksu-management-wft.yaml
@@ -94,6 +94,7 @@
           secretKeyRef:
             name: "{{inputs.parameters.reference_secret_for_values}}"
             key: "{{inputs.parameters.reference_key_for_values}}"
+            optional: true
           default: ""
       - name: DEBUG
         value: "{{inputs.parameters.debug}}"
@@ -210,6 +211,7 @@
           secretKeyRef:
             name: "{{inputs.parameters.reference_secret_for_values}}"
             key: "{{inputs.parameters.reference_key_for_values}}"
+            optional: true
           default: ""
       - name: DEBUG
         value: "{{inputs.parameters.debug}}"
@@ -330,6 +332,7 @@
           secretKeyRef:
             name: "{{inputs.parameters.reference_secret_for_values}}"
             key: "{{inputs.parameters.reference_key_for_values}}"
+            optional: true
           default: ""
       - name: DEBUG
         value: "{{inputs.parameters.debug}}"
@@ -445,6 +448,7 @@
           secretKeyRef:
             name: "{{inputs.parameters.reference_secret_for_values}}"
             key: "{{inputs.parameters.reference_key_for_values}}"
+            optional: true
           default: ""
       - name: DEBUG
         value: "{{inputs.parameters.debug}}"
diff --git a/installers/mgmt-cluster/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/profile-management-wft.yaml b/installers/mgmt-cluster/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/profile-management-wft.yaml
index 64917be..17566d1 100644
--- a/installers/mgmt-cluster/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/profile-management-wft.yaml
+++ b/installers/mgmt-cluster/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/profile-management-wft.yaml
@@ -50,10 +50,6 @@
     container:
       image: ttl.sh/osm-krm-functions:24h
       # imagePullPolicy: Always
-      # securityContext:
-      #   runAsUser: 10000
-      #   runAsGroup: 10000
-      #   fsGroup: 10000
       volumeMounts:
       - name: fleet-repo-volume
         mountPath: '{{inputs.parameters.fleet_mount_path}}'
@@ -65,6 +61,10 @@
       - "{{inputs.parameters.project_name}}"
       - "{{inputs.parameters.fleet_repo_url}}"
       - "{{inputs.parameters.fleet_repo_dir}}"
+    securityContext:
+      fsGroup: 10000
+    #   runAsUser: 10000
+    #   runAsGroup: 10000
 
 
   # Delete a profile
@@ -93,10 +93,6 @@
     container:
       image: ttl.sh/osm-krm-functions:24h
       # imagePullPolicy: Always
-      # securityContext:
-      #   runAsUser: 10000
-      #   runAsGroup: 10000
-      #   fsGroup: 10000
       volumeMounts:
       - name: fleet-repo-volume
         mountPath: '{{inputs.parameters.fleet_mount_path}}'
@@ -107,6 +103,10 @@
       - "{{inputs.parameters.profile_type}}"
       - "{{inputs.parameters.project_name}}"
       - "{{inputs.parameters.fleet_repo_dir}}"
+    securityContext:
+      fsGroup: 10000
+    #   runAsUser: 10000
+    #   runAsGroup: 10000
 
 
   # Attach a profile to a cluster
@@ -135,10 +135,6 @@
     container:
       image: ttl.sh/osm-krm-functions:24h
       # imagePullPolicy: Always
-      # securityContext:
-      #   runAsUser: 10000
-      #   runAsGroup: 10000
-      #   fsGroup: 10000
       volumeMounts:
       - name: fleet-repo-volume
         mountPath: '{{inputs.parameters.fleet_mount_path}}'
@@ -150,6 +146,10 @@
       - "{{inputs.parameters.project_name}}"
       - "{{inputs.parameters.cluster_kustomization_name}}"
       - "{{inputs.parameters.fleet_repo_dir}}"
+    securityContext:
+      fsGroup: 10000
+    #   runAsUser: 10000
+    #   runAsGroup: 10000
 
 
   # Detach profile from cluster
@@ -178,10 +178,6 @@
     container:
       image: ttl.sh/osm-krm-functions:24h
       # imagePullPolicy: Always
-      # securityContext:
-      #   runAsUser: 10000
-      #   runAsGroup: 10000
-      #   fsGroup: 10000
       volumeMounts:
       - name: fleet-repo-volume
         mountPath: '{{inputs.parameters.fleet_mount_path}}'
@@ -193,3 +189,7 @@
       - "{{inputs.parameters.project_name}}"
       - "{{inputs.parameters.cluster_kustomization_name}}"
       - "{{inputs.parameters.fleet_repo_dir}}"
+    securityContext:
+      fsGroup: 10000
+    #   runAsUser: 10000
+    #   runAsGroup: 10000