diff --git a/kubernetes/vnfsdk/templates/all-services.yaml b/kubernetes/vnfsdk/templates/all-services.yaml
index c78dab8..759e26d 100644
--- a/kubernetes/vnfsdk/templates/all-services.yaml
+++ b/kubernetes/vnfsdk/templates/all-services.yaml
@@ -3,7 +3,7 @@
 kind: Service
 metadata:
   name: postgres
-  namespace: {{ .Values.nsPrefix }}-vnfsdk
+  namespace: {{ .Values.nsPrefix }}
   labels:
     app: postgres
 spec:
@@ -22,7 +22,7 @@
   labels:
     app: refrepo
   name: refrepo
-  namespace: {{ .Values.nsPrefix }}-vnfsdk
+  namespace: {{ .Values.nsPrefix }}
 spec:
   ports:
   - name: "refrepo-port"
diff --git a/kubernetes/vnfsdk/templates/postgres-deployment.yaml b/kubernetes/vnfsdk/templates/postgres-deployment.yaml
index cdc2ba9..d000266 100644
--- a/kubernetes/vnfsdk/templates/postgres-deployment.yaml
+++ b/kubernetes/vnfsdk/templates/postgres-deployment.yaml
@@ -2,8 +2,8 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: postgres
-  namespace: {{ .Values.nsPrefix }}-vnfsdk
+  name: vnfsdk-postgres
+  namespace: {{ .Values.nsPrefix }}
 spec:
   replicas: 1
   selector:
@@ -13,7 +13,7 @@
     metadata:
       labels:
         app: postgres
-      name: postgres
+      name: vnfsdk-postgres
     spec:
       hostname: postgres
       containers:
@@ -23,4 +23,4 @@
         name: "postgres"
       imagePullSecrets:
       - name: {{ .Values.nsPrefix }}-docker-registry-key
-#{{ end }}
\ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/vnfsdk/templates/refrepo-deployment.yaml b/kubernetes/vnfsdk/templates/refrepo-deployment.yaml
index 0a56c74..ba13292 100644
--- a/kubernetes/vnfsdk/templates/refrepo-deployment.yaml
+++ b/kubernetes/vnfsdk/templates/refrepo-deployment.yaml
@@ -4,8 +4,8 @@
 metadata:
   labels:
     app: refrepo
-  name: refrepo
-  namespace: "{{ .Values.nsPrefix }}-vnfsdk"
+  name: vnfsdk-refrepo
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   selector:
     matchLabels:
@@ -14,7 +14,7 @@
     metadata:
       labels:
         app: refrepo
-      name: refrepo
+      name: vnfsdk-refrepo
     spec:
       initContainers:
       - command: