diff --git a/ChatQnA/README.md b/ChatQnA/README.md
index 5f6f2bd22..3d72e0161 100644
--- a/ChatQnA/README.md
+++ b/ChatQnA/README.md
@@ -210,11 +210,11 @@ Refer to the [NVIDIA GPU Guide](./docker/gpu/README.md) for more instructions on
 
 ### Deploy ChatQnA into Kubernetes on Xeon & Gaudi with GMC
 
-Refer to the [Kubernetes Guide](./kubernetes/README.md) for instructions on deploying ChatQnA into Kubernetes on Xeon & Gaudi with GMC.
+Refer to the [Kubernetes Guide](./kubernetes/intel/README_gmc.md) for instructions on deploying ChatQnA into Kubernetes on Xeon & Gaudi with GMC.
 
 ### Deploy ChatQnA into Kubernetes on Xeon & Gaudi without GMC
 
-Refer to the [Kubernetes Guide](./kubernetes/manifests/README.md) for instructions on deploying ChatQnA into Kubernetes on Xeon & Gaudi without GMC.
+Refer to the [Kubernetes Guide](./kubernetes/kubernetes/intel/README.md) for instructions on deploying ChatQnA into Kubernetes on Xeon & Gaudi without GMC.
 
 ### Deploy ChatQnA into Kubernetes using Helm Chart
 
diff --git a/CodeGen/README.md b/CodeGen/README.md
index c91dcdfa4..259008731 100644
--- a/CodeGen/README.md
+++ b/CodeGen/README.md
@@ -98,7 +98,7 @@ Refer to the [Xeon Guide](./docker_compose/intel/cpu/xeon/README.md) for more in
 
 ### Deploy CodeGen using Kubernetes
 
-Refer to the [Kubernetes Guide](./kubernetes/manifests/README.md) for instructions on deploying CodeGen into Kubernetes on Xeon & Gaudi.
+Refer to the [Kubernetes Guide](./kubernetes/intel/README.md) for instructions on deploying CodeGen into Kubernetes on Xeon & Gaudi.
 
 ### Deploy CodeGen into Kubernetes using Helm Chart
 
diff --git a/CodeTrans/README.md b/CodeTrans/README.md
index e6e687a09..b5bf56207 100644
--- a/CodeTrans/README.md
+++ b/CodeTrans/README.md
@@ -89,11 +89,11 @@ Refer to the [Xeon Guide](./docker_compose/intel/cpu/xeon/README.md) for more in
 
 ### Deploy using Kubernetes with GMC
 
-Refer to the [Code Translation Kubernetes Guide](./kubernetes/README.md)
+Refer to the [Code Translation Kubernetes Guide](./kubernetes/intel/README_gmc.md)
 
 ### Deploy using Kubernetes without GMC
 
-Refer to the [Code Translation Kubernetes Guide](./kubernetes/manifests/README.md)
+Refer to the [Code Translation Kubernetes Guide](./kubernetes/intel/README.md)
 
 ### Deploy CodeTrans into Kubernetes using Helm Chart
 
diff --git a/DocSum/README.md b/DocSum/README.md
index c754aca8f..9fbe6d9fa 100644
--- a/DocSum/README.md
+++ b/DocSum/README.md
@@ -88,11 +88,11 @@ Refer to the [Xeon Guide](./docker_compose/intel/cpu/xeon/README.md) for more in
 
 ### Deploy using Kubernetes with GMC
 
-Refer to [Kubernetes deployment](./kubernetes/README.md)
+Refer to [Kubernetes deployment](./kubernetes/intel/README_gmc.md)
 
 ### Deploy using Kubernetes without GMC
 
-Refer to [Kubernetes deployment](./kubernetes/manifests/README.md)
+Refer to [Kubernetes deployment](./kubernetes/intel/README.md)
 
 ### Deploy DocSum into Kubernetes using Helm Chart
 
