diff --git a/mongo/mongo.tf b/mongo/mongo.tf
index dcbcc2f..6fb9803 100644
--- a/mongo/mongo.tf
+++ b/mongo/mongo.tf
@@ -3,7 +3,7 @@ locals {
   mongo-password = data.kubernetes_secret_v1.prj_mongo_secret.data["password"]
   username = var.username==""?var.component==""?var.instance:var.component:var.username
   db_name = var.db_name==""?var.component==""?var.instance:var.component:var.db_name
-  mongo-labels = merge(local.labels, {
+  mongo-labels = merge(var.labels, {
     "app.kubernetes.io/component" = "mongo"
   })
 }
diff --git a/redis/outputs.tf b/redis/outputs.tf
index 27ea693..e151de7 100644
--- a/redis/outputs.tf
+++ b/redis/outputs.tf
@@ -1,6 +1,6 @@
 output "host" {
-  value = "${var.app_slug}-redis.${var.namespace}.svc"
+  value = "${local.app_slug}-redis.${var.namespace}.svc"
 }
 output "url" {
-  value = "redis://${var.app_slug}-redis.${var.namespace}.svc:6379"
+  value = "redis://${local.app_slug}-redis.${var.namespace}.svc:6379"
 }
diff --git a/redis/redis.tf b/redis/redis.tf
index 429a131..e29b69f 100644
--- a/redis/redis.tf
+++ b/redis/redis.tf
@@ -1,6 +1,6 @@
 locals {
   app_slug   = (var.component == var.instance || var.component=="") ? var.instance : format("%s-%s", var.component, var.instance)
-  redis-labels = merge(local.labels, {
+  redis-labels = merge(var.labels, {
     "app.kubernetes.io/component" = "redis"
   })
   cfg = merge({
diff --git a/service/outputs.tf b/service/outputs.tf
index 31b54c0..6cd0e72 100644
--- a/service/outputs.tf
+++ b/service/outputs.tf
@@ -1,9 +1,9 @@
 output "name" {
-  value = "${var.app_slug}"
+  value = "${local.app_slug}"
 }
 output "default_definition" {
   value = {
-    "name"  = "${var.app_slug}"
+    "name"  = "${local.app_slug}"
     "port" = {
       "number" = var.ports[0]
     }