diff --git a/manifests/image/api.pp b/manifests/image/api.pp
index eadef089..21d93e47 100644
--- a/manifests/image/api.pp
+++ b/manifests/image/api.pp
@@ -131,8 +131,7 @@ class cloud::image::api(
   #   rabbit_host     => $rabbit_host,
   # }
   glance_api_config {
-    # TODO(EmilienM) Will be deprecated in Icehouse for notification_driver.
-    'DEFAULT/notifier_strategy': value => 'noop';
+    'DEFAULT/notifier_driver': value => 'noop';
   }
 
   class { 'glance::backend::rbd':
diff --git a/spec/classes/cloud_image_spec.rb b/spec/classes/cloud_image_spec.rb
index 0c3b06ea..9070283f 100644
--- a/spec/classes/cloud_image_spec.rb
+++ b/spec/classes/cloud_image_spec.rb
@@ -92,7 +92,7 @@ describe 'cloud::image' do
     #       :rabbit_host     => '10.0.0.1'
     #     )
     # end
-    it { should contain_glance_api_config('DEFAULT/notifier_strategy').with_value('noop') }
+    it { should contain_glance_api_config('DEFAULT/notifier_driver').with_value('noop') }
 
     it 'configure glance rbd backend' do
       should contain_class('glance::backend::rbd').with(