diff --git a/kubernetes/clamp/templates/all-services.yaml b/kubernetes/clamp/templates/all-services.yaml
index 20ec584..163ed58 100644
--- a/kubernetes/clamp/templates/all-services.yaml
+++ b/kubernetes/clamp/templates/all-services.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableClampClampMariadb }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -12,6 +13,8 @@
   selector:
     app: clamp-mariadb
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disableClampClamp }}
 ---
 apiVersion: v1
 kind: Service
@@ -26,3 +29,4 @@
   selector:
     app: clamp
   type: NodePort
+#{{ end }}
\ No newline at end of file
diff --git a/kubernetes/clamp/templates/clamp-deployment.yaml b/kubernetes/clamp/templates/clamp-deployment.yaml
index ea3ef19..493bb49 100644
--- a/kubernetes/clamp/templates/clamp-deployment.yaml
+++ b/kubernetes/clamp/templates/clamp-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableClampClamp }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -57,3 +58,4 @@
           periodSeconds: 10
       imagePullSecrets:
       - name: {{ .Values.nsPrefix }}-docker-registry-key
+#{{ end }}
\ No newline at end of file
diff --git a/kubernetes/clamp/templates/clamp-mariadb-deployment.yaml b/kubernetes/clamp/templates/clamp-mariadb-deployment.yaml
index 2f79625..46a6433 100644
--- a/kubernetes/clamp/templates/clamp-mariadb-deployment.yaml
+++ b/kubernetes/clamp/templates/clamp-mariadb-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableClampClampMariadb }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -47,3 +48,4 @@
             claimName: clamp-db
       imagePullSecrets:
       - name: {{ .Values.nsPrefix }}-docker-registry-key
+#{{ end }}
\ No newline at end of file
diff --git a/kubernetes/clamp/templates/clamp-pv-pvc.yaml b/kubernetes/clamp/templates/clamp-pv-pvc.yaml
index 5a82752..0d36141 100644
--- a/kubernetes/clamp/templates/clamp-pv-pvc.yaml
+++ b/kubernetes/clamp/templates/clamp-pv-pvc.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableClampClampMariadb }}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
@@ -28,3 +29,4 @@
   selector:
     matchLabels:
       name: "{{ .Values.nsPrefix }}-clamp-db"
+#{{ end }}
\ No newline at end of file