diff --git a/keywords/k8s/dashboard/kubectl_dashboard_apply_keywords.py b/keywords/k8s/files/kubectl_file_apply_keywords.py
similarity index 93%
rename from keywords/k8s/dashboard/kubectl_dashboard_apply_keywords.py
rename to keywords/k8s/files/kubectl_file_apply_keywords.py
index be56f2e5..d07bcedf 100644
--- a/keywords/k8s/dashboard/kubectl_dashboard_apply_keywords.py
+++ b/keywords/k8s/files/kubectl_file_apply_keywords.py
@@ -3,7 +3,7 @@ from keywords.base_keyword import BaseKeyword
 from keywords.k8s.k8s_command_wrapper import export_k8s_config
 
 
-class KubectlDashboardApplyKeywords(BaseKeyword):
+class KubectlFileApplyKeywords(BaseKeyword):
     """_summary_
 
     Args:
diff --git a/keywords/k8s/dashboard/kubectl_dashboard_delete_keywords.py b/keywords/k8s/files/kubectl_file_delete_keywords.py
similarity index 88%
rename from keywords/k8s/dashboard/kubectl_dashboard_delete_keywords.py
rename to keywords/k8s/files/kubectl_file_delete_keywords.py
index 3d58aee9..c543e5a4 100644
--- a/keywords/k8s/dashboard/kubectl_dashboard_delete_keywords.py
+++ b/keywords/k8s/files/kubectl_file_delete_keywords.py
@@ -2,9 +2,9 @@ from keywords.base_keyword import BaseKeyword
 from keywords.k8s.k8s_command_wrapper import export_k8s_config
 
 
-class KubectlDeleteDashboardKeywords(BaseKeyword):
+class KubectlFileDeleteKeywords(BaseKeyword):
     """
-    Keywords for delete secrets
+    Keywords for delete file resources
     """
 
     def __init__(self, ssh_connection):
diff --git a/keywords/k8s/secret/kubectl_create_secret_keywords.py b/keywords/k8s/secret/kubectl_create_secret_keywords.py
index 1dc8c7c7..58b3a8c8 100644
--- a/keywords/k8s/secret/kubectl_create_secret_keywords.py
+++ b/keywords/k8s/secret/kubectl_create_secret_keywords.py
@@ -33,7 +33,7 @@ class KubectlCreateSecretsKeywords(BaseKeyword):
             export_k8s_config(f"kubectl create secret docker-registry {secret_name} --docker-server={docker_server} " f"--docker-username={user_name} --docker-password={password}")
         )
 
-    def create_secret_generic(self, secret_name: str, tls_crt: str, tls_key: str):
+    def create_secret_generic(self, secret_name: str, tls_crt: str, tls_key: str, namespace: str):
         """
         Create a generic secret
 
@@ -41,5 +41,6 @@ class KubectlCreateSecretsKeywords(BaseKeyword):
             secret_name (str): the secret name
             tls_crt (str): tls_crt file name
             tls_key (str): tls_key file name
+            namespace (str): namespace
         """
-        self.ssh_connection.send(export_k8s_config(f"kubectl create secret {secret_name} --from-file=tls.crt={tls_crt} --from-file=tls.key={tls_key}"))
+        self.ssh_connection.send(export_k8s_config(f"kubectl create -n {namespace} secret generic {secret_name} --from-file=tls.crt={tls_crt} --from-file=tls.key={tls_key}"))
diff --git a/keywords/k8s/secret/kubectl_delete_secret_keywords.py b/keywords/k8s/secret/kubectl_delete_secret_keywords.py
index 67a947c8..409047f5 100644
--- a/keywords/k8s/secret/kubectl_delete_secret_keywords.py
+++ b/keywords/k8s/secret/kubectl_delete_secret_keywords.py
@@ -15,7 +15,7 @@ class KubectlDeleteSecretsKeywords(BaseKeyword):
         """
         self.ssh_connection = ssh_connection
 
-    def delete_secret(self, secret_name: str) -> str:
+    def delete_secret(self, secret_name: str, namespace: str) -> str:
         """
         Deletes the secret
         Args:
@@ -24,7 +24,7 @@ class KubectlDeleteSecretsKeywords(BaseKeyword):
         Returns: the output
 
         """
-        output = self.ssh_connection.send(export_k8s_config(f"kubectl delete secret {secret_name}"))
+        output = self.ssh_connection.send(export_k8s_config(f"kubectl delete -n {namespace} secret {secret_name}"))
         self.validate_success_return_code(self.ssh_connection)
 
         return output
diff --git a/testcases/cloud_platform/regression/containers/test_k8s_dashboard.py b/testcases/cloud_platform/regression/containers/test_k8s_dashboard.py
index f0dd2ebf..34ace0e6 100644
--- a/testcases/cloud_platform/regression/containers/test_k8s_dashboard.py
+++ b/testcases/cloud_platform/regression/containers/test_k8s_dashboard.py
@@ -79,8 +79,8 @@ def create_k8s_dashboard(request, namespace, con_ssh):
     con_ssh.send('openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout {} -out {} ' '-subj "/CN={}"'.format(key, crt, sys_domain_name))
 
     KubectlCreateSecretsKeywords.create_secret_generic(secret_name=secrets_name, tls_crt=crt, tls_key=key)
-    get_logger().log_info(f"Creating resource from file {kubeconfig_file_path}")
 
+    get_logger().log_info(f"Creating resource from file {kubeconfig_file_path}")
     KubectlDashboardApplyKeywords(ssh_connection=con_ssh).dashboard_apply_from_yaml(kubeconfig_file_path)
 
     def teardown():