diff --git a/ansible/roles/apps/tasks/init.yml b/ansible/roles/apps/tasks/init.yml
index 17376e3115963081f66041351e0de4ec545068f0..39c61a02eb076606127ed71e05302aec6d5f96a1 100644
--- a/ansible/roles/apps/tasks/init.yml
+++ b/ansible/roles/apps/tasks/init.yml
@@ -17,20 +17,6 @@
     delete: true
   become: true
 
-- name: Create OAS namespaces
-  tags:
-    - kubernetes
-    - namespace
-  k8s:
-    name: '{{ item }}'
-    api_version: v1
-    kind: Namespace
-    state: present
-  with_items:
-    - 'oas'
-    - 'oas-apps'
-
-
 - name: Create value overrides directory
   tags:
     - config
diff --git a/ansible/roles/setup/tasks/main.yml b/ansible/roles/setup/tasks/main.yml
index 4ac4ed4cfafb0824d1a1d98fc658db63cb40829b..e6ef312353f85abe9a7a8c7dd98c75ec41079b83 100644
--- a/ansible/roles/setup/tasks/main.yml
+++ b/ansible/roles/setup/tasks/main.yml
@@ -3,3 +3,4 @@
 - import_tasks: rke.yml
 - import_tasks: tiller.yml
 - import_tasks: krew.yml
+- import_tasks: namespaces.yml
diff --git a/ansible/roles/setup/tasks/namespaces.yml b/ansible/roles/setup/tasks/namespaces.yml
new file mode 100644
index 0000000000000000000000000000000000000000..d9435fe92e5ec12f6372cdc13de625d75294607e
--- /dev/null
+++ b/ansible/roles/setup/tasks/namespaces.yml
@@ -0,0 +1,14 @@
+---
+
+- name: Create OAS namespaces
+  tags:
+    - kubernetes
+    - namespace
+  k8s:
+    name: '{{ item }}'
+    api_version: v1
+    kind: Namespace
+    state: present
+  with_items:
+    - 'oas'
+    - 'oas-apps'