diff --git a/bitnami/apache/Chart.yaml b/bitnami/apache/Chart.yaml
index 65f562ee7..a8311ca01 100644
--- a/bitnami/apache/Chart.yaml
+++ b/bitnami/apache/Chart.yaml
@@ -1,5 +1,5 @@
 name: apache
-version: 0.3.11
+version: 0.3.12
 appVersion: 2.4.33
 description: Chart for Apache HTTP Server
 keywords:
diff --git a/bitnami/apache/README.md b/bitnami/apache/README.md
index b93297c70..2f8bf1893 100644
--- a/bitnami/apache/README.md
+++ b/bitnami/apache/README.md
@@ -47,7 +47,7 @@ The following tables lists the configurable parameters of the Apache chart and t
 | `image.registry`                  | Apache image registry                 | `docker.io`                                               |
 | `image.repository`                | Apache Image name                     | `bitnami/apache`                                          |
 | `image.tag`                       | Apache Image tag                      | `{VERSION}`                                               |
-| `image.pullPolicy`                | Apache image pull policy              | `Always` if `imageTag` is `latest`, else `IfNotPresent`   |
+| `image.pullPolicy`                | Apache image pull policy              | `Always`                                                  |
 | `image.pullSecrets`               | Specify image pull secrets            | `nil` (does not add image pull secrets to deployed pods)  |
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
diff --git a/bitnami/apache/values.yaml b/bitnami/apache/values.yaml
index e45d76294..62720be50 100644
--- a/bitnami/apache/values.yaml
+++ b/bitnami/apache/values.yaml
@@ -6,10 +6,9 @@ image:
   repository: bitnami/apache
   tag: 2.4.33
   ## Specify a imagePullPolicy
-  ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
   ##
-  pullPolicy: IfNotPresent
+  pullPolicy: Always
   ## Optionally specify an array of imagePullSecrets.
   ## Secrets must be manually created in the namespace.
   ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
diff --git a/upstreamed/rabbitmq/templates/configuration.yaml b/upstreamed/rabbitmq/templates/configuration.yaml
index 37db37273..d408cf14f 100644
--- a/upstreamed/rabbitmq/templates/configuration.yaml
+++ b/upstreamed/rabbitmq/templates/configuration.yaml
@@ -15,4 +15,3 @@ data:
     default_user={{.Values.rabbitmq.username}}
     default_pass=CHANGEME
 {{ .Values.rabbitmq.configuration | indent 4 }}
-