diff --git a/customers/base/kustomization.yaml b/customers/base/kustomization.yaml
index 8ce88b5..267ba3f 100644
--- a/customers/base/kustomization.yaml
+++ b/customers/base/kustomization.yaml
@@ -5,3 +5,4 @@ resources:
   - nextcloud-service.yml
   - redis-deployment.yml
   - redis-service.yml
+  - s3-service.yml
diff --git a/customers/base/nextcloud-configmap.yml b/customers/base/nextcloud-configmap.yml
index f3527db..673b8bf 100644
--- a/customers/base/nextcloud-configmap.yml
+++ b/customers/base/nextcloud-configmap.yml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: nextcloud-configmap
-  namespace: customer
 data: 
   config.php: |
     <?php
diff --git a/customers/base/nextcloud-deployment.yml b/customers/base/nextcloud-deployment.yml
index 411d8af..424d6e5 100644
--- a/customers/base/nextcloud-deployment.yml
+++ b/customers/base/nextcloud-deployment.yml
@@ -3,7 +3,6 @@ kind: Deployment
 apiVersion: apps/v1
 metadata:
   name: customer-node
-  namespace: customer
   labels:
     app: customer-node
 spec:
diff --git a/customers/base/nextcloud-ingress.yml b/customers/base/nextcloud-ingress.yml
index 3dcfe37..fb2548f 100644
--- a/customers/base/nextcloud-ingress.yml
+++ b/customers/base/nextcloud-ingress.yml
@@ -3,7 +3,6 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: customer-ingress
-  namespace: customer
   annotations:
     kubernetes.io/ingress.class: traefik
     traefik.ingress.kubernetes.io/router.entrypoints: websecure
diff --git a/customers/base/nextcloud-pvc.yml b/customers/base/nextcloud-pvc.yml
index d361ab1..3c5f611 100644
--- a/customers/base/nextcloud-pvc.yml
+++ b/customers/base/nextcloud-pvc.yml
@@ -3,7 +3,6 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: customer-shared-storage-claim
-  namespace: customer
   annotations:
     volume.beta.kubernetes.io/storage-class: openebs-jiva-3repl
 spec:
diff --git a/customers/base/nextcloud-service.yml b/customers/base/nextcloud-service.yml
index b65148a..29d7fdd 100644
--- a/customers/base/nextcloud-service.yml
+++ b/customers/base/nextcloud-service.yml
@@ -7,7 +7,6 @@ items:
     labels:
       app: customer-node
     name: customer-node
-    namespace: customer
   spec:
     ports:
     - port: 80
diff --git a/customers/overlays/vr/test/s3-service.yml b/customers/base/s3-service.yml
similarity index 89%
rename from customers/overlays/vr/test/s3-service.yml
rename to customers/base/s3-service.yml
index 6d054af..842e1fa 100644
--- a/customers/overlays/vr/test/s3-service.yml
+++ b/customers/base/s3-service.yml
@@ -3,7 +3,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name: sto4
-  namespace: vr
 spec:
   type: ExternalName
   externalName: s3.sto4.safedc.net
diff --git a/customers/overlays/vr/test/kustomization.yaml b/customers/overlays/vr/test/kustomization.yaml
index 26b7332..036c61d 100644
--- a/customers/overlays/vr/test/kustomization.yaml
+++ b/customers/overlays/vr/test/kustomization.yaml
@@ -5,4 +5,3 @@ bases:
 patchesStrategicMerge:
   - nextcloud-deployment.yml
   - nextcloud-ingress.yml
-  - s3-service.yml