diff --git a/infra/aks-master b/infra/aks-master
index dbc095f4..0677d1b0 100644
--- a/infra/aks-master
+++ b/infra/aks-master
@@ -1,3 +1,7 @@
+cat <<EOF >>/etc/bashrc
+PS1='[\u@bastion-'$cluster' \W]\$ '
+EOF
+
 while ! rpm --import https://packages.microsoft.com/keys/microsoft.asc; do
   sleep 2
 done
diff --git a/infra/eks-master b/infra/eks-master
index c16c82df..0a199b38 100644
--- a/infra/eks-master
+++ b/infra/eks-master
@@ -1,3 +1,7 @@
+cat <<EOF >>/etc/bashrc
+PS1='[\u@bastion-'$cluster' \W]\$ '
+EOF
+
 curl -sL -o /usr/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.23.6/bin/linux/amd64/kubectl
 chmod 755 /usr/bin/kubectl
 
diff --git a/infra/gke-master b/infra/gke-master
index 7102b41f..b6ba0242 100644
--- a/infra/gke-master
+++ b/infra/gke-master
@@ -1,18 +1,12 @@
+cat <<EOF >>/etc/bashrc
+PS1='[\u@bastion-'$cluster' \W]\$ '
+EOF
+
 GKE_CLUSTER_NAME=px-deploy-$name-$cluster
 
 dnf install -y docker google-cloud-cli-gke-gcloud-auth-plugin
 systemctl enable --now docker
 
-#curl -L https://github.com/containerd/containerd/releases/download/v1.6.15/containerd-1.6.15-linux-amd64.tar.gz | tar Cxzvf /usr/local -
-#curl -o /etc/systemd/system/containerd.service https://raw.githubusercontent.com/containerd/containerd/main/containerd.service
-#mkdir /etc/containerd
-#containerd config default | sed 's/SystemdCgroup = false/SystemdCgroup = true/' >/etc/containerd/config.toml
-#curl -Lo /usr/sbin/runc https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.amd64
-#chmod 755 /usr/sbin/runc
-#systemctl daemon-reload
-#systemctl enable --now containerd
-#systemctl enable --now podman
-
 curl -sL -o /usr/bin/kubectl "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
 chmod 755 /usr/bin/kubectl
 
diff --git a/infra/ocp4-master b/infra/ocp4-master
index be083107..de9c5723 100644
--- a/infra/ocp4-master
+++ b/infra/ocp4-master
@@ -1,3 +1,7 @@
+cat <<EOF >>/etc/bashrc
+PS1='[\u@bastion-'$cluster' \W]\$ '
+EOF
+
 dnf install -y docker wget
 systemctl enable --now docker
 
diff --git a/infra/rancher-master b/infra/rancher-master
index 05213a22..d7f9c8e3 100644
--- a/infra/rancher-master
+++ b/infra/rancher-master
@@ -1,3 +1,7 @@
+cat <<EOF >>/etc/bashrc
+PS1='[\u@bastion-'$cluster' \W]\$ '
+EOF
+
 repo=$(echo $rancher_k8s_version | cut -f 1,2 -d .)
 cat <<EOF >/etc/yum.repos.d/kubernetes.repo
 [kubernetes]