diff --git a/charts/netbox/Chart.yaml b/charts/netbox/Chart.yaml
index 45d050a..46503af 100644
--- a/charts/netbox/Chart.yaml
+++ b/charts/netbox/Chart.yaml
@@ -1,7 +1,7 @@
 ---
 apiVersion: v1
-appVersion: "2.7.11"
+appVersion: "2.7.12"
 description: An IP address management (IPAM) and data center infrastructure management (DCIM) tool. 
 icon: https://raw.githubusercontent.com/digitalocean/netbox/develop/netbox/project-static/img/netbox.ico
 name: netbox
-version: 0.4.6
+version: 0.4.7
diff --git a/charts/netbox/templates/_helpers.tpl b/charts/netbox/templates/_helpers.tpl
index dc85616..594670c 100644
--- a/charts/netbox/templates/_helpers.tpl
+++ b/charts/netbox/templates/_helpers.tpl
@@ -34,3 +34,10 @@ Create chart name and version as used by the chart label.
 {{- define "netbox.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+{{/*
+Get the correct image tag name
+*/}}
+{{- define "netbox.imageTag" -}}
+{{- .Values.image.tag | default (printf "%s-ldap" .Chart.AppVersion) -}}
+{{- end -}}
diff --git a/charts/netbox/templates/deployment-worker.yaml b/charts/netbox/templates/deployment-worker.yaml
index 4c3a8e7..84f62dd 100644
--- a/charts/netbox/templates/deployment-worker.yaml
+++ b/charts/netbox/templates/deployment-worker.yaml
@@ -32,7 +32,7 @@ spec:
             - python3
             - /opt/netbox/netbox/manage.py
             - rqworker
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ include "netbox.imageTag" . }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           envFrom:
             - configMapRef:
diff --git a/charts/netbox/templates/deployment.yaml b/charts/netbox/templates/deployment.yaml
index 1fd68ed..12846b4 100644
--- a/charts/netbox/templates/deployment.yaml
+++ b/charts/netbox/templates/deployment.yaml
@@ -27,7 +27,7 @@ spec:
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ include "netbox.imageTag" . }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           envFrom:
             - configMapRef:
diff --git a/charts/netbox/values.yaml b/charts/netbox/values.yaml
index 8e3e6bd..6713ba0 100644
--- a/charts/netbox/values.yaml
+++ b/charts/netbox/values.yaml
@@ -7,7 +7,7 @@ replicaCount: 1
 
 image:
   repository: netboxcommunity/netbox
-  tag: v2.7.11-ldap
+  # tag: v2.7.12-ldap
   pullPolicy: Always
 
 nameOverride: ""