Fixes in the env variables

Related-PROD: K0RQA-15
Change-Id: Ib4693ede9a554aa5ade8ebdbec0765e94321a90e
diff --git a/k8s/docker-k0rdent-toolset-full b/k8s/docker-k0rdent-toolset-full
index ee2bc56..ea8e5c0 100644
--- a/k8s/docker-k0rdent-toolset-full
+++ b/k8s/docker-k0rdent-toolset-full
@@ -90,8 +90,7 @@
 
 WORKDIR /artifacts
 
-RUN echo '[ -f /artifacts/env.sh ] && . /artifacts/env.sh' >> /root/.bashrc && \
-    echo '[ -f /artifacts/envs/mgmtrc ] && . /artifacts/envs/mgmtrc' >> /root/.bashrc
+RUN echo '[ -f /artifacts/env.sh ] && . /artifacts/env.sh' >> /root/.bashrc
 
 ENTRYPOINT ["sleep infinite"]
 
diff --git a/k8s/workspace/init-workspace.sh b/k8s/workspace/init-workspace.sh
index 8619128..f1f31c3 100644
--- a/k8s/workspace/init-workspace.sh
+++ b/k8s/workspace/init-workspace.sh
@@ -75,6 +75,7 @@
 export KUBECONFIG=$MY_PROJFOLDER/envs/kubeconfigs/${name}-kubeconfig.yaml
 export CHILD_CLUSTER_NAME=${name}
 export CHILD_CLUSTER_NS=${namespace}
+source envs/target-child
 EOF
 
     chmod +x "$rc_file"
diff --git a/k8s/workspace/target-child b/k8s/workspace/target-child
index 92961e0..131e4cd 100644
--- a/k8s/workspace/target-child
+++ b/k8s/workspace/target-child
@@ -2,4 +2,4 @@
 export TARGET_NAMESPACE=${CHILD_CLUSTER_NS}
 export TARGET_CLUSTER=${CHILD_CLUSTER_NAME}
 export TARGET_CLD=${CHILD_CLUSTER_NAME}
-export CLUSTER_NAME=$TARGET_CLUSTER
\ No newline at end of file
+export CLUSTER_NAME=${TARGET_CLUSTER}
\ No newline at end of file