diff --git a/roles/gitlab/defaults/main.yml b/roles/gitlab/defaults/main.yml
index 8ff96566..a3b4d9cc 100644
--- a/roles/gitlab/defaults/main.yml
+++ b/roles/gitlab/defaults/main.yml
@@ -9,7 +9,6 @@ gitlab_edition: "gitlab-ee"
 gitlab_version: ""
 gitlab_release: ""
 gitlab_gpg_key_url: "https://packages.gitlab.com/gitlab/{{ gitlab_edition }}/gpgkey"
-gitlab_gpg_key_id: "F6403F6544A38863DAA0B6E03F01618A51312F3F"
 
 # Do not display sensitive changes in diffs by default
 gitlab_hide_sensitive_changes: true
diff --git a/roles/gitlab/tasks/install.yml b/roles/gitlab/tasks/install.yml
index 2d784dd8..5c4a269e 100644
--- a/roles/gitlab/tasks/install.yml
+++ b/roles/gitlab/tasks/install.yml
@@ -70,7 +70,7 @@
         enabled: true
         gpgkey:
           - "{{ gitlab_gpg_key_url }}"
-          - "{{ gitlab_gpg_key_url }}/gitlab-{{ gitlab_edition }}-3D645A26AB9FBD22.pub.gpg"
+          - "{{ gitlab_gpg_key_url }}/gitlab-{{ gitlab_edition }}-{{ gitlab_gpg_key_id }}.pub.gpg"
         sslverify: true
         sslcacert: "/etc/pki/tls/certs/ca-bundle.crt"
         metadata_expire: "300"
@@ -86,7 +86,7 @@
         enabled: true
         gpgkey:
           - "{{ gitlab_gpg_key_url }}"
-          - "{{ gitlab_gpg_key_url }}/gitlab-{{ gitlab_edition }}-3D645A26AB9FBD22.pub.gpg"
+          - "{{ gitlab_gpg_key_url }}/gitlab-{{ gitlab_edition }}-{{ gitlab_gpg_key_id }}.pub.gpg"
         sslverify: true
         sslcacert: "/etc/pki/tls/certs/ca-bundle.crt"
         metadata_expire: "300"
diff --git a/roles/gitlab/vars/AlmaLinux.yml b/roles/gitlab/vars/AlmaLinux.yml
index ab451271..4e40fd2c 100644
--- a/roles/gitlab/vars/AlmaLinux.yml
+++ b/roles/gitlab/vars/AlmaLinux.yml
@@ -13,3 +13,4 @@ gitlab_dependencies:
 gitlab_repo_url: "https://packages.gitlab.com/gitlab/{{ gitlab_edition }}/el/{{ ansible_facts.distribution_major_version }}/$basearch"
 gitlab_source_repo_url: "https://packages.gitlab.com/gitlab/{{ gitlab_edition }}/el/{{ ansible_facts.distribution_major_version }}/SRPMS"
 gitlab_package_name: "{{ gitlab_edition + '-' + gitlab_version + '-' + gitlab_release if gitlab_version and gitlab_release else gitlab_edition }}"
+gitlab_gpg_key_id: "CB947AD886C8E8FD"
diff --git a/roles/gitlab/vars/CentOS.yml b/roles/gitlab/vars/CentOS.yml
index ab451271..4e40fd2c 100644
--- a/roles/gitlab/vars/CentOS.yml
+++ b/roles/gitlab/vars/CentOS.yml
@@ -13,3 +13,4 @@ gitlab_dependencies:
 gitlab_repo_url: "https://packages.gitlab.com/gitlab/{{ gitlab_edition }}/el/{{ ansible_facts.distribution_major_version }}/$basearch"
 gitlab_source_repo_url: "https://packages.gitlab.com/gitlab/{{ gitlab_edition }}/el/{{ ansible_facts.distribution_major_version }}/SRPMS"
 gitlab_package_name: "{{ gitlab_edition + '-' + gitlab_version + '-' + gitlab_release if gitlab_version and gitlab_release else gitlab_edition }}"
+gitlab_gpg_key_id: "CB947AD886C8E8FD"
diff --git a/roles/gitlab/vars/Debian.yml b/roles/gitlab/vars/Debian.yml
index 8805d2ab..f73ba2fc 100644
--- a/roles/gitlab/vars/Debian.yml
+++ b/roles/gitlab/vars/Debian.yml
@@ -13,3 +13,4 @@ gitlab_dependencies:
   - "tzdata"
 gitlab_repo_url: "https://packages.gitlab.com/gitlab/{{ gitlab_edition }}/debian/"
 gitlab_package_name: "{{ gitlab_edition + '=' + gitlab_version + '-' + gitlab_release if gitlab_version and gitlab_release else gitlab_edition }}"
+gitlab_gpg_key_id: "F6403F6544A38863DAA0B6E03F01618A51312F3F"
diff --git a/roles/gitlab/vars/Ubuntu.yml b/roles/gitlab/vars/Ubuntu.yml
index 1f6bc085..311489a4 100644
--- a/roles/gitlab/vars/Ubuntu.yml
+++ b/roles/gitlab/vars/Ubuntu.yml
@@ -13,3 +13,4 @@ gitlab_dependencies:
   - "tzdata"
 gitlab_repo_url: "https://packages.gitlab.com/gitlab/{{ gitlab_edition }}/ubuntu/"
 gitlab_package_name: "{{ gitlab_edition + '=' + gitlab_version + '-' + gitlab_release if gitlab_version and gitlab_release else gitlab_edition }}"
+gitlab_gpg_key_id: "F6403F6544A38863DAA0B6E03F01618A51312F3F"