1 files changed, 4 insertions, 4 deletions
diff --git a/lib/gitlab/kas/client.rb b/lib/gitlab/kas/client.rb
index 6675903e692..842ee98e4da 100644
--- a/lib/gitlab/kas/client.rb
+++ b/lib/gitlab/kas/client.rb
@@ -49,14 +49,14 @@ module Gitlab
       end
 
       def kas_endpoint_url
-        Gitlab::Kas.internal_url.delete_prefix('grpc://')
+        Gitlab::Kas.internal_url.sub(%r{^grpc://|^grpcs://}, '')
       end
 
       def credentials
-        if Rails.env.test? || Rails.env.development?
-          :this_channel_is_insecure
-        else
+        if URI(Gitlab::Kas.internal_url).scheme == 'grpcs'
           GRPC::Core::ChannelCredentials.new
+        else
+          :this_channel_is_insecure
         end
       end