diff --git a/pki/helm.go b/pki/helm.go
index 570fb04d..817c1bf4 100644
--- a/pki/helm.go
+++ b/pki/helm.go
@@ -79,7 +79,7 @@ inject:
         logger:
           format: json
         db:
-          type: badger
+          type: badgerv2
           dataSource: /home/step/db
         authority:
           provisioners:
diff --git a/pki/pki.go b/pki/pki.go
index fd625199..12e71e47 100644
--- a/pki/pki.go
+++ b/pki/pki.go
@@ -341,7 +341,9 @@ func New(o apiv1.Options, opts ...Option) (*PKI, error) {
 		if err != nil {
 			return nil, errors.Wrapf(err, "error parsing %s", p.Address)
 		}
-		if port == "443" {
+		// On k8s we usually access through a service, and this is configured on
+		// port 443 by default.
+		if port == "443" || p.options.isHelm {
 			p.Defaults.CaUrl = fmt.Sprintf("https://%s", p.Defaults.CaUrl)
 		} else {
 			p.Defaults.CaUrl = fmt.Sprintf("https://%s:%s", p.Defaults.CaUrl, port)