diff --git a/environments/services-docker/undercloud-gnocchi.yaml b/environments/services-docker/undercloud-gnocchi.yaml
index 6d5f86cec4..bf7f2a9dc9 100644
--- a/environments/services-docker/undercloud-gnocchi.yaml
+++ b/environments/services-docker/undercloud-gnocchi.yaml
@@ -2,4 +2,4 @@ resource_registry:
   OS::TripleO::Services::UndercloudGnocchiApi: ../../docker/services/gnocchi-api.yaml
   OS::TripleO::Services::UndercloudGnocchiMetricd: ../../docker/services/gnocchi-metricd.yaml
   OS::TripleO::Services::UndercloudGnocchiStatsd: ../../docker/services/gnocchi-statsd.yaml
-  OS::TripleO::Services::Redis: ../../docker/services/database/redis.yaml
+  OS::TripleO::Services::UndercloudRedis: ../../docker/services/database/redis.yaml
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index b19c42830e..9d8e611471 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -235,6 +235,8 @@ resource_registry:
   OS::TripleO::Services::UndercloudGnocchiApi: OS::Heat::None
   OS::TripleO::Services::UndercloudGnocchiMetricd: OS::Heat::None
   OS::TripleO::Services::UndercloudGnocchiStatsd: OS::Heat::None
+  # Redis
+  OS::TripleO::Services::UndercloudRedis: OS::Heat::None
   # Services that are disabled by default (use relevant environment files):
   OS::TripleO::Services::Fluentd: OS::Heat::None
   OS::TripleO::Services::Ipsec: OS::Heat::None
diff --git a/roles/Undercloud.yaml b/roles/Undercloud.yaml
index 36f4d97112..2fd4b5de78 100644
--- a/roles/Undercloud.yaml
+++ b/roles/Undercloud.yaml
@@ -65,4 +65,5 @@
     - OS::TripleO::Services::UndercloudCinderApi
     - OS::TripleO::Services::UndercloudCinderScheduler
     - OS::TripleO::Services::UndercloudCinderVolume
+    - OS::TripleO::Services::UndercloudRedis
     - OS::TripleO::Services::Zaqar
diff --git a/roles_data_undercloud.yaml b/roles_data_undercloud.yaml
index 058e7ca64c..d01519d681 100644
--- a/roles_data_undercloud.yaml
+++ b/roles_data_undercloud.yaml
@@ -68,5 +68,6 @@
     - OS::TripleO::Services::UndercloudCinderApi
     - OS::TripleO::Services::UndercloudCinderScheduler
     - OS::TripleO::Services::UndercloudCinderVolume
+    - OS::TripleO::Services::UndercloudRedis
     - OS::TripleO::Services::Zaqar