diff --git a/attributes/default.rb b/attributes/default.rb
index 98b189f..d2fc373 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -98,8 +98,7 @@ when 'rhel' # :pragma-foodcritic: ~FC024 - won't fix this
   default['openstack']['image']['user'] = 'glance'
   default['openstack']['image']['group'] = 'glance'
   default['openstack']['image']['platform'] = {
-    'image_packages' => %w(openstack-glance cronie python-glanceclient),
-    'image_client_packages' => ['python-glanceclient'],
+    'image_packages' => %w(openstack-glance cronie),
     'ceph_packages' => ['python-ceph'],
     'swift_packages' => ['openstack-swift'],
     'image_api_service' => 'openstack-glance-api',
@@ -111,8 +110,7 @@ when 'suse'
   default['openstack']['image']['user'] = 'openstack-glance'
   default['openstack']['image']['group'] = 'openstack-glance'
   default['openstack']['image']['platform'] = {
-    'image_packages' => ['openstack-glance', 'python-glanceclient'],
-    'image_client_packages' => ['python-glanceclient'],
+    'image_packages' => ['openstack-glance'],
     'ceph_packages' => [],
     'swift_packages' => ['openstack-swift'],
     'image_api_service' => 'openstack-glance-api',
@@ -125,7 +123,6 @@ when 'debian'
   default['openstack']['image']['group'] = 'glance'
   default['openstack']['image']['platform'] = {
     'image_packages' => ['glance'],
-    'image_client_packages' => ['python-glanceclient'],
     'ceph_packages' => ['python-ceph'],
     'swift_packages' => ['python-swift'],
     'image_api_service' => 'glance-api',
diff --git a/recipes/api.rb b/recipes/api.rb
index aafa49c..ad99d33 100644
--- a/recipes/api.rb
+++ b/recipes/api.rb
@@ -25,7 +25,7 @@ class ::Chef::Recipe
   include ::Openstack
 end
 
-include_recipe 'openstack-identity::client'
+include_recipe 'openstack-common::client'
 
 if node['openstack']['image']['syslog']['use']
   include_recipe 'openstack-common::logging'
diff --git a/recipes/client.rb b/recipes/client.rb
deleted file mode 100644
index 7d6ea3d..0000000
--- a/recipes/client.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-# encoding: UTF-8
-#
-# Cookbook Name:: openstack-image
-# Recipe:: client
-#
-# Copyright 2014, IBM Corp.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-class ::Chef::Recipe
-  include ::Openstack
-end
-
-platform_options = node['openstack']['image']['platform']
-platform_options['image_client_packages'].each do |pkg|
-  package pkg do
-    options platform_options['package_overrides']
-    action :upgrade
-  end
-end
diff --git a/recipes/image_upload.rb b/recipes/image_upload.rb
index 787234a..af9b683 100644
--- a/recipes/image_upload.rb
+++ b/recipes/image_upload.rb
@@ -26,15 +26,9 @@ if node['openstack']['image']['syslog']['use']
   include_recipe 'openstack-common::logging'
 end
 
-platform_options = node['openstack']['image']['platform']
-platform_options['image_client_packages'].each do |pkg|
-  package pkg do
-    action :upgrade
-  end
-end
+include_recipe 'openstack-common::client'
 
 package 'curl' do
-  options platform_options['package_overrides']
   action :upgrade
 end
 
diff --git a/recipes/registry.rb b/recipes/registry.rb
index de2758d..c21a892 100644
--- a/recipes/registry.rb
+++ b/recipes/registry.rb
@@ -30,11 +30,6 @@ end
 
 platform_options = node['openstack']['image']['platform']
 
-package 'python-keystoneclient' do
-  options platform_options['package_overrides']
-  action :upgrade
-end
-
 db_user = node['openstack']['db']['image']['username']
 db_pass = get_password 'db', 'glance'
 node.default['openstack']['image_registry']['conf_secrets']
diff --git a/spec/api-redhat_spec.rb b/spec/api-redhat_spec.rb
index 755a7b6..938cc10 100644
--- a/spec/api-redhat_spec.rb
+++ b/spec/api-redhat_spec.rb
@@ -11,8 +11,8 @@ describe 'openstack-image::api' do
 
     include_context 'image-stubs'
 
-    it 'does upgrade keystoneclient package' do
-      expect(chef_run).to upgrade_package('python-keystoneclient')
+    it 'does not upgrade keystoneclient package' do
+      expect(chef_run).not_to upgrade_package('python-keystoneclient')
     end
 
     it 'does not upgrade swift packages by default' do
diff --git a/spec/api_spec.rb b/spec/api_spec.rb
index 4bfa5ba..8fe45b2 100644
--- a/spec/api_spec.rb
+++ b/spec/api_spec.rb
@@ -12,7 +12,7 @@ describe 'openstack-image::api' do
     include_context 'image-stubs'
 
     it do
-      expect(chef_run).to include_recipe('openstack-identity::client')
+      expect(chef_run).to include_recipe('openstack-common::client')
     end
 
     it do
diff --git a/spec/client-redhat_spec.rb b/spec/client-redhat_spec.rb
deleted file mode 100644
index e0873e9..0000000
--- a/spec/client-redhat_spec.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# encoding: UTF-8
-require_relative 'spec_helper'
-
-describe 'openstack-image::client' do
-  describe 'redhat' do
-    let(:runner) { ChefSpec::SoloRunner.new(REDHAT_OPTS) }
-    let(:node) { runner.node }
-    let(:chef_run) do
-      runner.converge(described_recipe)
-    end
-
-    it 'upgrades python glance client package' do
-      expect(chef_run).to upgrade_package('python-glanceclient')
-    end
-  end
-end
diff --git a/spec/client_spec.rb b/spec/client_spec.rb
deleted file mode 100644
index a3596c8..0000000
--- a/spec/client_spec.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# encoding: UTF-8
-require_relative 'spec_helper'
-
-describe 'openstack-image::client' do
-  describe 'ubuntu' do
-    let(:runner) { ChefSpec::SoloRunner.new(UBUNTU_OPTS) }
-    let(:node) { runner.node }
-    let(:chef_run) do
-      runner.converge(described_recipe)
-    end
-
-    it 'upgrades python glance client package' do
-      expect(chef_run).to upgrade_package('python-glanceclient')
-    end
-  end
-end
diff --git a/spec/registry-redhat_spec.rb b/spec/registry-redhat_spec.rb
index 5902333..5fb73f0 100644
--- a/spec/registry-redhat_spec.rb
+++ b/spec/registry-redhat_spec.rb
@@ -17,8 +17,8 @@ describe 'openstack-image::registry' do
       expect { chef_run }.to_not raise_error
     end
 
-    it 'does upgrades keystoneclient package' do
-      expect(chef_run).to upgrade_package('python-keystoneclient')
+    it 'does not upgrade keystoneclient package' do
+      expect(chef_run).not_to upgrade_package('python-keystoneclient')
     end
 
     it 'upgrades mysql python package' do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 1014e27..944e07d 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -79,10 +79,6 @@ shared_examples 'common-logging-recipe' do
 end
 
 shared_examples 'common-packages' do
-  it 'upgrades python-keystoneclient package' do
-    expect(chef_run).to upgrade_package 'python-keystoneclient'
-  end
-
   it 'upgrades curl package' do
     expect(chef_run).to upgrade_package 'curl'
   end