diff --git a/kubernetes/vnfsdk/templates/all-services.yaml b/kubernetes/vnfsdk/templates/all-services.yaml
index 1f11729..c78dab8 100644
--- a/kubernetes/vnfsdk/templates/all-services.yaml
+++ b/kubernetes/vnfsdk/templates/all-services.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableVnfsdkPostgres }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -12,6 +13,8 @@
   selector:
     app: postgres
   clusterIP: None
+#{{ end }}
+#{{ if not .Values.disableVnfsdkRefrepo }}
 ---
 apiVersion: v1
 kind: Service
@@ -28,3 +31,4 @@
   selector:
     app: refrepo
   type: NodePort
+#{{ end }}
\ No newline at end of file
diff --git a/kubernetes/vnfsdk/templates/postgres-deployment.yaml b/kubernetes/vnfsdk/templates/postgres-deployment.yaml
index 76721d1..cdc2ba9 100644
--- a/kubernetes/vnfsdk/templates/postgres-deployment.yaml
+++ b/kubernetes/vnfsdk/templates/postgres-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableVnfsdkPostgres }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -22,3 +23,4 @@
         name: "postgres"
       imagePullSecrets:
       - name: {{ .Values.nsPrefix }}-docker-registry-key
+#{{ end }}
\ No newline at end of file
diff --git a/kubernetes/vnfsdk/templates/refrepo-deployment.yaml b/kubernetes/vnfsdk/templates/refrepo-deployment.yaml
index 3accb96..82f5f17 100644
--- a/kubernetes/vnfsdk/templates/refrepo-deployment.yaml
+++ b/kubernetes/vnfsdk/templates/refrepo-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableVnfsdkRefrepo }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -52,3 +53,4 @@
           periodSeconds: 10
       imagePullSecrets:
       - name: {{ .Values.nsPrefix }}-docker-registry-key
+#{{ end }}
\ No newline at end of file