diff --git a/.gitignore b/.gitignore
index bb9380c..96100cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,5 @@
-*.nas-compose.env
\ No newline at end of file
+*.nas-compose.env
+*/secrets/*
+!*/secrets/README.md
+*/volumes/*/*
+!*/volumes/*/.gitkeep
diff --git a/bootstrap.docker-compose.local.yml b/bootstrap/bootstrap.docker-compose.local.yml
similarity index 100%
rename from bootstrap.docker-compose.local.yml
rename to bootstrap/bootstrap.docker-compose.local.yml
diff --git a/bootstrap.docker-compose.macvlan.yml b/bootstrap/bootstrap.docker-compose.macvlan.yml
similarity index 100%
rename from bootstrap.docker-compose.macvlan.yml
rename to bootstrap/bootstrap.docker-compose.macvlan.yml
diff --git a/bootstrap.docker-compose.yml b/bootstrap/bootstrap.docker-compose.yml
similarity index 88%
rename from bootstrap.docker-compose.yml
rename to bootstrap/bootstrap.docker-compose.yml
index 147bff8..ce98d7c 100644
--- a/bootstrap.docker-compose.yml
+++ b/bootstrap/bootstrap.docker-compose.yml
@@ -42,10 +42,10 @@ volumes:
     driver_opts:
       type: none
       o: bind
-      device: ${NASCOMPOSE_SERVICES?}/volumes/portainer/data/
+      device: ${NASCOMPOSE_SERVICES?}/portainer/volumes/data/
     labels:
       nas-compose.boostrap: true
 
 secrets:
   portainer_password:
-    file: ${NASCOMPOSE_SERVICES?}/secrets/portainer/portainer_password
+    file: ${NASCOMPOSE_SERVICES?}/portainer/secrets/portainer_password
diff --git a/docker/secrets/portainer/README.md b/bootstrap/secrets/README.md
similarity index 100%
rename from docker/secrets/portainer/README.md
rename to bootstrap/secrets/README.md
diff --git a/docker/volumes/portainer/data/.gitkeep b/bootstrap/volumes/portainer_data/.gitkeep
similarity index 100%
rename from docker/volumes/portainer/data/.gitkeep
rename to bootstrap/volumes/portainer_data/.gitkeep