diff --git a/README.md b/README.md
index 971ac85a9..d89aee874 100644
--- a/README.md
+++ b/README.md
@@ -37,17 +37,17 @@ Deployment are based on released docker images by default, check [docker image l
 
 #### Deploy Examples
 
-| Use Case    | Docker Compose<br/>Deployment on Xeon                                    | Docker Compose<br/>Deployment on Gaudi                                     | Kubernetes with GMC                                      | Kubernetes with Manifests                                            | Kubernetes with Helm Charts                                                                                        |
-| ----------- | ------------------------------------------------------------------------ | -------------------------------------------------------------------------- | -------------------------------------------------------- | -------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------ |
-| ChatQnA     | [Xeon Instructions](ChatQnA/docker_compose/intel/cpu/xeon/README.md)     | [Gaudi Instructions](ChatQnA/docker_compose/intel/hpu/gaudi/README.md)     | [ChatQnA with GMC](ChatQnA/kubernetes/README.md)         | [ChatQnA with Manifests](ChatQnA/kubernetes/manifests/README.md)     | [ChatQnA with Helm Charts](https://github.com/opea-project/GenAIInfra/tree/main/helm-charts/chatqna/README.md)     |
-| CodeGen     | [Xeon Instructions](CodeGen/docker_compose/intel/cpu/xeon/README.md)     | [Gaudi Instructions](CodeGen/docker_compose/intel/hpu/gaudi/README.md)     | [CodeGen with GMC](CodeGen/kubernetes/README.md)         | [CodeGen with Manifests](CodeGen/kubernetes/manifests/README.md)     | [CodeGen with Helm Charts](https://github.com/opea-project/GenAIInfra/tree/main/helm-charts/codegen/README.md)     |
-| CodeTrans   | [Xeon Instructions](CodeTrans/docker_compose/intel/cpu/xeon/README.md)   | [Gaudi Instructions](CodeTrans/docker_compose/intel/hpu/gaudi/README.md)   | [CodeTrans with GMC](CodeTrans/kubernetes/README.md)     | [CodeTrans with Manifests](CodeTrans/kubernetes/manifests/README.md) | [CodeTrans with Helm Charts](https://github.com/opea-project/GenAIInfra/tree/main/helm-charts/codetrans/README.md) |
-| DocSum      | [Xeon Instructions](DocSum/docker_compose/intel/cpu/xeon/README.md)      | [Gaudi Instructions](DocSum/docker_compose/intel/hpu/gaudi/README.md)      | [DocSum with GMC](DocSum/kubernetes/README.md)           | [DocSum with Manifests](DocSum/kubernetes/manifests/README.md)       | [DocSum with Helm Charts](https://github.com/opea-project/GenAIInfra/tree/main/helm-charts/docsum/README.md)       |
-| SearchQnA   | [Xeon Instructions](SearchQnA/docker_compose/intel/cpu/xeon/README.md)   | [Gaudi Instructions](SearchQnA/docker_compose/intel/hpu/gaudi/README.md)   | [SearchQnA with GMC](SearchQnA/kubernetes/README.md)     | Not Supported                                                        | Not Supported                                                                                                      |
-| FaqGen      | [Xeon Instructions](FaqGen/docker_compose/intel/cpu/xeon/README.md)      | [Gaudi Instructions](FaqGen/docker_compose/intel/hpu/gaudi/README.md)      | [FaqGen with GMC](FaqGen/kubernetes/README.md)           | [FaqGen with Manifests](FaqGen/kubernetes/manifests/README.md)       | Not Supported                                                                                                      |
-| Translation | [Xeon Instructions](Translation/docker_compose/intel/cpu/xeon/README.md) | [Gaudi Instructions](Translation/docker_compose/intel/hpu/gaudi/README.md) | [Translation with GMC](Translation/kubernetes/README.md) | Not Supported                                                        | Not Supported                                                                                                      |
-| AudioQnA    | [Xeon Instructions](AudioQnA/docker_compose/intel/cpu/xeon/README.md)    | [Gaudi Instructions](AudioQnA/docker_compose/intel/hpu/gaudi/README.md)    | [AudioQnA with GMC](AudioQnA/kubernetes/README.md)       | [AudioQnA with Manifests](AudioQnA/kubernetes/manifests/README.md)   | Not Supported                                                                                                      |
-| VisualQnA   | [Xeon Instructions](VisualQnA/docker_compose/intel/cpu/xeon/README.md)   | [Gaudi Instructions](VisualQnA/docker_compose/intel/hpu/gaudi/README.md)   | [VisualQnA with GMC](VisualQnA/kubernetes/README.md)     | [VisualQnA with Manifests](VisualQnA/kubernetes/manifests/README.md) | Not Supported                                                                                                      |
+| Use Case    | Docker Compose<br/>Deployment on Xeon                                    | Docker Compose<br/>Deployment on Gaudi                                     | Kubernetes with GMC                                                | Kubernetes with Manifests                                        | Kubernetes with Helm Charts                                                                                        |
+| ----------- | ------------------------------------------------------------------------ | -------------------------------------------------------------------------- | ------------------------------------------------------------------ | ---------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------ |
+| ChatQnA     | [Xeon Instructions](ChatQnA/docker_compose/intel/cpu/xeon/README.md)     | [Gaudi Instructions](ChatQnA/docker_compose/intel/hpu/gaudi/README.md)     | [ChatQnA with GMC](ChatQnA/kubernetes/intel/README_gmc.md)         | [ChatQnA with Manifests](ChatQnA/kubernetes/intel/README.md)     | [ChatQnA with Helm Charts](https://github.com/opea-project/GenAIInfra/tree/main/helm-charts/chatqna/README.md)     |
+| CodeGen     | [Xeon Instructions](CodeGen/docker_compose/intel/cpu/xeon/README.md)     | [Gaudi Instructions](CodeGen/docker_compose/intel/hpu/gaudi/README.md)     | [CodeGen with GMC](CodeGen/kubernetes/intel/README_gmc.md)         | [CodeGen with Manifests](CodeGen/kubernetes/intel/README.md)     | [CodeGen with Helm Charts](https://github.com/opea-project/GenAIInfra/tree/main/helm-charts/codegen/README.md)     |
+| CodeTrans   | [Xeon Instructions](CodeTrans/docker_compose/intel/cpu/xeon/README.md)   | [Gaudi Instructions](CodeTrans/docker_compose/intel/hpu/gaudi/README.md)   | [CodeTrans with GMC](CodeTrans/kubernetes/intel/README_gmc.md)     | [CodeTrans with Manifests](CodeTrans/kubernetes/intel/README.md) | [CodeTrans with Helm Charts](https://github.com/opea-project/GenAIInfra/tree/main/helm-charts/codetrans/README.md) |
+| DocSum      | [Xeon Instructions](DocSum/docker_compose/intel/cpu/xeon/README.md)      | [Gaudi Instructions](DocSum/docker_compose/intel/hpu/gaudi/README.md)      | [DocSum with GMC](DocSum/kubernetes/intel/README_gmc.md)           | [DocSum with Manifests](DocSum/kubernetes/intel/README.md)       | [DocSum with Helm Charts](https://github.com/opea-project/GenAIInfra/tree/main/helm-charts/docsum/README.md)       |
+| SearchQnA   | [Xeon Instructions](SearchQnA/docker_compose/intel/cpu/xeon/README.md)   | [Gaudi Instructions](SearchQnA/docker_compose/intel/hpu/gaudi/README.md)   | [SearchQnA with GMC](SearchQnA/kubernetes/intel/README_gmc.md)     | Not Supported                                                    | Not Supported                                                                                                      |
+| FaqGen      | [Xeon Instructions](FaqGen/docker_compose/intel/cpu/xeon/README.md)      | [Gaudi Instructions](FaqGen/docker_compose/intel/hpu/gaudi/README.md)      | [FaqGen with GMC](FaqGen/kubernetes/intel/README_gmc.md)           | [FaqGen with Manifests](FaqGen/kubernetes/intel/README.md)       | Not Supported                                                                                                      |
+| Translation | [Xeon Instructions](Translation/docker_compose/intel/cpu/xeon/README.md) | [Gaudi Instructions](Translation/docker_compose/intel/hpu/gaudi/README.md) | [Translation with GMC](Translation/kubernetes/intel/README_gmc.md) | Not Supported                                                    | Not Supported                                                                                                      |
+| AudioQnA    | [Xeon Instructions](AudioQnA/docker_compose/intel/cpu/xeon/README.md)    | [Gaudi Instructions](AudioQnA/docker_compose/intel/hpu/gaudi/README.md)    | [AudioQnA with GMC](AudioQnA/kubernetes/intel/README_gmc.md)       | [AudioQnA with Manifests](AudioQnA/kubernetes/intel/README.md)   | Not Supported                                                                                                      |
+| VisualQnA   | [Xeon Instructions](VisualQnA/docker_compose/intel/cpu/xeon/README.md)   | [Gaudi Instructions](VisualQnA/docker_compose/intel/hpu/gaudi/README.md)   | [VisualQnA with GMC](VisualQnA/kubernetes/intel/README_gmc.md)     | [VisualQnA with Manifests](VisualQnA/kubernetes/intel/README.md) | Not Supported                                                                                                      |
 
 ## Supported Examples