diff --git a/Dockerfile.bookworm b/Dockerfile.bookworm
index 6d172f6..3ce6e5d 100644
--- a/Dockerfile.bookworm
+++ b/Dockerfile.bookworm
@@ -17,7 +17,7 @@ RUN git clone https://github.com/pimvanpelt/vppcfg.git && cd vppcfg && python3 -
     pip install --break-system-packages dist/vppcfg-*-py3-none-any.whl
 
 # Config files
-COPY files/startup.conf files/*.vpp /etc/vpp/
+COPY files/etc/vpp/* /etc/vpp/
 COPY files/init-container.sh /sbin/
 RUN chmod 755 /sbin/init-container.sh
 CMD ["/sbin/init-container.sh"]
diff --git a/files/bootstrap.vpp b/files/etc/vpp/bootstrap.vpp
similarity index 100%
rename from files/bootstrap.vpp
rename to files/etc/vpp/bootstrap.vpp
diff --git a/files/clab.vpp b/files/etc/vpp/clab.vpp
similarity index 100%
rename from files/clab.vpp
rename to files/etc/vpp/clab.vpp
diff --git a/files/manual-post.vpp b/files/etc/vpp/manual-post.vpp
similarity index 100%
rename from files/manual-post.vpp
rename to files/etc/vpp/manual-post.vpp
diff --git a/files/manual-pre.vpp b/files/etc/vpp/manual-pre.vpp
similarity index 100%
rename from files/manual-pre.vpp
rename to files/etc/vpp/manual-pre.vpp
diff --git a/files/startup.conf b/files/etc/vpp/startup.conf
similarity index 100%
rename from files/startup.conf
rename to files/etc/vpp/startup.conf