diff --git a/pkg/oc/admin/diagnostics/client.go b/pkg/oc/admin/diagnostics/client.go
index cb6f10bffd35..6c477edc81c7 100644
--- a/pkg/oc/admin/diagnostics/client.go
+++ b/pkg/oc/admin/diagnostics/client.go
@@ -6,7 +6,6 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
 
-	"github.com/openshift/origin/pkg/cmd/util/variable"
 	clientdiags "github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/client"
 	networkdiags "github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/network"
 	"github.com/openshift/origin/pkg/oc/admin/diagnostics/diagnostics/types"
@@ -47,14 +46,13 @@ func (o DiagnosticsOptions) buildClientDiagnostics(rawConfig *clientcmdapi.Confi
 				}
 			}
 		case clientdiags.DiagnosticPodName:
-			diagnostics = append(diagnostics, &clientdiags.DiagnosticPod{
-				KubeClient:          kubeClient,
-				Namespace:           rawConfig.Contexts[rawConfig.CurrentContext].Namespace,
-				Level:               o.LogOptions.Level,
-				Factory:             o.Factory,
-				PreventModification: o.PreventModification,
-				ImageTemplate:       variable.NewDefaultImageTemplate(),
-			})
+			dp := o.ParameterizedDiagnostics[diagnosticName].(*clientdiags.DiagnosticPod)
+			dp.KubeClient = kubeClient
+			dp.Namespace = rawConfig.Contexts[rawConfig.CurrentContext].Namespace
+			dp.Level = o.LogOptions.Level
+			dp.Factory = o.Factory
+			dp.PreventModification = dp.PreventModification || o.PreventModification
+			diagnostics = append(diagnostics, dp)
 		case networkdiags.NetworkDiagnosticName:
 			nd := o.ParameterizedDiagnostics[diagnosticName].(*networkdiags.NetworkDiagnostic)
 			nd.KubeClient = kubeClient
diff --git a/pkg/oc/admin/diagnostics/diagnostics/client/run_diagnostics_pod.go b/pkg/oc/admin/diagnostics/diagnostics/client/run_diagnostics_pod.go
index 366c6e80df7a..2aa41f97cc29 100644
--- a/pkg/oc/admin/diagnostics/diagnostics/client/run_diagnostics_pod.go
+++ b/pkg/oc/admin/diagnostics/diagnostics/client/run_diagnostics_pod.go
@@ -35,6 +35,8 @@ type DiagnosticPod struct {
 	ImageTemplate       variable.ImageTemplate
 }
 
+var _ types.ParameterizedDiagnostic = (*DiagnosticPod)(nil)
+
 // Name is part of the Diagnostic interface and just returns name.
 func (d *DiagnosticPod) Name() string {
 	return DiagnosticPodName