1 files changed, 7 insertions, 1 deletions
diff --git a/lib/integrations/google_cloud_platform/jwt.rb b/lib/integrations/google_cloud_platform/jwt.rb
index a103f379bc8..26343a3a9db 100644
--- a/lib/integrations/google_cloud_platform/jwt.rb
+++ b/lib/integrations/google_cloud_platform/jwt.rb
@@ -70,13 +70,19 @@ module Integrations
 
       override :issuer
       def issuer
-        Settings.gitlab.host
+        Feature.enabled?(:oidc_issuer_url) ? Gitlab.config.gitlab.url : Settings.gitlab.base_url
       end
 
       override :audience
       def audience
         @claims[:audience]
       end
+
+      override :kid
+      def kid
+        rsa_key = OpenSSL::PKey::RSA.new(key_data)
+        rsa_key.public_key.to_jwk[:kid]
+      end
     end
   end
 end