diff --git a/roles/cephadm/tasks/pkg_debian.yml b/roles/cephadm/tasks/pkg_debian.yml
index c75291f..d5aa674 100644
--- a/roles/cephadm/tasks/pkg_debian.yml
+++ b/roles/cephadm/tasks/pkg_debian.yml
@@ -30,7 +30,9 @@
   apt_repository:
     repo: "deb [signed-by={{ cephadm_apt_key_path }}] https://download.ceph.com/debian-{{ item }}/ {{ cephadm_apt_repo_dist }} main"
     state: "{{ 'present' if item == cephadm_ceph_release else 'absent' }}"
-  when: not cephadm_custom_repos | bool
+# there are not yet official repos for Ubuntu 22.04 so we use canonical repo
+# see https://docs.ceph.com/en/latest/cephadm/install/#cephadm-install-distros
+  when: not cephadm_custom_repos | bool and item != "quincy"
   become: true
   loop: "{{ cephadm_ceph_releases }}"
 
diff --git a/roles/cephadm/templates/cluster.yml.j2 b/roles/cephadm/templates/cluster.yml.j2
index e656ddd..475dac0 100644
--- a/roles/cephadm/templates/cluster.yml.j2
+++ b/roles/cephadm/templates/cluster.yml.j2
@@ -54,6 +54,7 @@ spec:
   {{ service.spec | to_nice_yaml }}
 {% endif %}
 {% endfor %}
+{% endif %}
 {% if groups.get('ingress', []) | length > 0 %}
 {% for service in cephadm_ingress_services %}
 ---