diff --git a/config/operator/base/ui-extensions/serverless/details b/config/operator/base/ui-extensions/serverless/details
index ba7e1fc5e..393f354df 100644
--- a/config/operator/base/ui-extensions/serverless/details
+++ b/config/operator/base/ui-extensions/serverless/details
@@ -9,10 +9,6 @@ body:
   - name: Desired Specification
     widget: Panel
     children:
-      - widget: Alert
-        severity: warning
-        alert: "'Internal Docker Registry is not a highly available registry and should be used for development purpose only'"
-        visibility: "$root.spec.dockerRegistry.enableInternal = true"
       - name: Docker Registry
         visibility: $root.spec.dockerRegistry.enableInternal = true
         source: spec.dockerRegistry.enableInternal?"INTERNAL":""
@@ -57,6 +53,11 @@ body:
       - name: Target CPU utilisation for HPA
         source: spec.targetCPUUtilizationPercentage
         visibility: '$exists($value)'
+  - simple: true
+    widget: Alert
+    severity: warning
+    alert: "'Internal Docker Registry is not a highly available registry and should be used for development purpose only'"
+    visibility: "$root.spec.dockerRegistry.enableInternal = true"
   - name: Status
     widget: Panel
     children:
diff --git a/config/operator/base/ui-extensions/serverless/kustomization.yaml b/config/operator/base/ui-extensions/serverless/kustomization.yaml
index 33fbf9888..f3cb370f0 100644
--- a/config/operator/base/ui-extensions/serverless/kustomization.yaml
+++ b/config/operator/base/ui-extensions/serverless/kustomization.yaml
@@ -1,6 +1,6 @@
 configMapGenerator:
-- name: operator.kyma-project.io
-  namespace: kube-public
+- name: serverless.operator.kyma-project.io
+  namespace: kyma-system
   files:
   - general
   - form