diff --git a/assets/training-modvirt-ocp/cluster-monitoring.yaml b/assets/training-modvirt-ocp/cluster-monitoring.yaml
new file mode 100644
index 00000000..0d768886
--- /dev/null
+++ b/assets/training-modvirt-ocp/cluster-monitoring.yaml
@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: cluster-monitoring-config
+  namespace: openshift-monitoring
+data:
+  config.yaml: |
+    enableUserWorkload: true
diff --git a/assets/training-modvirt-ocp/px.yaml b/assets/training-modvirt-ocp/px.yaml
new file mode 100644
index 00000000..b523f918
--- /dev/null
+++ b/assets/training-modvirt-ocp/px.yaml
@@ -0,0 +1,41 @@
+kind: StorageCluster
+apiVersion: core.libopenstorage.org/v1
+metadata:
+  name: px-cluster
+  namespace: portworx
+  annotations:
+    portworx.io/is-openshift: "true"
+    portworx.io/is-eks: "true"
+    portworx.io/misc-args: " -T px-storev2 "
+    portworx.io/preflight-check: "true"
+spec:
+  image: docker.io/portworx/oci-monitor:3.6.2
+  imagePullPolicy: Always
+  kvdb:
+    internal: true
+    enableTLS: true
+  cloudStorage:
+    deviceSpecs:
+    - type=gp3,size=50
+    - type=gp3,size=50
+    - type=gp3,size=50
+    - type=gp3,size=50
+    systemMetadataDeviceSpec: type=gp3,size=64
+  secretsProvider: k8s
+  startPort: 17001
+  stork:
+    enabled: true
+    args:
+      webhook-controller: "true"
+  runtimeOptions:
+    default-io-profile: "6"
+  csi:
+    enabled: true
+  monitoring:
+    telemetry:
+      enabled: true
+    prometheus:
+      exportMetrics: true
+  certManager:
+    enabled: true
+  env:
diff --git a/assets/training-modvirt-ocp/vm-sc.yaml b/assets/training-modvirt-ocp/vm-sc.yaml
index 9cbf5010..b33164f5 100644
--- a/assets/training-modvirt-ocp/vm-sc.yaml
+++ b/assets/training-modvirt-ocp/vm-sc.yaml
@@ -7,4 +7,5 @@ metadata:
 parameters:
   repl: "2"
 provisioner: pxd.portworx.com
+volumeBindingMode: WaitForFirstConsumer
 allowVolumeExpansion: true
diff --git a/scripts/training-modvirt-ocp-bastion b/scripts/training-modvirt-ocp-bastion
index e57cb1ed..ce830de6 100644
--- a/scripts/training-modvirt-ocp-bastion
+++ b/scripts/training-modvirt-ocp-bastion
@@ -5,6 +5,7 @@ cat <<EOF >>/etc/skel/.bashrc
 alias k=kubectl
 complete -F __start_kubectl k
 PS1='\e[0;33m[\u@px-training \W]\$ \e[m'
+tty &>/dev/null && cat /tmp/motd.\$(id -nu | sed s/training//)
 EOF
 
 # Create training users
@@ -17,11 +18,15 @@ done
 # Install pxctl
 cp /assets/pxctl.sh /usr/bin/pxctl
 
-# Collect kubeconfigs
+# Collect kubeconfigs and motds
 for i in $(seq 1 $clusters); do
   echo trying to copy kubeconfig from cluster $i
   while ! scp master-$i:.kube/config /home/training$i/.kube/config; do
     sleep 2
   done
+  echo trying to copy motd from cluster $i
+  while ! scp master-$i:/etc/motd /tmp/motd.$i; do
+    sleep 2
+  done
   chown training$i.training$i /home/training$i/.kube/config
 done
diff --git a/scripts/training-modvirt-ocp-cluster b/scripts/training-modvirt-ocp-cluster
deleted file mode 100644
index b9fbed10..00000000
--- a/scripts/training-modvirt-ocp-cluster
+++ /dev/null
@@ -1,2 +0,0 @@
-# Delete AWS keys
-rm -f /root/.aws/credentials
diff --git a/templates/training-modvirt-ocp.yml b/templates/training-modvirt-ocp.yml
index d883f037..3ce19599 100644
--- a/templates/training-modvirt-ocp.yml
+++ b/templates/training-modvirt-ocp.yml
@@ -1,9 +1,7 @@
 description: Deploys training clusters
-scripts: ["training-modvirt-ocp-cluster","install-virtctl"]
-px_version: 3.6.0.1
 platform: ocp4
 aws_type: "c5n.metal"
 ocp4_version: 4.21.6
 cluster:
   - id: 1
-    scripts: ["install-awscli", "wetty", "snoop", "training-modvirt-ocp-bastion"]
+    scripts: ["install-awscli", "wetty", "snoop", "training-modvirt-ocp-bastion", "install-virtctl"]