diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index be83ea7e2becaa1cd6552061971d21f4a4fca0ed..39e999c93c0e7915ed07f13a0f589112db2dbb0e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,18 +4,18 @@ image: busybox:latest
 
 variables:
   TF_ROOT_ELASTIC: ${CI_PROJECT_DIR}/manifests/elastic
-  TF_ROOT_MAGENTO: ${CI_PROJECT_DIR}/manifests/magento
+  TF_ROOT_GKE: ${CI_PROJECT_DIR}/manifests/gke
   GCLOUD_ROOT_PSC: ${CI_PROJECT_DIR}/manifests/psc
 
 cache:
   - key: elastic
     paths:
       - ${TF_ROOT_ELASTIC}/.terraform
-  - key: magento
+  - key: gke
     paths:
-      - ${TF_ROOT_MAGENTO}/.terraform
+      - ${TF_ROOT_GKE}/.terraform
 
-check-magento:
+check-gke:
   stage: test
   tags:
     - docker
@@ -23,7 +23,7 @@ check-magento:
     name: registry.gitlab.com/gitlab-org/terraform-images/stable:latest
     entrypoint: [""]
   variables:
-    TF_ADDRESS: ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/terraform/state/magento
+    TF_ADDRESS: ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/terraform/state/gke
     TF_VAR_ec_apikey: $EC_API_KEY
     TF_VAR_project_id: $GCP_PROJECT_ID
     TF_VAR_region: $GCP_REGION
@@ -31,7 +31,7 @@ check-magento:
     TF_VAR_vpc_subnetwork_name: $GCP_SUBNETWORK_NAME
     GCP_SA_GITLAB: $GCP_SA_GITLAB
   script: |-
-    cd $TF_ROOT_MAGENTO
+    cd $TF_ROOT_GKE
     echo $GCP_SA_GITLAB > gcp-sa.json
     gitlab-terraform init 
     gitlab-terraform validate
@@ -41,21 +41,21 @@ check-magento:
   artifacts:
     name: plan
     paths:
-      - ${TF_ROOT_MAGENTO}/plan.cache
+      - ${TF_ROOT_GKE}/plan.cache
     reports:
-      terraform: ${TF_ROOT_MAGENTO}/plan.json
+      terraform: ${TF_ROOT_GKE}/plan.json
 
-apply-magento:
+apply-gke:
   stage: deploy
   needs:
-    - check-magento
+    - check-gke
   tags:
     - docker
   image:
     name: registry.gitlab.com/gitlab-org/terraform-images/stable:latest
     entrypoint: [""]
   variables:
-    TF_ADDRESS: ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/terraform/state/magento
+    TF_ADDRESS: ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/terraform/state/gke
     TF_VAR_ec_apikey: $EC_API_KEY
     TF_VAR_project_id: $GCP_PROJECT_ID
     TF_VAR_region: $GCP_REGION
@@ -63,7 +63,7 @@ apply-magento:
     TF_VAR_vpc_subnetwork_name: $GCP_SUBNETWORK_NAME
     GCP_SA_GITLAB: $GCP_SA_GITLAB
   script: |-
-    cd $TF_ROOT_MAGENTO
+    cd $TF_ROOT_GKE
     echo $GCP_SA_GITLAB > gcp-sa.json
     gitlab-terraform init 
     gitlab-terraform apply -auto-approve
@@ -71,7 +71,7 @@ apply-magento:
 gcloud-psc:
   stage: deploy
   needs:
-    - apply-magento
+    - apply-gke
   tags:
     - docker
   image:
@@ -85,7 +85,7 @@ gcloud-psc:
     GCP_SUBNETWORK_NAME: $GCP_SUBNETWORK_NAME
     GCP_INTERNAL_IP_NAME: $GCP_INTERNAL_IP_NAME
     GCP_PSC_NAME: $GCP_PSC_NAME
-    GCP_DNS_ZONE_MAGENTO_ELASTIC: $GCP_DNS_ZONE_MAGENTO_ELASTIC
+    GCP_DNS_ZONE_GKE_ELASTIC: $GCP_DNS_ZONE_GKE_ELASTIC
     ELASTIC_SERVICE_ATTACHMENT_URI: $ELASTIC_SERVICE_ATTACHMENT_URI
     ELASTIC_DNS_ZONE: $ELASTIC_DNS_ZONE
   script: |-
@@ -145,3 +145,4 @@ apply-elastic:
     cd $TF_ROOT_ELASTIC
     gitlab-terraform init 
     gitlab-terraform apply -auto-approve
+ 
\ No newline at end of file
diff --git a/manifests/magento/main.tf b/manifests/gke/main.tf
similarity index 99%
rename from manifests/magento/main.tf
rename to manifests/gke/main.tf
index a2af80e4e39f23138b872e9b9bb6fa1b7cd13599..0ec6386515d35a16f7515b75e61f3902a89cdf5a 100644
--- a/manifests/magento/main.tf
+++ b/manifests/gke/main.tf
@@ -25,7 +25,7 @@ data "google_project" "project" {
 resource "google_compute_global_address" "static_ip" {
   provider = google
   project  = var.project_id
-  name     = "magento-frontend"
+  name     = "gke-frontend"
 }
 
 ### Create Network
diff --git a/manifests/magento/outputs.tf b/manifests/gke/outputs.tf
similarity index 100%
rename from manifests/magento/outputs.tf
rename to manifests/gke/outputs.tf
diff --git a/manifests/magento/variables.tf b/manifests/gke/variables.tf
similarity index 85%
rename from manifests/magento/variables.tf
rename to manifests/gke/variables.tf
index b9aff63704b46c9f7744bbea74362f1e41ab6490..a55988b3002f39bd963419b1535c50c526b3ad81 100644
--- a/manifests/magento/variables.tf
+++ b/manifests/gke/variables.tf
@@ -15,7 +15,7 @@ variable "vpc_subnetwork_name" {
 }
 variable "vpc_private_ip_address_name" {
   type    = string
-  default = "vpc-private-ip-magento"
+  default = "vpc-private-ip-gke"
 }
 
 ### Firewall
@@ -45,21 +45,21 @@ variable "cloud_nat_name" {
 ### Kubernetes Cluster & Node Pool
 variable "cluster_name" {
   type    = string
-  default = "gke-magento"
+  default = "gke-gke"
 }
 variable "node_pool_name" {
   type    = string
-  default = "gke-preemptible-nodes-magento"
+  default = "gke-preemptible-nodes-gke"
 }
 
 ### Cloud SQL
 variable "cloud_sql_name" {
   type    = string
-  default = "cloudsql-magento"
+  default = "cloudsql-gke"
 }
 
 ### Memory Store
 variable "memory_store_name" {
   type    = string
-  default = "cloudsql-magento"
+  default = "cloudsql-gke"
 }
\ No newline at end of file