diff --git a/molecule/clients/molecule.yml b/molecule/clients/molecule.yml
index 7fb7b9c..ea756e2 100644
--- a/molecule/clients/molecule.yml
+++ b/molecule/clients/molecule.yml
@@ -39,11 +39,15 @@ platforms:
     image: centos:7
     networks:
       - name: ${MOLECULE_SCENARIO_NAME}-borg
+    groups:
+      - centos
   - name: ${MOLECULE_SCENARIO_NAME}-cc6
     hostname: ${MOLECULE_SCENARIO_NAME}-cc6
     image: centos:6
     networks:
       - name: ${MOLECULE_SCENARIO_NAME}-borg
+    groups:
+      - centos
   - name: ${MOLECULE_SCENARIO_NAME}-sds
     hostname: ${MOLECULE_SCENARIO_NAME}-sds
     image: debian:stretch
diff --git a/molecule/folders/molecule.yml b/molecule/folders/molecule.yml
index f22c8f2..0f6369c 100644
--- a/molecule/folders/molecule.yml
+++ b/molecule/folders/molecule.yml
@@ -9,8 +9,6 @@ platforms:
     image: debian:stretch
     networks:
       - name: ${MOLECULE_SCENARIO_NAME}-borg
-    groups:
-      - lamp
   - name: ${MOLECULE_SCENARIO_NAME}-sds
     hostname: ${MOLECULE_SCENARIO_NAME}-sds
     image: debian:stretch
diff --git a/molecule/generic_files/prepare.yml b/molecule/generic_files/prepare.yml
index 7bc50f0..8682ee8 100644
--- a/molecule/generic_files/prepare.yml
+++ b/molecule/generic_files/prepare.yml
@@ -10,8 +10,8 @@
 #   - name: start sshd
 #     command: service sshd start
 
-- name: prepare lamp
-  hosts: lamp
+- name: prepare all
+  hosts: all:!borgbackup_servers:!centos
   tasks:
     - name: Install required packages
       apt: