diff --git a/roles/addons/files/fabric8-rc.yaml b/roles/addons/files/fabric8-rc.yaml
index d9ef2b9d9..f142f991b 100644
--- a/roles/addons/files/fabric8-rc.yaml
+++ b/roles/addons/files/fabric8-rc.yaml
@@ -6,7 +6,6 @@ metadata:
     component: "console"
     provider: "fabric8"
   name: "fabric8"
-  namespace: "kube-system"
 spec: 
   replicas: 1
   selector: 
diff --git a/roles/addons/files/fabric8-svc-accounts.yaml b/roles/addons/files/fabric8-svc-accounts.yaml
index 2e3944898..bd86641e1 100644
--- a/roles/addons/files/fabric8-svc-accounts.yaml
+++ b/roles/addons/files/fabric8-svc-accounts.yaml
@@ -5,5 +5,4 @@ metadata:
   annotations: {}
   labels: {}
   name: "fabric8"
-  namespace: "kube-system"
 secrets: []
diff --git a/roles/addons/files/fabric8-svc.yaml b/roles/addons/files/fabric8-svc.yaml
index 37acbd292..39bb0aa71 100644
--- a/roles/addons/files/fabric8-svc.yaml
+++ b/roles/addons/files/fabric8-svc.yaml
@@ -6,7 +6,6 @@ metadata:
     component: "console"
     provider: "fabric8"
   name: "fabric8"
-  namespace: "kube-system"
 spec: 
   deprecatedPublicIPs: []
   ports: 
diff --git a/roles/addons/files/fabric8-templates-rc.yaml b/roles/addons/files/fabric8-templates-rc.yaml
index 17ff46609..023adbe95 100644
--- a/roles/addons/files/fabric8-templates-rc.yaml
+++ b/roles/addons/files/fabric8-templates-rc.yaml
@@ -6,7 +6,6 @@ metadata:
     component: "templates"
     provider: "fabric8"
   name: "templates"
-  namespace: "kube-system"
 spec: 
   replicas: 1
   selector: 
diff --git a/roles/addons/files/fabric8-templates-svc.yaml b/roles/addons/files/fabric8-templates-svc.yaml
index d5f528040..4bbe5887d 100644
--- a/roles/addons/files/fabric8-templates-svc.yaml
+++ b/roles/addons/files/fabric8-templates-svc.yaml
@@ -6,7 +6,6 @@ metadata:
     component: "templates"
     provider: "fabric8"
   name: "templates"
-  namespace: "kube-system"
 spec: 
   deprecatedPublicIPs: []
   ports: 
diff --git a/roles/addons/tasks/fabric8.yml b/roles/addons/tasks/fabric8.yml
index 4213fece3..f50903128 100644
--- a/roles/addons/tasks/fabric8.yml
+++ b/roles/addons/tasks/fabric8.yml
@@ -32,7 +32,7 @@
 
 - name: Fabric8 | Create/update service account
   kube:
-    namespace: kube-system
+    namespace: default
     resource: serviceaccounts
     name: fabric8
     filename: "{{ kube_manifest_dir }}/fabric8-svc-accounts.yaml"
@@ -41,7 +41,7 @@
 
 - name: Fabric8 | Create/update service
   kube:
-    namespace: kube-system
+    namespace: default
     resource: svc
     name: fabric8
     filename: "{{ kube_manifest_dir }}/fabric8-svc.yaml"
@@ -49,7 +49,7 @@
 
 - name: Fabric8 | templates | Create/update service
   kube:
-    namespace: kube-system
+    namespace: default
     resource: svc
     name: templates
     filename: "{{ kube_manifest_dir }}/fabric8-templates-svc.yaml"
@@ -57,7 +57,7 @@
 
 - name: Fabric8 | Create/update replication controller
   kube:
-    namespace: kube-system
+    namespace: default
     resource: rc
     name: fabric8
     filename: "{{ kube_manifest_dir }}/fabric8-rc.yaml"
@@ -65,7 +65,7 @@
 
 - name: Fabric8 | templates | Create/update replication controller
   kube:
-    namespace: kube-system
+    namespace: default
     resource: rc
     name: templates
     filename: "{{ kube_manifest_dir }}/fabric8-templates-rc.yaml"