14 files changed, 40 insertions, 40 deletions
diff --git a/spreadspace/common.yml b/spreadspace/common.yml
index 59024522..22997e3f 100644
--- a/spreadspace/common.yml
+++ b/spreadspace/common.yml
@@ -2,7 +2,7 @@
 - name: Basic Setup
   hosts: "{{ install_hostname }}"
   roles:
-  - role: base
-  - role: sshd
-  - role: zsh
+  - role: core/base
+  - role: core/sshd
+  - role: core/zsh
   - role: apt-repo/base
diff --git a/spreadspace/k8s-lwl.yml b/spreadspace/k8s-lwl.yml
index 3348894d..b928cbd5 100644
--- a/spreadspace/k8s-lwl.yml
+++ b/spreadspace/k8s-lwl.yml
@@ -2,9 +2,9 @@
 - name: Basic Node Setup
   hosts: k8s-lwl
   roles:
-  - role: base
-  - role: sshd
-  - role: zsh
+  - role: core/base
+  - role: core/sshd
+  - role: core/zsh
   - role: apt-repo/base
 
 - import_playbook: ../common/kubernetes-cluster-layout.yml
diff --git a/spreadspace/lendwirbel-live-xx.yml b/spreadspace/lendwirbel-live-xx.yml
index 8a5549e3..ccd7b962 100644
--- a/spreadspace/lendwirbel-live-xx.yml
+++ b/spreadspace/lendwirbel-live-xx.yml
@@ -2,9 +2,9 @@
 - name: Basic Setup
   hosts: "{{ install_hostname }}"
   roles:
-  - role: base
-  - role: sshd
-  - role: zsh
+  - role: core/base
+  - role: core/sshd
+  - role: core/zsh
   - role: apt-repo/base
   - role: apt-repo/spreadspace
   - role: acmetool/base
diff --git a/spreadspace/lw-dione.yml b/spreadspace/lw-dione.yml
index 1c38dc42..145a3915 100644
--- a/spreadspace/lw-dione.yml
+++ b/spreadspace/lw-dione.yml
@@ -2,9 +2,9 @@
 - name: Basic Setup
   hosts: lw-dione
   roles:
-  - role: base
-  - role: sshd
-  - role: zsh
+  - role: core/base
+  - role: core/sshd
+  - role: core/zsh
   - role: apt-repo/base
   - role: admin-user
   - role: blackmagic-desktopvideo
diff --git a/spreadspace/lw-helene.yml b/spreadspace/lw-helene.yml
index f1d816d1..757f9ff6 100644
--- a/spreadspace/lw-helene.yml
+++ b/spreadspace/lw-helene.yml
@@ -2,9 +2,9 @@
 - name: Basic Setup
   hosts: lw-helene
   roles:
-  - role: base
-  - role: sshd
-  - role: zsh
+  - role: core/base
+  - role: core/sshd
+  - role: core/zsh
   - role: apt-repo/base
   - role: admin-user
   - role: blackmagic-desktopvideo
diff --git a/spreadspace/lw-master.yml b/spreadspace/lw-master.yml
index 7862a6b6..8490dfa0 100644
--- a/spreadspace/lw-master.yml
+++ b/spreadspace/lw-master.yml
@@ -2,8 +2,8 @@
 - name: Basic Setup
   hosts: lw-master
   roles:
-  - role: base
-  - role: sshd
-  - role: zsh
+  - role: core/base
+  - role: core/sshd
+  - role: core/zsh
   - role: apt-repo/base
   - role: elevate/emc-stats
diff --git a/spreadspace/lw-telesto.yml b/spreadspace/lw-telesto.yml
index ebc4702e..53ad2a60 100644
--- a/spreadspace/lw-telesto.yml
+++ b/spreadspace/lw-telesto.yml
@@ -2,9 +2,9 @@
 - name: Basic Setup
   hosts: lw-telesto
   roles:
-  - role: base
-  - role: sshd
-  - role: zsh
+  - role: core/base
+  - role: core/sshd
+  - role: core/zsh
   - role: apt-repo/base
   - role: admin-user
   - role: blackmagic-desktopvideo
diff --git a/spreadspace/lw-thetys.yml b/spreadspace/lw-thetys.yml
index 7129803a..84885b31 100644
--- a/spreadspace/lw-thetys.yml
+++ b/spreadspace/lw-thetys.yml
@@ -2,9 +2,9 @@
 - name: Basic Setup
   hosts: lw-thetys
   roles:
-  - role: base
-  - role: sshd
-  - role: zsh
+  - role: core/base
+  - role: core/sshd
+  - role: core/zsh
   - role: apt-repo/base
   - role: admin-user
   - role: blackmagic-desktopvideo
diff --git a/spreadspace/s2-build.yml b/spreadspace/s2-build.yml
index 0fc9de6e..72e52acf 100644
--- a/spreadspace/s2-build.yml
+++ b/spreadspace/s2-build.yml
@@ -2,4 +2,4 @@
 - name: Basic Setup
   hosts: s2-build
   roles:
-  - role: zsh
+  - role: core/zsh
diff --git a/spreadspace/s2-calypso.yml b/spreadspace/s2-calypso.yml
index 7cf6086a..5f39bcfa 100644
--- a/spreadspace/s2-calypso.yml
+++ b/spreadspace/s2-calypso.yml
@@ -2,9 +2,9 @@
 - name: Basic Setup
   hosts: s2-calypso
   roles:
-  - role: base
-  - role: sshd
-  - role: zsh
+  - role: core/base
+  - role: core/sshd
+  - role: core/zsh
   - role: apt-repo/base
   - role: admin-user
   - role: apt-repo/spreadspace
diff --git a/spreadspace/s2-dione.yml b/spreadspace/s2-dione.yml
index a48af66c..0ada118f 100644
--- a/spreadspace/s2-dione.yml
+++ b/spreadspace/s2-dione.yml
@@ -2,9 +2,9 @@
 - name: Basic Setup
   hosts: s2-dione
   roles:
-  - role: base
-  - role: sshd
-  - role: zsh
+  - role: core/base
+  - role: core/sshd
+  - role: core/zsh
   - role: apt-repo/base
   - role: admin-user
   - role: apt-repo/spreadspace
diff --git a/spreadspace/s2-helene.yml b/spreadspace/s2-helene.yml
index a585bfcf..c0bc1100 100644
--- a/spreadspace/s2-helene.yml
+++ b/spreadspace/s2-helene.yml
@@ -2,9 +2,9 @@
 - name: Basic Setup
   hosts: s2-helene
   roles:
-  - role: base
-  - role: sshd
-  - role: zsh
+  - role: core/base
+  - role: core/sshd
+  - role: core/zsh
   - role: apt-repo/base
   - role: admin-user
   - role: apt-repo/spreadspace
diff --git a/spreadspace/s2-telesto.yml b/spreadspace/s2-telesto.yml
index 42b0305c..6ac4787e 100644
--- a/spreadspace/s2-telesto.yml
+++ b/spreadspace/s2-telesto.yml
@@ -2,9 +2,9 @@
 - name: Basic Setup
   hosts: s2-telesto
   roles:
-  - role: base
-  - role: sshd
-  - role: zsh
+  - role: core/base
+  - role: core/sshd
+  - role: core/zsh
   - role: apt-repo/base
   - role: admin-user
   - role: blackmagic-desktopvideo
diff --git a/spreadspace/s2-thetys.yml b/spreadspace/s2-thetys.yml
index 0c9ae79f..10da8f15 100644
--- a/spreadspace/s2-thetys.yml
+++ b/spreadspace/s2-thetys.yml
@@ -2,9 +2,9 @@
 - name: Basic Setup
   hosts: s2-thetys
   roles:
-  - role: base
-  - role: sshd
-  - role: zsh
+  - role: core/base
+  - role: core/sshd
+  - role: core/zsh
   - role: apt-repo/base
   - role: admin-user
   - role: apt-repo/spreadspace