diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70358fb8..4923ecdf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -270,7 +270,7 @@
 -   Remove duplicate environment variables (#96)
 -   Improve coverage (#94)
 -   Improve mongodb index (#93)
--   Fix nginx-orion templeate (#92)
+-   Fix nginx-orion template (#92)
 -   Improve Tokenproxy (#91)
 -   Fix comet depends\_on in docker-compose.yml (#90)
 -   Add authorization feature for IoT Agent over HTTP (#89)
diff --git a/lets-fiware.sh b/lets-fiware.sh
index 6b8686a8..b9af546c 100755
--- a/lets-fiware.sh
+++ b/lets-fiware.sh
@@ -399,7 +399,7 @@ set_and_check_values() {
 
   IDM_ADMIN_UID="admin"
 
-  TEMPLEATE=${SETUP_DIR}/templeate
+  TEMPLATE=${SETUP_DIR}/template
 
   set_default_values
 
@@ -485,7 +485,7 @@ NGINX_SITES=${NGINX_SITES}
 SETUP_DIR=${SETUP_DIR}
 WORK_DIR=${WORK_DIR}
 CONTRIB_DIR=${CONTRIB_DIR}
-TEMPLEATE=${TEMPLEATE}
+TEMPLATE=${TEMPLATE}
 
 LOG_DIR=${LOG_DIR}
 NGINX_LOG_DIR=${NGINX_LOG_DIR}
@@ -1140,12 +1140,12 @@ setup_cert() {
       if [ ! -d "${CERTBOT_DIR}"/"${val}" ]; then
         mkdir "${CERTBOT_DIR}"/"${val}"
       fi
-      sed -e "s/HOST/${val}/" "${TEMPLEATE}"/nginx/nginx-cert > "${NGINX_SITES}"/"${val}"
+      sed -e "s/HOST/${val}/" "${TEMPLATE}"/nginx/nginx-cert > "${NGINX_SITES}"/"${val}"
     fi 
   done
 
-  cp "${TEMPLEATE}"/docker/setup-cert.yml ./docker-cert.yml
-  cp "${TEMPLEATE}"/nginx/nginx.conf "${CONFIG_DIR}"/nginx/
+  cp "${TEMPLATE}"/docker/setup-cert.yml ./docker-cert.yml
+  cp "${TEMPLATE}"/nginx/nginx.conf "${CONFIG_DIR}"/nginx/
 
   ${DOCKER_COMPOSE} -f docker-cert.yml up -d
 
@@ -1272,7 +1272,7 @@ up_keyrock_mysql() {
   mkdir -p "${CONFIG_DIR}"/keyrock/certs/applications
   "${SUDO}" chown -R 1000:1000 "${CONFIG_DIR}"/keyrock/certs
 
-  cp -a "${TEMPLEATE}"/docker/setup-keyrock-mysql.yml ./docker-idm.yml
+  cp -a "${TEMPLATE}"/docker/setup-keyrock-mysql.yml ./docker-idm.yml
   add_to_docker_idm_yml "__KEYROCK_VOLUMES__" "     - ${CONFIG_DIR}/keyrock/certs/applications:/opt/fiware-idm/certs/applications"
 
   MYSQL_ROOT_PASSWORD=$(${DOCKER} run -t --rm "${IMAGE_PWGEN}" | sed -z 's/[\x0d\x0a]//g')
@@ -1374,14 +1374,14 @@ add_docker_compose_yml() {
   logging_info "${FUNCNAME[0]} $1"
 
   echo "" >> ${DOCKER_COMPOSE_YML}
-  sed -e '/^version:/,/services:/d' "${TEMPLEATE}"/docker/"$1" >> ${DOCKER_COMPOSE_YML}
+  sed -e '/^version:/,/services:/d' "${TEMPLATE}"/docker/"$1" >> ${DOCKER_COMPOSE_YML}
 }
 
 #
 # Create nginx conf
 #
 create_nginx_conf() {
-  sed -e "s/HOST/$1/" "${TEMPLEATE}/nginx/$2" > "${NGINX_SITES}/$1"
+  sed -e "s/HOST/$1/" "${TEMPLATE}/nginx/$2" > "${NGINX_SITES}/$1"
 }
 
 #
@@ -1524,9 +1524,9 @@ setup_nginx() {
   rm -fr "${NGINX_SITES}"
   mkdir -p "${NGINX_SITES}"
 
-  cp "${TEMPLEATE}"/docker/docker-nginx.yml "${DOCKER_COMPOSE_YML}"
+  cp "${TEMPLATE}"/docker/docker-nginx.yml "${DOCKER_COMPOSE_YML}"
 
-  cp "${TEMPLEATE}"/nginx/default_server "${NGINX_SITES}"
+  cp "${TEMPLATE}"/nginx/default_server "${NGINX_SITES}"
 
   create_dummy_cert
 
@@ -1702,7 +1702,7 @@ setup_wilma_basic_authorization() {
   local GE_NAME
   GE_NAME=${1^}
 
-  cp "${TEMPLEATE}"/docker/docker-wilma.yml "${WORK_DIR}"/
+  cp "${TEMPLATE}"/docker/docker-wilma.yml "${WORK_DIR}"/
 
   sed -i "s/{PEP_PROXY_/{${GE}_PEP_PROXY_/" "${WORK_DIR}"/docker-wilma.yml
   sed -i "s/{PEP_PASSWORD/{${GE}_PEP_PASSWORD/" "${WORK_DIR}"/docker-wilma.yml
@@ -1953,7 +1953,7 @@ EOF
   add_rsyslog_conf "orion"
 
   setup_mongo
-  cp "${TEMPLEATE}/mongo/orion.js" "${CONFIG_DIR}/mongo/mongo-init.js"
+  cp "${TEMPLATE}/mongo/orion.js" "${CONFIG_DIR}/mongo/mongo-init.js"
 
   setup_wilma "orion" "${ORION}"
 
@@ -2001,7 +2001,7 @@ setup_mintaka() {
 
   add_exposed_ports "${TIMESCALE_EXPOSE_PORT}" "__TIMESCALE_PORTS__" "5432"
 
-  sed -i "/__NGINX_ORION_LD__/r ${SETUP_DIR}/templeate/nginx/nginx-mintaka" "${NGINX_SITES}/${ORION_LD}"
+  sed -i "/__NGINX_ORION_LD__/r ${SETUP_DIR}/template/nginx/nginx-mintaka" "${NGINX_SITES}/${ORION_LD}"
 
   add_nginx_depends_on "mintaka"
 
@@ -2044,7 +2044,7 @@ setup_orion_ld() {
   add_rsyslog_conf "orion-ld"
 
   setup_mongo
-  cp "${TEMPLEATE}/mongo/orion-ld.js" "${CONFIG_DIR}/mongo/mongo-init.js"
+  cp "${TEMPLATE}/mongo/orion-ld.js" "${CONFIG_DIR}/mongo/mongo-init.js"
 
   setup_wilma "orion-ld" "${ORION_LD}"
 
@@ -2808,7 +2808,7 @@ create_openiot_mongo_index() {
     return
   fi
   OPENIOT_MONGO_INDEX=true
-  cat "${TEMPLEATE}/mongo/orion-openiot.js" >> "${CONFIG_DIR}/mongo/mongo-init.js"
+  cat "${TEMPLATE}/mongo/orion-openiot.js" >> "${CONFIG_DIR}/mongo/mongo-init.js"
 }
 
 #
@@ -2831,7 +2831,7 @@ setup_iotagent_ul() {
 
   setup_mongo
   create_openiot_mongo_index
-  cat "${TEMPLEATE}/mongo/iotagentul.js" >> "${CONFIG_DIR}/mongo/mongo-init.js"
+  cat "${TEMPLATE}/mongo/iotagentul.js" >> "${CONFIG_DIR}/mongo/mongo-init.js"
 
   cat <<EOF >> .env
 
@@ -2897,7 +2897,7 @@ setup_iotagent_json() {
 
   setup_mongo
   create_openiot_mongo_index
-  cat "${TEMPLEATE}/mongo/iotagentjson.js" >> "${CONFIG_DIR}/mongo/mongo-init.js"
+  cat "${TEMPLATE}/mongo/iotagentjson.js" >> "${CONFIG_DIR}/mongo/mongo-init.js"
 
   cat <<EOF >> .env
 
@@ -3127,7 +3127,7 @@ setup_node_red_multi_instance() {
   local node_red_yml
   local node_red_nginx
 
-  node_red_yaml="${TEMPLEATE}"/docker/docker-node-red.yml
+  node_red_yaml="${TEMPLATE}"/docker/docker-node-red.yml
 
   create_nginx_conf "${NODE_RED}" "nginx-node-red"
 
diff --git a/setup/templeate/docker/docker-comet.yml b/setup/template/docker/docker-comet.yml
similarity index 100%
rename from setup/templeate/docker/docker-comet.yml
rename to setup/template/docker/docker-comet.yml
diff --git a/setup/templeate/docker/docker-cygnus.yml b/setup/template/docker/docker-cygnus.yml
similarity index 100%
rename from setup/templeate/docker/docker-cygnus.yml
rename to setup/template/docker/docker-cygnus.yml
diff --git a/setup/templeate/docker/docker-draco.yml b/setup/template/docker/docker-draco.yml
similarity index 100%
rename from setup/templeate/docker/docker-draco.yml
rename to setup/template/docker/docker-draco.yml
diff --git a/setup/templeate/docker/docker-elasticsearch.yml b/setup/template/docker/docker-elasticsearch.yml
similarity index 100%
rename from setup/templeate/docker/docker-elasticsearch.yml
rename to setup/template/docker/docker-elasticsearch.yml
diff --git a/setup/templeate/docker/docker-grafana.yml b/setup/template/docker/docker-grafana.yml
similarity index 100%
rename from setup/templeate/docker/docker-grafana.yml
rename to setup/template/docker/docker-grafana.yml
diff --git a/setup/templeate/docker/docker-iotagent-json.yml b/setup/template/docker/docker-iotagent-json.yml
similarity index 100%
rename from setup/templeate/docker/docker-iotagent-json.yml
rename to setup/template/docker/docker-iotagent-json.yml
diff --git a/setup/templeate/docker/docker-iotagent-ul.yml b/setup/template/docker/docker-iotagent-ul.yml
similarity index 100%
rename from setup/templeate/docker/docker-iotagent-ul.yml
rename to setup/template/docker/docker-iotagent-ul.yml
diff --git a/setup/templeate/docker/docker-keyrock.yml b/setup/template/docker/docker-keyrock.yml
similarity index 100%
rename from setup/templeate/docker/docker-keyrock.yml
rename to setup/template/docker/docker-keyrock.yml
diff --git a/setup/templeate/docker/docker-mintaka.yml b/setup/template/docker/docker-mintaka.yml
similarity index 100%
rename from setup/templeate/docker/docker-mintaka.yml
rename to setup/template/docker/docker-mintaka.yml
diff --git a/setup/templeate/docker/docker-mongo.yml b/setup/template/docker/docker-mongo.yml
similarity index 100%
rename from setup/templeate/docker/docker-mongo.yml
rename to setup/template/docker/docker-mongo.yml
diff --git a/setup/templeate/docker/docker-mosquitto.yml b/setup/template/docker/docker-mosquitto.yml
similarity index 100%
rename from setup/templeate/docker/docker-mosquitto.yml
rename to setup/template/docker/docker-mosquitto.yml
diff --git a/setup/templeate/docker/docker-mysql.yml b/setup/template/docker/docker-mysql.yml
similarity index 100%
rename from setup/templeate/docker/docker-mysql.yml
rename to setup/template/docker/docker-mysql.yml
diff --git a/setup/templeate/docker/docker-nginx.yml b/setup/template/docker/docker-nginx.yml
similarity index 100%
rename from setup/templeate/docker/docker-nginx.yml
rename to setup/template/docker/docker-nginx.yml
diff --git a/setup/templeate/docker/docker-node-red.yml b/setup/template/docker/docker-node-red.yml
similarity index 100%
rename from setup/templeate/docker/docker-node-red.yml
rename to setup/template/docker/docker-node-red.yml
diff --git a/setup/templeate/docker/docker-orion-ld.yml b/setup/template/docker/docker-orion-ld.yml
similarity index 100%
rename from setup/templeate/docker/docker-orion-ld.yml
rename to setup/template/docker/docker-orion-ld.yml
diff --git a/setup/templeate/docker/docker-orion.yml b/setup/template/docker/docker-orion.yml
similarity index 100%
rename from setup/templeate/docker/docker-orion.yml
rename to setup/template/docker/docker-orion.yml
diff --git a/setup/templeate/docker/docker-perseo.yml b/setup/template/docker/docker-perseo.yml
similarity index 100%
rename from setup/templeate/docker/docker-perseo.yml
rename to setup/template/docker/docker-perseo.yml
diff --git a/setup/templeate/docker/docker-postfix.yml b/setup/template/docker/docker-postfix.yml
similarity index 100%
rename from setup/templeate/docker/docker-postfix.yml
rename to setup/template/docker/docker-postfix.yml
diff --git a/setup/templeate/docker/docker-postgres.yml b/setup/template/docker/docker-postgres.yml
similarity index 100%
rename from setup/templeate/docker/docker-postgres.yml
rename to setup/template/docker/docker-postgres.yml
diff --git a/setup/templeate/docker/docker-quantumleap.yml b/setup/template/docker/docker-quantumleap.yml
similarity index 100%
rename from setup/templeate/docker/docker-quantumleap.yml
rename to setup/template/docker/docker-quantumleap.yml
diff --git a/setup/templeate/docker/docker-queryproxy.yml b/setup/template/docker/docker-queryproxy.yml
similarity index 100%
rename from setup/templeate/docker/docker-queryproxy.yml
rename to setup/template/docker/docker-queryproxy.yml
diff --git a/setup/templeate/docker/docker-regproxy.yml b/setup/template/docker/docker-regproxy.yml
similarity index 100%
rename from setup/templeate/docker/docker-regproxy.yml
rename to setup/template/docker/docker-regproxy.yml
diff --git a/setup/templeate/docker/docker-tokenproxy.yml b/setup/template/docker/docker-tokenproxy.yml
similarity index 100%
rename from setup/templeate/docker/docker-tokenproxy.yml
rename to setup/template/docker/docker-tokenproxy.yml
diff --git a/setup/templeate/docker/docker-wilma.yml b/setup/template/docker/docker-wilma.yml
similarity index 100%
rename from setup/templeate/docker/docker-wilma.yml
rename to setup/template/docker/docker-wilma.yml
diff --git a/setup/templeate/docker/docker-wirecloud.yml b/setup/template/docker/docker-wirecloud.yml
similarity index 100%
rename from setup/templeate/docker/docker-wirecloud.yml
rename to setup/template/docker/docker-wirecloud.yml
diff --git a/setup/templeate/docker/docker-zeppelin.yml b/setup/template/docker/docker-zeppelin.yml
similarity index 100%
rename from setup/templeate/docker/docker-zeppelin.yml
rename to setup/template/docker/docker-zeppelin.yml
diff --git a/setup/templeate/docker/setup-cert.yml b/setup/template/docker/setup-cert.yml
similarity index 100%
rename from setup/templeate/docker/setup-cert.yml
rename to setup/template/docker/setup-cert.yml
diff --git a/setup/templeate/docker/setup-keyrock-mysql.yml b/setup/template/docker/setup-keyrock-mysql.yml
similarity index 100%
rename from setup/templeate/docker/setup-keyrock-mysql.yml
rename to setup/template/docker/setup-keyrock-mysql.yml
diff --git a/setup/templeate/mongo/iotagentjson.js b/setup/template/mongo/iotagentjson.js
similarity index 100%
rename from setup/templeate/mongo/iotagentjson.js
rename to setup/template/mongo/iotagentjson.js
diff --git a/setup/templeate/mongo/iotagentul.js b/setup/template/mongo/iotagentul.js
similarity index 100%
rename from setup/templeate/mongo/iotagentul.js
rename to setup/template/mongo/iotagentul.js
diff --git a/setup/templeate/mongo/orion-ld.js b/setup/template/mongo/orion-ld.js
similarity index 100%
rename from setup/templeate/mongo/orion-ld.js
rename to setup/template/mongo/orion-ld.js
diff --git a/setup/templeate/mongo/orion-openiot.js b/setup/template/mongo/orion-openiot.js
similarity index 100%
rename from setup/templeate/mongo/orion-openiot.js
rename to setup/template/mongo/orion-openiot.js
diff --git a/setup/templeate/mongo/orion.js b/setup/template/mongo/orion.js
similarity index 100%
rename from setup/templeate/mongo/orion.js
rename to setup/template/mongo/orion.js
diff --git a/setup/templeate/nginx/default_server b/setup/template/nginx/default_server
similarity index 100%
rename from setup/templeate/nginx/default_server
rename to setup/template/nginx/default_server
diff --git a/setup/templeate/nginx/nginx-cert b/setup/template/nginx/nginx-cert
similarity index 100%
rename from setup/templeate/nginx/nginx-cert
rename to setup/template/nginx/nginx-cert
diff --git a/setup/templeate/nginx/nginx-comet b/setup/template/nginx/nginx-comet
similarity index 100%
rename from setup/templeate/nginx/nginx-comet
rename to setup/template/nginx/nginx-comet
diff --git a/setup/templeate/nginx/nginx-cygnus b/setup/template/nginx/nginx-cygnus
similarity index 100%
rename from setup/templeate/nginx/nginx-cygnus
rename to setup/template/nginx/nginx-cygnus
diff --git a/setup/templeate/nginx/nginx-draco b/setup/template/nginx/nginx-draco
similarity index 100%
rename from setup/templeate/nginx/nginx-draco
rename to setup/template/nginx/nginx-draco
diff --git a/setup/templeate/nginx/nginx-elasticsearch b/setup/template/nginx/nginx-elasticsearch
similarity index 100%
rename from setup/templeate/nginx/nginx-elasticsearch
rename to setup/template/nginx/nginx-elasticsearch
diff --git a/setup/templeate/nginx/nginx-grafana b/setup/template/nginx/nginx-grafana
similarity index 100%
rename from setup/templeate/nginx/nginx-grafana
rename to setup/template/nginx/nginx-grafana
diff --git a/setup/templeate/nginx/nginx-iotagent-http b/setup/template/nginx/nginx-iotagent-http
similarity index 100%
rename from setup/templeate/nginx/nginx-iotagent-http
rename to setup/template/nginx/nginx-iotagent-http
diff --git a/setup/templeate/nginx/nginx-iotagent-json b/setup/template/nginx/nginx-iotagent-json
similarity index 100%
rename from setup/templeate/nginx/nginx-iotagent-json
rename to setup/template/nginx/nginx-iotagent-json
diff --git a/setup/templeate/nginx/nginx-iotagent-ul b/setup/template/nginx/nginx-iotagent-ul
similarity index 100%
rename from setup/templeate/nginx/nginx-iotagent-ul
rename to setup/template/nginx/nginx-iotagent-ul
diff --git a/setup/templeate/nginx/nginx-keyrock b/setup/template/nginx/nginx-keyrock
similarity index 100%
rename from setup/templeate/nginx/nginx-keyrock
rename to setup/template/nginx/nginx-keyrock
diff --git a/setup/templeate/nginx/nginx-mintaka b/setup/template/nginx/nginx-mintaka
similarity index 100%
rename from setup/templeate/nginx/nginx-mintaka
rename to setup/template/nginx/nginx-mintaka
diff --git a/setup/templeate/nginx/nginx-ngsiproxy b/setup/template/nginx/nginx-ngsiproxy
similarity index 100%
rename from setup/templeate/nginx/nginx-ngsiproxy
rename to setup/template/nginx/nginx-ngsiproxy
diff --git a/setup/templeate/nginx/nginx-node-red b/setup/template/nginx/nginx-node-red
similarity index 100%
rename from setup/templeate/nginx/nginx-node-red
rename to setup/template/nginx/nginx-node-red
diff --git a/setup/templeate/nginx/nginx-orion b/setup/template/nginx/nginx-orion
similarity index 100%
rename from setup/templeate/nginx/nginx-orion
rename to setup/template/nginx/nginx-orion
diff --git a/setup/templeate/nginx/nginx-orion-ld b/setup/template/nginx/nginx-orion-ld
similarity index 100%
rename from setup/templeate/nginx/nginx-orion-ld
rename to setup/template/nginx/nginx-orion-ld
diff --git a/setup/templeate/nginx/nginx-perseo b/setup/template/nginx/nginx-perseo
similarity index 100%
rename from setup/templeate/nginx/nginx-perseo
rename to setup/template/nginx/nginx-perseo
diff --git a/setup/templeate/nginx/nginx-quantumleap b/setup/template/nginx/nginx-quantumleap
similarity index 100%
rename from setup/templeate/nginx/nginx-quantumleap
rename to setup/template/nginx/nginx-quantumleap
diff --git a/setup/templeate/nginx/nginx-wirecloud b/setup/template/nginx/nginx-wirecloud
similarity index 100%
rename from setup/templeate/nginx/nginx-wirecloud
rename to setup/template/nginx/nginx-wirecloud
diff --git a/setup/templeate/nginx/nginx-zeppelin b/setup/template/nginx/nginx-zeppelin
similarity index 100%
rename from setup/templeate/nginx/nginx-zeppelin
rename to setup/template/nginx/nginx-zeppelin
diff --git a/setup/templeate/nginx/nginx.conf b/setup/template/nginx/nginx.conf
similarity index 100%
rename from setup/templeate/nginx/nginx.conf
rename to setup/template/nginx/nginx.conf
diff --git a/tests/script/lint-yamllint.sh b/tests/script/lint-yamllint.sh
index f4a36b7f..d78ff5cb 100755
--- a/tests/script/lint-yamllint.sh
+++ b/tests/script/lint-yamllint.sh
@@ -31,4 +31,4 @@ set -ue
 cd "$(dirname "$0")"
 cd ../..
 
-yamllint setup/templeate/docker/
+yamllint setup/template/docker/