diff --git a/manifests/image/image_controller.pp b/manifests/image.pp
similarity index 98%
rename from manifests/image/image_controller.pp
rename to manifests/image.pp
index 70d117dc..eb9ffca0 100644
--- a/manifests/image/image_controller.pp
+++ b/manifests/image.pp
@@ -16,7 +16,7 @@
 # Image controller
 #
 
-class os_image_controller(
+class privatecloud::image(
   $glance_db_user              = $os_params::glance_db_user,
   $glance_db_password          = $os_params::glance_db_password,
   $ks_keystone_internal_host   = $os_params::ks_keystone_internal_host,
diff --git a/site.pp b/site.pp
index 22019db6..f7e1c7a3 100644
--- a/site.pp
+++ b/site.pp
@@ -22,7 +22,6 @@ import 'params.pp'
 import 'manifests/*.pp'
 import 'manifests/compute/*.pp'
 import 'manifests/database/*.pp'
-import 'manifests/image/*.pp'
 import 'manifests/monitoring/*.pp'
 import 'manifests/network/*.pp'
 import 'manifests/object-storage/*.pp'
@@ -64,6 +63,9 @@ node 'os-ci-test13', 'os-ci-test12', 'os-ci-test11', /mgmt\d+.enovance.com/ inhe
 ## Compute:
     class {'privatecloud::compute::controller':}
 
+## Image:
+    class {'privatecloud::image':}
+
 ## Telemetry
     class {'os_telemetry_common':}
     class {'os_telemetry_server':}