diff --git a/app/models/clusters/platforms/kubernetes.rb b/app/models/clusters/platforms/kubernetes.rb
index 66f629df1b4..7ce8befeeeb 100644
--- a/app/models/clusters/platforms/kubernetes.rb
+++ b/app/models/clusters/platforms/kubernetes.rb
@@ -141,7 +141,7 @@ module Clusters
       end
 
       def kubeclient_ssl_options
-        opts = { verify_ssl: OpenSSL::SSL::VERIFY_NONE }
+        opts = { verify_ssl: OpenSSL::SSL::VERIFY_PEER }
 
         if ca_pem.present?
           opts[:cert_store] = OpenSSL::X509::Store.new
diff --git a/app/models/environment.rb b/app/models/environment.rb
index 0c408257499..57960a7c3b3 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -220,6 +220,10 @@ class Environment < ActiveRecord::Base
     self.environment_type || self.name
   end
 
+  def deployment_platform
+    project.deployment_platform
+  end
+
   def prometheus_adapter
     @prometheus_adapter ||= if service_prometheus_adapter.can_query?
                               service_prometheus_adapter
@@ -233,9 +237,9 @@ class Environment < ActiveRecord::Base
   end
 
   def cluster_prometheus_adapter
-    return unless project.deployment_platform.respond_to?(:cluster)
+    return unless deployment_platform.respond_to?(:cluster)
 
-    cluster = project.deployment_platform.cluster
+    cluster = deployment_platform.cluster
     return unless cluster.application_prometheus&.installed?
 
     cluster.application_prometheus