diff --git a/tasks/ceilometer_db_setup.yml b/tasks/ceilometer_db_setup.yml
index 3e274462..96aa71cb 100644
--- a/tasks/ceilometer_db_setup.yml
+++ b/tasks/ceilometer_db_setup.yml
@@ -25,4 +25,4 @@
   changed_when: false
   when:
     - gnocchi_resource_file.stat.exists
-    - ceilometer_gnocchi_enabled
+    - ceilometer_gnocchi_enabled | bool
diff --git a/vars/debian.yml b/vars/debian.yml
index b8bd2158..85e81a70 100644
--- a/vars/debian.yml
+++ b/vars/debian.yml
@@ -30,6 +30,7 @@ ceilometer_devel_distro_packages:
 
 ceilometer_service_distro_packages:
   - python3-ceilometer
+  - "{{ (ceilometer_gnocchi_enabled | bool) | ternary('python3-gnocchiclient', '') }}"
   - python-systemd
   - python3-systemd