diff --git a/home-content/.bash_oc_smart_aliases.sh b/home-content/.bash_oc_smart_aliases.sh
index 94549c6..0880bcb 100644
--- a/home-content/.bash_oc_smart_aliases.sh
+++ b/home-content/.bash_oc_smart_aliases.sh
@@ -12,7 +12,7 @@
 source ~/.bash_oc_smart.sh
 
 # ============================================================================
-# AWS Clusters - Smart Switch Aliases
+# AWS Shared Clusters - Smart Switch Aliases
 # ============================================================================
 
 # AWS-Test1 (aws01t)
@@ -35,36 +35,6 @@ alias ocAWS-Test2='oc_smart_switch \
     "https://api.aws02t.sbb-aws-test.net:6443" \
     "https://oauth-openshift.apps.aws02t.sbb-aws-test.net/oauth/token/request"'
 
-# AWS-Dev (Development on aws01t)
-alias ocAWS-Dev='oc_smart_switch \
-    "aws01t" \
-    "AWS-Dev" \
-    "kihub-u241100-dev/api-aws01t-sbb-aws-test-net:6443/u241100" \
-    "kihub-dev-u241100" \
-    "OPENSHIFT_TOKEN_AWS_TEST" \
-    "https://api.aws01t.sbb-aws-test.net:6443" \
-    "https://oauth-openshift.apps.aws01t.sbb-aws-test.net/oauth/token/request"'
-
-# AWS-RT (Runtime on aws01t)
-alias ocAWS-RT='oc_smart_switch \
-    "aws01t" \
-    "AWS-RT" \
-    "kihub-rt/api-aws01t-sbb-aws-test-net:6443/u241100" \
-    "kihub-rt" \
-    "OPENSHIFT_TOKEN_AWS_TEST" \
-    "https://api.aws01t.sbb-aws-test.net:6443" \
-    "https://oauth-openshift.apps.aws01t.sbb-aws-test.net/oauth/token/request"'
-
-# AWS-Test (Test on aws01t)
-alias ocAWS-Test='oc_smart_switch \
-    "aws01t" \
-    "AWS-Test" \
-    "kihub-test/api-aws01t-sbb-aws-test-net:6443/u241100" \
-    "kihub-test" \
-    "OPENSHIFT_TOKEN_AWS_TEST" \
-    "https://api.aws01t.sbb-aws-test.net:6443" \
-    "https://oauth-openshift.apps.aws01t.sbb-aws-test.net/oauth/token/request"'
-
 # AWS-Int (Integration on Lisa)
 alias ocAWS-Int='oc_smart_switch \
     "lisa" \
@@ -116,28 +86,62 @@ alias ocAWS-WZU='oc_smart_switch \
     "https://oauth-openshift.apps.wzu01t.ocp-test.sbb-aws.net/oauth/token/request"'
 
 # ============================================================================
-# SC (OTC) Clusters - Smart Switch Aliases
+# CUS Private Clusters - Smart Switch Aliases
 # ============================================================================
 
-# SC-Dev (Development on sc02t)
-alias ocSC-Dev='oc_smart_switch \
-    "sc02t" \
-    "SC-Dev" \
-    "kihub-u241100-dev/api-sc02t-otc-test-sbb-ch:6443/u241100" \
+# AWS-Dev (Development on aws01t)
+alias ocCUS-Dev='oc_smart_switch \
+    "cus01t" \
+    "AWS-Dev" \
+    "kihub-dev-u241100/api-cus01t-sbb-aws-test-net:6443/u241100" \
     "kihub-dev-u241100" \
-    "OPENSHIFT_TOKEN_SC02" \
-    "https://api.sc02t.otc-test.sbb.ch:6443" \
-    "https://oauth-openshift.apps.sc02t.otc-test.sbb.ch/oauth/token/request"'
+    "OPENSHIFT_TOKEN_AWS_TEST" \
+    "https://api.cus01t.sbb-aws-test.net:6443" \
+    "https://oauth-openshift.apps.cus01t.sbb-aws-test.net/oauth/token/request"'
 
-# SC-RT (Runtime on sc02t)
-alias ocSC-RT='oc_smart_switch \
-    "sc02t" \
-    "SC-RT" \
-    "kihub-rt/api-sc02t-otc-test-sbb-ch:6443/u241100" \
-    "kihub-rt" \
-    "OPENSHIFT_TOKEN_SC02" \
-    "https://api.sc02t.otc-test.sbb.ch:6443" \
-    "https://oauth-openshift.apps.sc02t.otc-test.sbb.ch/oauth/token/request"'
+# AWS-RT (Runtime on aws01t)
+alias ocCUS-RT='oc_smart_switch \
+    "cus01t" \
+    "AWS-RT" \
+    "kihub-dev-rt/api-cus01t-sbb-aws-test-net:6443/u241100" \
+    "kihub-dev-rt" \
+    "OPENSHIFT_TOKEN_AWS_TEST" \
+    "https://api.cus01t.sbb-aws-test.net:6443" \
+    "https://oauth-openshift.apps.cus01t.sbb-aws-test.net/oauth/token/request"'
+
+# AWS-Test (Test on aws01t)
+alias ocCUS-Test='oc_smart_switch \
+    "cus01t" \
+    "CUS-Test" \
+    "kihub-test/api-cus01t-sbb-aws-test-net:6443/u241100" \
+    "kihub-test" \
+    "OPENSHIFT_TOKEN_AWS_TEST" \
+    "https://api.cus01t.sbb-aws-test.net:6443" \
+    "https://oauth-openshift.apps.cus01t.sbb-aws-test.net/oauth/token/request"'
+
+# AWS-Test (Test on aws01t)
+alias ocCUS-Int='oc_smart_switch \
+    "cus01t" \
+    "CUS-Int" \
+    "kihub-int/api-cus01t-sbb-aws-test-net:6443/u241100" \
+    "kihub-int" \
+    "OPENSHIFT_TOKEN_AWS_TEST" \
+    "https://api.cus01t.sbb-aws-test.net:6443" \
+    "https://oauth-openshift.apps.cus01t.sbb-aws-test.net/oauth/token/request"'
+
+# AWS-Test (Test on aws01t)
+alias ocCUS-Prod='oc_smart_switch \
+    "cus01p" \
+    "CUS-Prod" \
+    "kihub-prod/api-cus01p-sbb-aws-test-net:6443/u241100" \
+    "kihub-prod" \
+    "OPENSHIFT_TOKEN_AWS_TEST" \
+    "https://api.cus01p.sbb-aws-test.net:6443" \
+    "https://oauth-openshift.apps.cus01p.sbb-aws-test.net/oauth/token/request"'
+
+# ============================================================================
+# SC (OTC) Clusters - Smart Switch Aliases
+# ============================================================================
 
 # SC-Test (Test on sc02t)
 alias ocSC-Test='oc_smart_switch \