diff --git a/deploy/chart/templates/00-namespace.yaml b/deploy/chart/templates/00-namespace.yaml
deleted file mode 100644
index 1502a5997..000000000
--- a/deploy/chart/templates/00-namespace.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-{{ if .Values.createNamespaceResource }}
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: {{ .Release.Namespace | quote }}
-  labels:
-    name: {{ .Release.Namespace | quote }}
-    certmanager.k8s.io/disable-validation: "true"
-{{- end }}
diff --git a/deploy/chart/values.yaml b/deploy/chart/values.yaml
index 4199706fc..3b679099c 100644
--- a/deploy/chart/values.yaml
+++ b/deploy/chart/values.yaml
@@ -74,11 +74,6 @@ ingressShim: {}
 webhook:
   enabled: true
 
-# This is used by the static manifest generator in order to create a static
-# namespace manifest for the namespace that cert-manager is being installed
-# within. It should **not** be used if you are using Helm for deployment.
-createNamespaceResource: false
-
 # Use these variables to configure the HTTP_PROXY environment variables
 # http_proxy: "http://proxy:8080"
 # http_proxy: "http://proxy:8080"
diff --git a/deploy/manifests/cert-manager.yaml b/deploy/manifests/cert-manager.yaml
index 11260ff42..7a2d3a63f 100644
--- a/deploy/manifests/cert-manager.yaml
+++ b/deploy/manifests/cert-manager.yaml
@@ -1,14 +1,3 @@
----
-# Source: cert-manager/templates/00-namespace.yaml
-
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: "cert-manager"
-  labels:
-    name: "cert-manager"
-    certmanager.k8s.io/disable-validation: "true"
-
 ---
 # Source: cert-manager/charts/webhook/templates/serviceaccount.yaml
 apiVersion: v1
diff --git a/docs/admin/upgrading/index.rst b/docs/admin/upgrading/index.rst
index 921226d34..0d1c70b36 100644
--- a/docs/admin/upgrading/index.rst
+++ b/docs/admin/upgrading/index.rst
@@ -27,6 +27,8 @@ name of your Helm release for cert-manager (usually this is ``cert-manager``):
    $ kubectl apply \
         -f https://raw.githubusercontent.com/jetstack/cert-manager/${VERSION}/deploy/manifests/00-crds.yaml
 
+   $ kubectl label namespace cert-manager certmanager.k8s.io/disable-validation=true
+
    $ helm upgrade --version ${VERSION} <release_name> stable/cert-manager
 
 This will upgrade you to the latest version of cert-manager, as listed in the
@@ -54,6 +56,9 @@ version number you want to install:
    $ kubectl apply \
         -f https://raw.githubusercontent.com/jetstack/cert-manager/${VERSION}/deploy/manifests/00-crds.yaml
 
+   # Ensure resource validation is disabled on the cert-manager namespace
+   $ kubectl label namespace cert-manager certmanager.k8s.io/disable-validation=true
+
    $ kubectl apply \
         -f https://raw.githubusercontent.com/jetstack/cert-manager/${VERSION}/deploy/manifests/cert-manager.yaml
 
diff --git a/docs/getting-started/2-installing.rst b/docs/getting-started/2-installing.rst
index bf25f97f8..783bd6a60 100644
--- a/docs/getting-started/2-installing.rst
+++ b/docs/getting-started/2-installing.rst
@@ -59,6 +59,12 @@ To install cert-manager using the static manifests, you should run:
    $ kubectl apply \
         -f https://raw.githubusercontent.com/jetstack/cert-manager/v0.6.0/deploy/manifests/00-crds.yaml
 
+   # Create a namespace to run cert-manager in
+   $ kubectl create namespace cert-manager
+
+   # Disable resource validation on the cert-manager namespace
+   $ kubectl label namespace cert-manager certmanager.k8s.io/disable-validation=true
+
    # Install cert-manager
    $ kubectl apply \
         -f https://raw.githubusercontent.com/jetstack/cert-manager/v0.6.0/deploy/manifests/cert-manager.yaml