diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 39e999c93c0e7915ed07f13a0f589112db2dbb0e..c8080bdadaec4ba33f90918c78531b8f63729e93 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -86,8 +86,8 @@ gcloud-psc:
     GCP_INTERNAL_IP_NAME: $GCP_INTERNAL_IP_NAME
     GCP_PSC_NAME: $GCP_PSC_NAME
     GCP_DNS_ZONE_GKE_ELASTIC: $GCP_DNS_ZONE_GKE_ELASTIC
-    ELASTIC_SERVICE_ATTACHMENT_URI: $ELASTIC_SERVICE_ATTACHMENT_URI
-    ELASTIC_DNS_ZONE: $ELASTIC_DNS_ZONE
+    EC_SERVICE_ATTACHMENT_URI: $EC_SERVICE_ATTACHMENT_URI
+    EC_DNS_ZONE: $EC_DNS_ZONE
   script: |-
     echo $GCP_SA_GITLAB > gcp-sa.json
     gcloud auth activate-service-account --key-file gcp-sa.json
diff --git a/manifests/psc/setting-psc.sh b/manifests/psc/setting-psc.sh
index 0314a0179cf9ccf020e6720ea467f31861ba1e98..b3fa8ab35679e25e9c647b03c56e88d5c6b762da 100644
--- a/manifests/psc/setting-psc.sh
+++ b/manifests/psc/setting-psc.sh
@@ -23,7 +23,7 @@ FORWARDING_RULE_ACCEPTED=$(gcloud compute forwarding-rules describe $GCP_PSC_NAM
 if [[ $FORWARDING_RULE_ACCEPTED == "ACCEPTED" ]]; then
   echo 'FORWARDING_RULE_ACCEPTED'
 else
-  gcloud compute forwarding-rules create $GCP_PSC_NAME --region=$GCP_REGION --network=$GCP_NETWORK_NAME --address=$GCP_INTERNAL_IP_NAME --target-service-attachment=$ELASTIC_SERVICE_ATTACHMENT_URI
+  gcloud compute forwarding-rules create $GCP_PSC_NAME --region=$GCP_REGION --network=$GCP_NETWORK_NAME --address=$GCP_INTERNAL_IP_NAME --target-service-attachment=$EC_SERVICE_ATTACHMENT_URI
 fi
 
 
@@ -33,9 +33,9 @@ DNS_ZONE_CREATED=$?
 if [[ $DNS_ZONE_CREATED == 0 ]]; then
   echo 'DNS_ZONE_CREATED'
 else
-  gcloud dns managed-zones create $GCP_DNS_ZONE_MAGENTO_ELASTIC --description="Managed by GitLab CI" --dns-name=$ELASTIC_DNS_ZONE. --visibility=private --networks=$GCP_NETWORK_NAME
+  gcloud dns managed-zones create $GCP_DNS_ZONE_MAGENTO_ELASTIC --description="Managed by GitLab CI" --dns-name=$EC_DNS_ZONE. --visibility=private --networks=$GCP_NETWORK_NAME
   gcloud dns record-sets transaction start --zone="$GCP_DNS_ZONE_MAGENTO_ELASTIC"
-  gcloud dns record-sets transaction add $(gcloud compute addresses describe $GCP_INTERNAL_IP_NAME --region=$GCP_REGION --format="get(address)") --name="*.$ELASTIC_DNS_ZONE." --ttl="30" --type="A" --zone="$GCP_DNS_ZONE_MAGENTO_ELASTIC"
+  gcloud dns record-sets transaction add $(gcloud compute addresses describe $GCP_INTERNAL_IP_NAME --region=$GCP_REGION --format="get(address)") --name="*.$EC_DNS_ZONE." --ttl="30" --type="A" --zone="$GCP_DNS_ZONE_MAGENTO_ELASTIC"
   gcloud dns record-sets transaction execute --zone="$GCP_DNS_ZONE_MAGENTO_ELASTIC"
 fi