diff --git a/manifests/horizon.pp b/manifests/horizon.pp
index c5746ca85..b3e9c647c 100644
--- a/manifests/horizon.pp
+++ b/manifests/horizon.pp
@@ -27,26 +27,10 @@ class openstack_integration::horizon (
   include openstack_integration::params
 
   if $::openstack_integration::config::ssl {
-    file { '/etc/openstack-dashboard/ssl':
-      ensure                  => directory,
-      owner                   => 'root',
-      mode                    => '0755',
-      selinux_ignore_defaults => true,
-      require                 => Package['horizon'],
-    }
-    file { '/etc/openstack-dashboard/ssl/private':
-      ensure                  => directory,
-      owner                   => 'root',
-      mode                    => '0755',
-      selinux_ignore_defaults => true,
-      require                 => File['/etc/openstack-dashboard/ssl'],
-      before                  => File["/etc/openstack-dashboard/ssl/private/${facts['networking']['fqdn']}.pem"],
-    }
-    openstack_integration::ssl_key { 'horizon':
-      key_path  => "/etc/openstack-dashboard/ssl/private/${facts['networking']['fqdn']}.pem",
+    openstack_integration::ssl_key { 'openstack-dashboard':
       key_owner => 'root',
-      require   => File['/etc/openstack-dashboard/ssl/private'],
       notify    => Service['httpd'],
+      require   => Anchor['horizon::install::end'],
     }
     Exec['update-ca-certificates'] ~> Service['httpd']
   }
diff --git a/manifests/ssl_key.pp b/manifests/ssl_key.pp
index 31cad59e5..1091e1558 100644
--- a/manifests/ssl_key.pp
+++ b/manifests/ssl_key.pp
@@ -26,13 +26,13 @@ define openstack_integration::ssl_key(
   if $key_path == undef {
     file { "/etc/${name}/ssl":
       ensure                  => directory,
-      owner                   => $name,
+      owner                   => $key_owner,
       mode                    => '0775',
       selinux_ignore_defaults => true,
     }
     file { "/etc/${name}/ssl/private":
       ensure                  => directory,
-      owner                   => $name,
+      owner                   => $key_owner,
       mode                    => '0755',
       require                 => File["/etc/${name}/ssl"],
       selinux_ignore_defaults => true,