diff --git a/data/slurm/home/config/slurm.conf b/data/slurm/home/config/slurm.conf
index b6059e0..caa130b 100644
--- a/data/slurm/home/config/slurm.conf
+++ b/data/slurm/home/config/slurm.conf
@@ -8,14 +8,14 @@ SlurmUser=slurm
 SlurmctldPort=6817
 SlurmdPort=6818
 MpiDefault=none
-ProctrackType=proctrack/cgroup
+ProctrackType=proctrack/linuxproc
 ReturnToService=1
 SlurmctldPidFile=/var/run/slurmctld.pid
 SlurmdPidFile=/var/run/slurmd.pid
 SlurmdSpoolDir=/var/spool/slurm/d
 StateSaveLocation=/var/spool/slurm/ctld
 SwitchType=switch/none
-TaskPlugin=task/affinity,task/cgroup
+TaskPlugin=task/affinity
 #
 # TIMERS
 InactiveLimit=0
@@ -37,7 +37,7 @@ AccountingStorageUser=slurm
 AccountingStoreFlags=job_script,job_comment,job_env,job_extra
 JobCompType=jobcomp/none
 JobAcctGatherFrequency=30
-JobAcctGatherType=jobacct_gather/cgroup
+JobAcctGatherType=jobacct_gather/linux
 SlurmctldDebug=info
 SlurmctldLogFile=/var/log/slurmctld.log
 SlurmdDebug=info
diff --git a/home/config/slurm.conf b/home/config/slurm.conf
deleted file mode 100644
index b6059e0..0000000
--- a/home/config/slurm.conf
+++ /dev/null
@@ -1,48 +0,0 @@
-# slurm.conf file generated by configurator.html.
-# Put this file on all nodes of your cluster.
-# See the slurm.conf man page for more information.
-#
-ClusterName=snowflake
-SlurmctldHost=slurmctld
-SlurmUser=slurm
-SlurmctldPort=6817
-SlurmdPort=6818
-MpiDefault=none
-ProctrackType=proctrack/cgroup
-ReturnToService=1
-SlurmctldPidFile=/var/run/slurmctld.pid
-SlurmdPidFile=/var/run/slurmd.pid
-SlurmdSpoolDir=/var/spool/slurm/d
-StateSaveLocation=/var/spool/slurm/ctld
-SwitchType=switch/none
-TaskPlugin=task/affinity,task/cgroup
-#
-# TIMERS
-InactiveLimit=0
-KillWait=30
-MinJobAge=300
-SlurmctldTimeout=120
-SlurmdTimeout=300
-Waittime=0
-#
-# SCHEDULING
-SchedulerType=sched/backfill
-SelectType=select/cons_tres
-#
-# LOGGING AND ACCOUNTING
-AccountingStorageHost=slurmdb
-AccountingStoragePort=6819
-AccountingStorageType=accounting_storage/slurmdbd
-AccountingStorageUser=slurm
-AccountingStoreFlags=job_script,job_comment,job_env,job_extra
-JobCompType=jobcomp/none
-JobAcctGatherFrequency=30
-JobAcctGatherType=jobacct_gather/cgroup
-SlurmctldDebug=info
-SlurmctldLogFile=/var/log/slurmctld.log
-SlurmdDebug=info
-SlurmdLogFile=/var/log/slurmd.log
-#
-# COMPUTE NODES
-NodeName=node0[1-2] CPUs=1 State=UNKNOWN
-PartitionName=main Nodes=ALL Default=YES MaxTime=INFINITE State=UP
diff --git a/home/config/slurmdbd.conf b/home/config/slurmdbd.conf
deleted file mode 100644
index 35838b9..0000000
--- a/home/config/slurmdbd.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-# Archive info
-#ArchiveJobs=yes
-#ArchiveDir="/tmp"
-#ArchiveSteps=yes
-#ArchiveScript=
-#JobPurge=12
-#StepPurge=1
-#
-# Authentication info
-AuthType=auth/munge
-AuthInfo=/var/run/munge/munge.socket.2
-#
-# slurmDBD info
-DbdAddr=slurmdb
-DbdHost=slurmdb
-DbdPort=6819
-SlurmUser=slurm
-DebugLevel=4
-LogFile=/var/log/slurm/slurmdbd.log
-PidFile=/var/run/slurmdbd.pid
-#PluginDir=/usr/lib/slurm
-#PrivateData=accounts,users,usage,jobs
-#TrackWCKey=yes
-#
-# Database info
-StorageType=accounting_storage/mysql
-StorageHost=slurmdb
-StoragePort=3306
-StoragePass=demo
-StorageUser=slurm
-StorageLoc=slurm_acct_db
diff --git a/slurm/controller/Makefile b/slurm/controller/Makefile
deleted file mode 100644
index f4b5499..0000000
--- a/slurm/controller/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-
-SLURM_VERSION = 19.05.1
-IMAGE = scidas/slurm.controller
-
-.PHONY: all build clean test
-
-
-all: build
-
-build:
-	docker build -t $(IMAGE):$(SLURM_VERSION) .
-
-clean:
-	@[ -z $(docker images -q $(IMAGE):$(SLURM_VERSION)) ] || docker rmi $(IMAGE):$(SLURM_VERSION)
diff --git a/slurm/controller/README.md b/slurm/controller/README.md
deleted file mode 100644
index 74c15d3..0000000
--- a/slurm/controller/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Slurm Controller
-
-TODO
diff --git a/slurm/database/Makefile b/slurm/database/Makefile
deleted file mode 100644
index 6ae70e3..0000000
--- a/slurm/database/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-
-SLURM_VERSION = 19.05.1
-IMAGE = scidas/slurm.database
-
-.PHONY: all build clean test
-
-
-all: build
-
-build:
-	docker build -t $(IMAGE):$(SLURM_VERSION) .
-
-clean:
-	@[ -z $(docker images -q $(IMAGE):$(SLURM_VERSION)) ] || docker rmi $(IMAGE):$(SLURM_VERSION)
diff --git a/slurm/database/README.md b/slurm/database/README.md
deleted file mode 100644
index f00dfd9..0000000
--- a/slurm/database/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Slurm Database
-
-TODO
diff --git a/slurm/worker/Makefile b/slurm/worker/Makefile
deleted file mode 100644
index 5b03cf7..0000000
--- a/slurm/worker/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-
-SLURM_VERSION = 19.05.1
-IMAGE = scidas/slurm.worker
-
-.PHONY: all build clean test
-
-all: build
-
-build:
-	docker build -t $(IMAGE):$(SLURM_VERSION) .
-
-clean:
-	@[ -z $(docker images -q $(IMAGE):$(SLURM_VERSION)) ] || docker rmi $(IMAGE):$(SLURM_VERSION)
diff --git a/slurm/worker/README.md b/slurm/worker/README.md
deleted file mode 100644
index 4f897ec..0000000
--- a/slurm/worker/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Slurm Worker
-
-TODO
diff --git a/templates/docker-compose.yml.default b/templates/docker-compose.yml.default
deleted file mode 100644
index 146d8fc..0000000
--- a/templates/docker-compose.yml.default
+++ /dev/null
@@ -1,75 +0,0 @@
-services:
-  nats:
-    container_name: cc-nats
-    image: nats:alpine
-    ports:
-      - "4222:4222"
-      - "8222:8222"
-
-  cc-metric-store:
-    container_name: cc-metric-store
-    build:
-      context: ./cc-metric-store
-    ports:
-      - "8084:8084"
-    volumes:
-      - ${DATADIR}/cc-metric-store:/data
-    depends_on:
-      - nats
-
-  influxdb:
-    container_name: cc-influxdb
-    image: influxdb
-    command: ["--reporting-disabled"]
-    environment:
-      DOCKER_INFLUXDB_INIT_MODE: setup
-      DOCKER_INFLUXDB_INIT_USERNAME: devel
-      DOCKER_INFLUXDB_INIT_PASSWORD: ${INFLUXDB_PASSWORD}
-      DOCKER_INFLUXDB_INIT_ORG: ${INFLUXDB_ORG}
-      DOCKER_INFLUXDB_INIT_BUCKET: ${INFLUXDB_BUCKET}
-      DOCKER_INFLUXDB_INIT_RETENTION: 100w
-      DOCKER_INFLUXDB_INIT_ADMIN_TOKEN: ${INFLUXDB_ADMIN_TOKEN}
-    ports:
-      - "127.0.0.1:${INFLUXDB_PORT}:8086"
-    volumes:
-      - ${DATADIR}/influxdb/data:/var/lib/influxdb2
-      - ${DATADIR}/influxdb/config:/etc/influxdb2
-
-  openldap:
-    container_name: cc-ldap
-    image: osixia/openldap:1.5.0
-    command: --copy-service --loglevel debug
-    environment:
-      - LDAP_ADMIN_PASSWORD=${LDAP_ADMIN_PASSWORD}
-      - LDAP_ORGANISATION=${LDAP_ORGANISATION}
-      - LDAP_DOMAIN=${LDAP_DOMAIN}
-    volumes:
-      - ${DATADIR}/ldap:/container/service/slapd/assets/config/bootstrap/ldif/custom
-
-  db:
-    container_name: cc-db
-    image: mariadb:latest
-    command: ["--default-authentication-plugin=mysql_native_password"]
-    environment:
-      MARIADB_ROOT_PASSWORD: ${MARIADB_ROOT_PASSWORD}
-      MARIADB_DATABASE: ${MARIADB_DATABASE}
-      MARIADB_USER: ${MARIADB_USER}
-      MARIADB_PASSWORD: ${MARIADB_PASSWORD}
-    ports:
-      - "127.0.0.1:${MARIADB_PORT}:3306"
-    # volumes:
-      # - ${DATADIR}/sql-init:/docker-entrypoint-initdb.d
-    cap_add:
-      - SYS_NICE
-
-  phpmyadmin:
-    container_name: cc-phpmyadmin
-    image: phpmyadmin
-    environment:
-      - PMA_HOST=cc-db
-      - PMA_USER=root
-      - PMA_PASSWORD=${MARIADB_ROOT_PASSWORD}
-    ports:
-      - "127.0.0.1:${PHPMYADMIN_PORT}:80"
-    depends_on:
-      - db
diff --git a/templates/docker-compose.yml.mysql b/templates/docker-compose.yml.mysql
deleted file mode 100644
index 372617b..0000000
--- a/templates/docker-compose.yml.mysql
+++ /dev/null
@@ -1,29 +0,0 @@
-services:
-  db:
-    container_name: cc-db
-    image: mysql:8.0.22
-    command: ["--default-authentication-plugin=mysql_native_password"]
-    environment:
-      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
-      MYSQL_DATABASE: ${MYSQL_DATABASE}
-      MYSQL_USER: ${MYSQL_USER}
-      MYSQL_PASSWORD: ${MYSQL_PASSWORD}
-    ports:
-      - "127.0.0.1:${MYSQL_PORT}:3306"
-    # volumes:
-      # - ${DATADIR}/sql-init:/docker-entrypoint-initdb.d
-      # - ${DATADIR}/sqldata:/var/lib/mysql
-    cap_add:
-      - SYS_NICE
-
-  phpmyadmin:
-    container_name: cc-phpmyadmin
-    image: phpmyadmin
-    environment:
-      - PMA_HOST=cc-db
-      - PMA_USER=root
-      - PMA_PASSWORD=${MYSQL_ROOT_PASSWORD}
-    ports:
-      - "127.0.0.1:${PHPMYADMIN_PORT}:80"
-    depends_on:
-      - db
diff --git a/templates/env.default b/templates/env.default
deleted file mode 100644
index 3fe251d..0000000
--- a/templates/env.default
+++ /dev/null
@@ -1,40 +0,0 @@
-########################################################################
-# CCBACKEND DEVEL DOCKER SETTINGS
-########################################################################
-
-########################################################################
-# INFLUXDB
-########################################################################
-INFLUXDB_PORT=8086
-INFLUXDB_PASSWORD=1bc8777daad29d2f05eb77b7571fd8a1
-INFLUXDB_ADMIN_TOKEN=74008ea2a8dad5e6f856838a90c6392e
-INFLUXDB_ORG=ClusterCockpit
-INFLUXDB_BUCKET=ClusterCockpit
-# Whether or not to check SSL Cert in Symfony Client, Default: false
-INFLUXDB_SSL=false
-
-########################################################################
-# MARIADB
-########################################################################
-MARIADB_ROOT_PASSWORD=root
-MARIADB_DATABASE=ClusterCockpit
-MARIADB_USER=clustercockpit
-MARIADB_PASSWORD=clustercockpit
-MARIADB_PORT=3306
-
-#########################################
-# LDAP
-########################################################################
-LDAP_ADMIN_PASSWORD=mashup
-LDAP_ORGANISATION=NHR@FAU
-LDAP_DOMAIN=rrze.uni-erlangen.de
-
-########################################################################
-# PHPMyAdmin
-########################################################################
-PHPMYADMIN_PORT=8081
-
-########################################################################
-# INTERNAL SETTINGS
-########################################################################
-DATADIR=./data
diff --git a/templates/env.mysql b/templates/env.mysql
deleted file mode 100644
index c8c8939..0000000
--- a/templates/env.mysql
+++ /dev/null
@@ -1,17 +0,0 @@
-########################################################################
-# ADDITIONAL ENV VARIABLES FOR MYSQL AND PHPMYADMIN CONTAINERS
-########################################################################
-
-########################################################################
-# MySQL
-########################################################################
-MYSQL_ROOT_PASSWORD=root
-MYSQL_DATABASE=ClusterCockpit
-MYSQL_USER=clustercockpit
-MYSQL_PASSWORD=clustercockpit
-MYSQL_PORT=3306
-
-########################################################################
-# PHPMyAdmin
-########################################################################
-PHPMYADMIN_PORT=8081