diff --git a/lib/shared/addon/components/form-agent-config/template.hbs b/lib/shared/addon/components/form-agent-config/template.hbs
index af350f4d0..0695cd33b 100644
--- a/lib/shared/addon/components/form-agent-config/template.hbs
+++ b/lib/shared/addon/components/form-agent-config/template.hbs
@@ -62,7 +62,7 @@
   {{#if (and (or (not useDefaultAffinity) (not editing) ) overrideAffinity) }}
     <BannerMessage
       @color="bg-warning mb-10"
-      @message={{t "clusterNew.agentConfig.banners.affinity"}}
+      @message={{t "clusterNew.agentConfig.banners.affinity" htmlSafe=true}}
     />
     <FormAffinityK8s
     @editing={{editing}}
diff --git a/lib/shared/addon/components/resource-list/component.js b/lib/shared/addon/components/resource-list/component.js
index d71e36e71..4706d2fa5 100644
--- a/lib/shared/addon/components/resource-list/component.js
+++ b/lib/shared/addon/components/resource-list/component.js
@@ -6,6 +6,7 @@ import {
   get,
 } from '@ember/object';
 import { parseSi } from '../../utils/parse-unit';
+import { convertToMillis } from '../../utils/util';
 
 export default Component.extend({
   layout,
@@ -51,12 +52,7 @@ export default Component.extend({
     get(){
       let cpu = get(this.value, 'cpu')
 
-      if (!!cpu){
-        // parse si returns cpu in CPUs - multiply by 1000 to get mCPUs
-        cpu = parseSi(cpu) * 1000
-      }
-
-      return cpu
+      return cpu ? convertToMillis(cpu.toString()) : null
     },
     set(key, val){
       const out = { ...this.value }