diff --git a/bitnami/external-dns/Chart.yaml b/bitnami/external-dns/Chart.yaml
index 2d0ae47e8..6809cb278 100644
--- a/bitnami/external-dns/Chart.yaml
+++ b/bitnami/external-dns/Chart.yaml
@@ -1,5 +1,5 @@
 name: external-dns
-version: 1.2.3
+version: 1.3.0
 appVersion: 0.5.9
 description: ExternalDNS is a Kubernetes addon that configures public DNS servers with information about exposed Kubernetes services to make them discoverable.
 keywords:
diff --git a/bitnami/external-dns/templates/deployment.yaml b/bitnami/external-dns/templates/deployment.yaml
index 766241c14..0e746f9c8 100644
--- a/bitnami/external-dns/templates/deployment.yaml
+++ b/bitnami/external-dns/templates/deployment.yaml
@@ -106,8 +106,10 @@ spec:
         {{- end }}
 
         {{- if eq .Values.provider "google" }}
+        {{- if .Values.google.project }}
         - --google-project={{ .Values.google.project }}
         {{- end }}
+        {{- end }}
 
         env:
         {{- if .Values.image.debug }}
@@ -147,9 +149,11 @@ spec:
         {{- end }}
 
         {{- if eq .Values.provider "google" }}
+        {{- if .Values.google.serviceAccountSecret }}
         - name: GOOGLE_APPLICATION_CREDENTIALS
           value: /etc/secrets/service-account/credentials.json
         {{- end }}
+        {{- end }}
 
         ports:
         - containerPort: {{ .Values.service.port }}
@@ -191,9 +195,11 @@ spec:
         {{- end }}
 
         {{- if eq .Values.provider "google" }}
+        {{- if .Values.google.serviceAccountSecret }}
         - name: google-service-account
           mountPath: /etc/secrets/service-account/
         {{- end }}
+        {{- end }}
 
       volumes:
       {{- if eq .Values.provider "aws" }}
@@ -210,7 +216,9 @@ spec:
       {{- end }}
 
       {{- if eq .Values.provider "google" }}
+      {{- if .Values.google.serviceAccountSecret }}
       - name: google-service-account
         secret:
           secretName: {{ .Values.google.serviceAccountSecret | quote }}
       {{- end}}
+      {{- end}}