diff --git a/solutions/joining-hub-and-spoke-with-aws-auth-manually/README.md b/solutions/joining-hub-and-spoke-with-aws-auth/README.md
similarity index 99%
rename from solutions/joining-hub-and-spoke-with-aws-auth-manually/README.md
rename to solutions/joining-hub-and-spoke-with-aws-auth/README.md
index e32f9b038..006647617 100644
--- a/solutions/joining-hub-and-spoke-with-aws-auth-manually/README.md
+++ b/solutions/joining-hub-and-spoke-with-aws-auth/README.md
@@ -1,4 +1,4 @@
-# Manually join Hub and Spoke using AWS-based authentication
+# Join Hub and Spoke using AWS-based authentication
 
 This guide provides list of steps to join AWS EKS clusters as Hub and Spoke using OCM.
 
diff --git a/solutions/joining-hub-and-spoke-with-aws-auth-manually/templates/Template-Hub-Role-Trust-Policy.json b/solutions/joining-hub-and-spoke-with-aws-auth/templates/Template-Hub-Role-Trust-Policy.json
similarity index 100%
rename from solutions/joining-hub-and-spoke-with-aws-auth-manually/templates/Template-Hub-Role-Trust-Policy.json
rename to solutions/joining-hub-and-spoke-with-aws-auth/templates/Template-Hub-Role-Trust-Policy.json
diff --git a/solutions/joining-hub-and-spoke-with-aws-auth-manually/templates/Template-Identity-Creator-Permission-Policy.json b/solutions/joining-hub-and-spoke-with-aws-auth/templates/Template-Identity-Creator-Permission-Policy.json
similarity index 100%
rename from solutions/joining-hub-and-spoke-with-aws-auth-manually/templates/Template-Identity-Creator-Permission-Policy.json
rename to solutions/joining-hub-and-spoke-with-aws-auth/templates/Template-Identity-Creator-Permission-Policy.json
diff --git a/solutions/joining-hub-and-spoke-with-aws-auth-manually/templates/Template-Identity-Creator-Trust-Policy.json b/solutions/joining-hub-and-spoke-with-aws-auth/templates/Template-Identity-Creator-Trust-Policy.json
similarity index 100%
rename from solutions/joining-hub-and-spoke-with-aws-auth-manually/templates/Template-Identity-Creator-Trust-Policy.json
rename to solutions/joining-hub-and-spoke-with-aws-auth/templates/Template-Identity-Creator-Trust-Policy.json
diff --git a/solutions/joining-hub-and-spoke-with-aws-auth-manually/templates/Template-Spoke-Role-Permission-Policy.json b/solutions/joining-hub-and-spoke-with-aws-auth/templates/Template-Spoke-Role-Permission-Policy.json
similarity index 100%
rename from solutions/joining-hub-and-spoke-with-aws-auth-manually/templates/Template-Spoke-Role-Permission-Policy.json
rename to solutions/joining-hub-and-spoke-with-aws-auth/templates/Template-Spoke-Role-Permission-Policy.json
diff --git a/solutions/joining-hub-and-spoke-with-aws-auth-manually/templates/Template-Spoke-Role-Trust-Policy.json b/solutions/joining-hub-and-spoke-with-aws-auth/templates/Template-Spoke-Role-Trust-Policy.json
similarity index 100%
rename from solutions/joining-hub-and-spoke-with-aws-auth-manually/templates/Template-Spoke-Role-Trust-Policy.json
rename to solutions/joining-hub-and-spoke-with-aws-auth/templates/Template-Spoke-Role-Trust-Policy.json
diff --git a/solutions/joining-hub-and-spoke-with-aws-auth-manually/templates/Template-hub-kubeconfig-secret.yaml b/solutions/joining-hub-and-spoke-with-aws-auth/templates/Template-hub-kubeconfig-secret.yaml
similarity index 100%
rename from solutions/joining-hub-and-spoke-with-aws-auth-manually/templates/Template-hub-kubeconfig-secret.yaml
rename to solutions/joining-hub-and-spoke-with-aws-auth/templates/Template-hub-kubeconfig-secret.yaml