diff --git a/lib/shared/addon/components/cluster-driver/driver-rke/component.js b/lib/shared/addon/components/cluster-driver/driver-rke/component.js
index ce073a32b..fad139d1e 100644
--- a/lib/shared/addon/components/cluster-driver/driver-rke/component.js
+++ b/lib/shared/addon/components/cluster-driver/driver-rke/component.js
@@ -718,7 +718,7 @@ export default InputTextFile.extend(ManageLabels, ClusterDriver, {
           }),
         }));
       } else {
-        set(this, 'config.services', { kubeApi: { podSecurityPolicy: value } });
+        set(this, 'config.services.kubeApi.podSecurityPolicy', value );
       }
 
       return value;
@@ -727,13 +727,13 @@ export default InputTextFile.extend(ManageLabels, ClusterDriver, {
 
   kubeApiPSAC: computed('config.services.kubeApi.podSecurityConfiguration', {
     get() {
-      let pspConfig = get(this, 'config.services.kubeApi');
+      let psaConfig = get(this, 'config.services.kubeApi');
 
-      if (typeof  pspConfig === 'undefined') {
+      if (typeof  psaConfig === 'undefined') {
         return undefined;
       }
 
-      return get(pspConfig, 'podSecurityConfiguration');
+      return get(psaConfig, 'podSecurityConfiguration');
     },
     set(key, value) {
       if (!value){
@@ -748,7 +748,7 @@ export default InputTextFile.extend(ManageLabels, ClusterDriver, {
             }),
           }));
         } else {
-          set(this, 'config.services', { kubeApi: { podSecurityConfiguration: value } });
+          set(this, 'config.services.kubeApi.podSecurityConfiguration', value);
         }
       }
 
@@ -756,6 +756,15 @@ export default InputTextFile.extend(ManageLabels, ClusterDriver, {
     }
   }),
 
+  psaOpts: computed('model.psacs.[]', function(){
+    let psacs = get(this, 'model.psacs').toArray()
+    const intl     = get(this, 'intl');
+
+    return [
+      { displayName: intl.t('clusterNew.psa.default'), },
+      ...psacs]
+  }),
+
 
   supportsPSA: computed('config.kubernetesVersion', function() {
     // rke config supports PSA if version >= 1.23.0 - this is also when PSP support ends
diff --git a/lib/shared/addon/components/cluster-driver/driver-rke/template.hbs b/lib/shared/addon/components/cluster-driver/driver-rke/template.hbs
index 09b4d4f5b..8b65b57d1 100644
--- a/lib/shared/addon/components/cluster-driver/driver-rke/template.hbs
+++ b/lib/shared/addon/components/cluster-driver/driver-rke/template.hbs
@@ -543,11 +543,11 @@
                     value=config.services.kubeApi.podSecurityConfiguration
                 }}
                   {{new-select
-                    content=model.psacs
+                    content=psaOpts
                     optionLabelPath="displayName"
                     optionValuePath="id"
                     localizedPrompt=true
-                    value=config.services.kubeApi.podSecurityConfiguration
+                    value=kubeApiPSAC
                   }}
                 {{/input-or-display}}
               </CheckOverrideAllowed>
diff --git a/translations/en-us.yaml b/translations/en-us.yaml
index ed363ac3c..45a89bbe0 100644
--- a/translations/en-us.yaml
+++ b/translations/en-us.yaml
@@ -4472,6 +4472,7 @@ clusterNew:
     shortLabel: Open Telekom Cloud CCE
   psa:
     label: Pod Security Admission Configuration Template
+    default: Default
   psp:
     label: Default Pod Security Policy
     none: No policies are defined