diff --git a/update/ansible/playbook/tasks/roles/clickhouse/tasks/main.yml b/update/ansible/playbook/tasks/roles/clickhouse/tasks/main.yml
index ab927c62b5..858ef5dc4f 100644
--- a/update/ansible/playbook/tasks/roles/clickhouse/tasks/main.yml
+++ b/update/ansible/playbook/tasks/roles/clickhouse/tasks/main.yml
@@ -49,39 +49,15 @@
     owner: root
     group: pmm
 
-# RHEL9 dropped support for SHA1 gpg keys
-- name: Import clickhouse repo GPG key
-  when:
-    - ansible_distribution == "CentOS"
-    - ansible_distribution_major_version == "7"
-  rpm_key:
-    state: present
-    key: "https://repo.clickhouse.com/CLICKHOUSE-KEY.GPG"
-
-- name: Install clickhouse repo | EL7
-  when:
-    - ansible_distribution == "CentOS"
-    - ansible_distribution_major_version == "7"
-  yum_repository:
-    name: clickhouse
-    file: clickhouse
-    description: "Clickhouse repo"
-    baseurl: "https://packages.clickhouse.com/rpm/stable/"
-    enabled: no
-    gpgcheck: 1
-    gpgkey: "https://repo.clickhouse.com/CLICKHOUSE-KEY.GPG"
-
-# RHEL9 dropped support for SHA1 gpg keys, so we disable gpgcheck :(
-- name: Install clickhouse repo | EL9
-  when:
-    - (ansible_distribution == 'OracleLinux' or ansible_distribution == 'AlmaLinux') and ansible_distribution_major_version == '9'
+- name: Add ClickHouse repository
   yum_repository:
     name: clickhouse
-    file: clickhouse
-    description: "Clickhouse repo"
-    baseurl: "https://packages.clickhouse.com/rpm/stable/"
+    description: ClickHouse - Stable Repository
+    baseurl: https://packages.clickhouse.com/rpm/stable/
+    gpgkey: https://packages.clickhouse.com/rpm/stable/repodata/repomd.xml.key
+    gpgcheck: no
+    repo_gpgcheck: yes
     enabled: no
-    gpgcheck: 0
 
 - name: Install clickhouse package
   yum: