diff --git a/Makefile b/Makefile
index fa7a440b..85b496c9 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ TESTENV_CMD ?= /bin/bash -c " \
 		&& rm -rf /etc/nginx/* \
 		&& cp -r /usr/share/kvmd/configs/nginx/* /etc/nginx \
 		&& mkdir -p /etc/kvmd \
-		&& cp /usr/share/kvmd/configs/kvmd/{meta.yaml,logging.yaml} /etc/kvmd \
+		&& cp /usr/share/kvmd/configs/kvmd/*.yaml /etc/kvmd \
 		&& cp /testenv/kvmd.yaml /etc/kvmd \
 		&& nginx -c /etc/nginx/nginx.conf \
 		&& ln -s $(TESTENV_VIDEO) /dev/kvmd-streamer \
diff --git a/configs/kvmd/kvmd.v1-hdmi.yaml b/configs/kvmd/platforms/kvmd.v1-hdmi.yaml
similarity index 100%
rename from configs/kvmd/kvmd.v1-hdmi.yaml
rename to configs/kvmd/platforms/kvmd.v1-hdmi.yaml
diff --git a/configs/kvmd/kvmd.v1-vga.yaml b/configs/kvmd/platforms/kvmd.v1-vga.yaml
similarity index 100%
rename from configs/kvmd/kvmd.v1-vga.yaml
rename to configs/kvmd/platforms/kvmd.v1-vga.yaml