diff --git a/daint.cscs.ch/codes/2ppafm.yaml b/daint.alps.cscs.ch/codes/2ppafm.yaml
similarity index 100%
rename from daint.cscs.ch/codes/2ppafm.yaml
rename to daint.alps.cscs.ch/codes/2ppafm.yaml
diff --git a/daint.cscs.ch/codes/cp2k-9.1-hybrid.yaml b/daint.alps.cscs.ch/codes/cp2k-9.1-hybrid.yaml
similarity index 100%
rename from daint.cscs.ch/codes/cp2k-9.1-hybrid.yaml
rename to daint.alps.cscs.ch/codes/cp2k-9.1-hybrid.yaml
diff --git a/daint.cscs.ch/codes/cp2k-9.1-multicore.yaml b/daint.alps.cscs.ch/codes/cp2k-9.1-multicore.yaml
similarity index 100%
rename from daint.cscs.ch/codes/cp2k-9.1-multicore.yaml
rename to daint.alps.cscs.ch/codes/cp2k-9.1-multicore.yaml
diff --git a/daint.cscs.ch/codes/dos-7.0-multicore.yaml b/daint.alps.cscs.ch/codes/dos-7.0-multicore.yaml
similarity index 100%
rename from daint.cscs.ch/codes/dos-7.0-multicore.yaml
rename to daint.alps.cscs.ch/codes/dos-7.0-multicore.yaml
diff --git a/daint.cscs.ch/codes/dos-7.2-hybrid.yaml b/daint.alps.cscs.ch/codes/dos-7.2-hybrid.yaml
similarity index 100%
rename from daint.cscs.ch/codes/dos-7.2-hybrid.yaml
rename to daint.alps.cscs.ch/codes/dos-7.2-hybrid.yaml
diff --git a/daint.cscs.ch/codes/hrstm.yaml b/daint.alps.cscs.ch/codes/hrstm.yaml
similarity index 100%
rename from daint.cscs.ch/codes/hrstm.yaml
rename to daint.alps.cscs.ch/codes/hrstm.yaml
diff --git a/daint.cscs.ch/codes/overlap.yaml b/daint.alps.cscs.ch/codes/overlap.yaml
similarity index 100%
rename from daint.cscs.ch/codes/overlap.yaml
rename to daint.alps.cscs.ch/codes/overlap.yaml
diff --git a/daint.cscs.ch/codes/pp-7.0-multicore.yaml b/daint.alps.cscs.ch/codes/pp-7.0-multicore.yaml
similarity index 100%
rename from daint.cscs.ch/codes/pp-7.0-multicore.yaml
rename to daint.alps.cscs.ch/codes/pp-7.0-multicore.yaml
diff --git a/daint.cscs.ch/codes/pp-7.2-hybrid.yaml b/daint.alps.cscs.ch/codes/pp-7.2-hybrid.yaml
similarity index 100%
rename from daint.cscs.ch/codes/pp-7.2-hybrid.yaml
rename to daint.alps.cscs.ch/codes/pp-7.2-hybrid.yaml
diff --git a/daint.cscs.ch/codes/ppafm.yaml b/daint.alps.cscs.ch/codes/ppafm.yaml
similarity index 100%
rename from daint.cscs.ch/codes/ppafm.yaml
rename to daint.alps.cscs.ch/codes/ppafm.yaml
diff --git a/daint.cscs.ch/codes/projwfc-7.0-multicore.yaml b/daint.alps.cscs.ch/codes/projwfc-7.0-multicore.yaml
similarity index 100%
rename from daint.cscs.ch/codes/projwfc-7.0-multicore.yaml
rename to daint.alps.cscs.ch/codes/projwfc-7.0-multicore.yaml
diff --git a/daint.cscs.ch/codes/projwfc-7.2-hybrid.yaml b/daint.alps.cscs.ch/codes/projwfc-7.2-hybrid.yaml
similarity index 100%
rename from daint.cscs.ch/codes/projwfc-7.2-hybrid.yaml
rename to daint.alps.cscs.ch/codes/projwfc-7.2-hybrid.yaml
diff --git a/daint.cscs.ch/codes/pw-7.0-multicore.yaml b/daint.alps.cscs.ch/codes/pw-7.0-multicore.yaml
similarity index 100%
rename from daint.cscs.ch/codes/pw-7.0-multicore.yaml
rename to daint.alps.cscs.ch/codes/pw-7.0-multicore.yaml
diff --git a/daint.cscs.ch/codes/pw-7.2-hybrid.yaml b/daint.alps.cscs.ch/codes/pw-7.2-hybrid.yaml
similarity index 100%
rename from daint.cscs.ch/codes/pw-7.2-hybrid.yaml
rename to daint.alps.cscs.ch/codes/pw-7.2-hybrid.yaml
diff --git a/daint.cscs.ch/codes/stm.yaml b/daint.alps.cscs.ch/codes/stm.yaml
similarity index 100%
rename from daint.cscs.ch/codes/stm.yaml
rename to daint.alps.cscs.ch/codes/stm.yaml
diff --git a/daint.cscs.ch/default b/daint.alps.cscs.ch/default
similarity index 100%
rename from daint.cscs.ch/default
rename to daint.alps.cscs.ch/default
diff --git a/daint.cscs.ch/hybrid-s1141/computer-configure.yaml b/daint.alps.cscs.ch/hybrid-s1141/computer-configure.yaml
similarity index 100%
rename from daint.cscs.ch/hybrid-s1141/computer-configure.yaml
rename to daint.alps.cscs.ch/hybrid-s1141/computer-configure.yaml
diff --git a/daint.cscs.ch/hybrid-s1141/computer-setup.yaml b/daint.alps.cscs.ch/hybrid-s1141/computer-setup.yaml
similarity index 100%
rename from daint.cscs.ch/hybrid-s1141/computer-setup.yaml
rename to daint.alps.cscs.ch/hybrid-s1141/computer-setup.yaml
diff --git a/daint.cscs.ch/hybrid/computer-configure.yaml b/daint.alps.cscs.ch/hybrid/computer-configure.yaml
similarity index 100%
rename from daint.cscs.ch/hybrid/computer-configure.yaml
rename to daint.alps.cscs.ch/hybrid/computer-configure.yaml
diff --git a/daint.cscs.ch/hybrid/computer-setup.yaml b/daint.alps.cscs.ch/hybrid/computer-setup.yaml
similarity index 100%
rename from daint.cscs.ch/hybrid/computer-setup.yaml
rename to daint.alps.cscs.ch/hybrid/computer-setup.yaml
diff --git a/daint.cscs.ch/multicore-em01/computer-configure.yaml b/daint.alps.cscs.ch/multicore-em01/computer-configure.yaml
similarity index 100%
rename from daint.cscs.ch/multicore-em01/computer-configure.yaml
rename to daint.alps.cscs.ch/multicore-em01/computer-configure.yaml
diff --git a/daint.cscs.ch/multicore-em01/computer-setup.yaml b/daint.alps.cscs.ch/multicore-em01/computer-setup.yaml
similarity index 100%
rename from daint.cscs.ch/multicore-em01/computer-setup.yaml
rename to daint.alps.cscs.ch/multicore-em01/computer-setup.yaml
diff --git a/daint.cscs.ch/multicore/computer-configure.yaml b/daint.alps.cscs.ch/multicore/computer-configure.yaml
similarity index 100%
rename from daint.cscs.ch/multicore/computer-configure.yaml
rename to daint.alps.cscs.ch/multicore/computer-configure.yaml
diff --git a/daint.cscs.ch/multicore/computer-setup.yaml b/daint.alps.cscs.ch/multicore/computer-setup.yaml
similarity index 100%
rename from daint.cscs.ch/multicore/computer-setup.yaml
rename to daint.alps.cscs.ch/multicore/computer-setup.yaml
diff --git a/eiger.cscs.ch/codes/dos-6.8-multicore.yaml b/eiger.alps.cscs.ch/codes/dos-6.8-multicore.yaml
similarity index 100%
rename from eiger.cscs.ch/codes/dos-6.8-multicore.yaml
rename to eiger.alps.cscs.ch/codes/dos-6.8-multicore.yaml
diff --git a/eiger.cscs.ch/codes/projwfc-6.8-multicore.yaml b/eiger.alps.cscs.ch/codes/projwfc-6.8-multicore.yaml
similarity index 100%
rename from eiger.cscs.ch/codes/projwfc-6.8-multicore.yaml
rename to eiger.alps.cscs.ch/codes/projwfc-6.8-multicore.yaml
diff --git a/eiger.cscs.ch/codes/pw-6.8-multicore.yaml b/eiger.alps.cscs.ch/codes/pw-6.8-multicore.yaml
similarity index 100%
rename from eiger.cscs.ch/codes/pw-6.8-multicore.yaml
rename to eiger.alps.cscs.ch/codes/pw-6.8-multicore.yaml
diff --git a/eiger.cscs.ch/default b/eiger.alps.cscs.ch/default
similarity index 100%
rename from eiger.cscs.ch/default
rename to eiger.alps.cscs.ch/default
diff --git a/eiger.cscs.ch/multicore-mr0-debug/computer-configure.yaml b/eiger.alps.cscs.ch/multicore-mr0-debug/computer-configure.yaml
similarity index 100%
rename from eiger.cscs.ch/multicore-mr0-debug/computer-configure.yaml
rename to eiger.alps.cscs.ch/multicore-mr0-debug/computer-configure.yaml
diff --git a/eiger.cscs.ch/multicore-mr0-debug/computer-setup.yaml b/eiger.alps.cscs.ch/multicore-mr0-debug/computer-setup.yaml
similarity index 100%
rename from eiger.cscs.ch/multicore-mr0-debug/computer-setup.yaml
rename to eiger.alps.cscs.ch/multicore-mr0-debug/computer-setup.yaml
diff --git a/eiger.cscs.ch/multicore-mr0/computer-configure.yaml b/eiger.alps.cscs.ch/multicore-mr0/computer-configure.yaml
similarity index 100%
rename from eiger.cscs.ch/multicore-mr0/computer-configure.yaml
rename to eiger.alps.cscs.ch/multicore-mr0/computer-configure.yaml
diff --git a/eiger.cscs.ch/multicore-mr0/computer-setup.yaml b/eiger.alps.cscs.ch/multicore-mr0/computer-setup.yaml
similarity index 100%
rename from eiger.cscs.ch/multicore-mr0/computer-setup.yaml
rename to eiger.alps.cscs.ch/multicore-mr0/computer-setup.yaml