diff --git a/.gitignore b/.gitignore
index 3328b85..a5a330b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,9 +2,9 @@ envrc
 out
 !deploy/.env
 .vagrant
-deploy/state/webroot/misc/osie/current/*
-deploy/state/webroot/workflow/*
-!deploy/state/webroot/misc/osie/current/.keep
-!deploy/state/webroot/workflow/.keep
-deploy/state/webroot/*.gz
+deploy/compose/state/webroot/misc/osie/current/*
+deploy/compose/state/webroot/workflow/*
+!deploy/compose/state/webroot/misc/osie/current/.keep
+!deploy/compose/state/webroot/workflow/.keep
+deploy/compose/state/webroot/*.gz
 workflow_id.txt
diff --git a/deploy/.env b/deploy/compose/.env
similarity index 100%
rename from deploy/.env
rename to deploy/compose/.env
diff --git a/deploy/docker-compose.yml b/deploy/compose/docker-compose.yml
similarity index 97%
rename from deploy/docker-compose.yml
rename to deploy/compose/docker-compose.yml
index f7bd6f3..5b5d233 100644
--- a/deploy/docker-compose.yml
+++ b/deploy/compose/docker-compose.yml
@@ -31,7 +31,7 @@ services:
     entrypoint: /scripts/lastmile.sh
     command: ["${OSIE_DOWNLOAD_URL}", "/source", "/source", "/destination"]
     volumes:
-      - ${REPO_TOP_LEVEL:-.}/compose/osie:/scripts
+      - ${REPO_TOP_LEVEL:-.}/osie:/scripts
       - ${REPO_TOP_LEVEL:-.}/state/webroot/misc/osie/current:/source
       - ${REPO_TOP_LEVEL:-.}/state/webroot/workflow:/destination
 
@@ -47,7 +47,7 @@ services:
         "/registry/registry_images.txt",
       ]
     volumes:
-      - ${REPO_TOP_LEVEL:-.}/compose/registry:/registry
+      - ${REPO_TOP_LEVEL:-.}/registry:/registry
     depends_on:
       registry:
         condition: service_healthy
@@ -83,7 +83,7 @@ services:
       TINKERBELL_GRPC_AUTHORITY: tink-server:42113
       TINKERBELL_CERT_URL: http://tink-server:42114/cert
     volumes:
-      - ${REPO_TOP_LEVEL:-.}/compose/manifests:/manifests
+      - ${REPO_TOP_LEVEL:-.}/manifests:/manifests
     depends_on:
       tink-server:
         condition: service_healthy
@@ -101,7 +101,7 @@ services:
         "/destination/focal-server-cloudimg-amd64.raw",
       ]
     volumes:
-      - ${REPO_TOP_LEVEL:-.}/compose/ubuntu:/scripts
+      - ${REPO_TOP_LEVEL:-.}/ubuntu:/scripts
       - ${REPO_TOP_LEVEL:-.}/state/webroot:/destination
 
   tink-server:
diff --git a/deploy/state/webroot/misc/osie/current/.keep b/deploy/compose/state/webroot/misc/osie/current/.keep
similarity index 100%
rename from deploy/state/webroot/misc/osie/current/.keep
rename to deploy/compose/state/webroot/misc/osie/current/.keep
diff --git a/deploy/state/webroot/workflow/.keep b/deploy/compose/state/webroot/workflow/.keep
similarity index 100%
rename from deploy/state/webroot/workflow/.keep
rename to deploy/compose/state/webroot/workflow/.keep
diff --git a/deploy/tls/ca-config.json b/deploy/compose/tls/ca-config.json
similarity index 100%
rename from deploy/tls/ca-config.json
rename to deploy/compose/tls/ca-config.json
diff --git a/deploy/tls/csr.json b/deploy/compose/tls/csr.json
similarity index 100%
rename from deploy/tls/csr.json
rename to deploy/compose/tls/csr.json
diff --git a/deploy/tls/generate.sh b/deploy/compose/tls/generate.sh
similarity index 100%
rename from deploy/tls/generate.sh
rename to deploy/compose/tls/generate.sh
diff --git a/deploy/vagrant/Vagrantfile b/deploy/vagrant/Vagrantfile
index 90faab6..5728905 100644
--- a/deploy/vagrant/Vagrantfile
+++ b/deploy/vagrant/Vagrantfile
@@ -35,12 +35,12 @@ Vagrant.configure("2") do |config|
       # vagrant plugin install vagrant-docker-compose
       override.vm.provision :docker_compose,
         compose_version: "1.29.1",
-        yml: "/vagrant/docker-compose.yml",
+        yml: "/vagrant/compose/docker-compose.yml",
         run:"always",
         env: {
           "TINKERBELL_HOST_IP": PROVISIONER_IP,
           "TINKERBELL_CLIENT_IP": MACHINE1_IP,
-          "REPO_TOP_LEVEL": "/vagrant",
+          "REPO_TOP_LEVEL": "/vagrant/compose",
           "TINKERBELL_HARDWARE_MANIFEST": "/manifests/hardware/hardware.json",
           "TINKERBELL_TEMPLATE_MANIFEST": "/manifests/template/ubuntu.yaml"
         }
@@ -51,12 +51,12 @@ Vagrant.configure("2") do |config|
       # vagrant plugin install vagrant-docker-compose
       override.vm.provision :docker_compose,
         compose_version: "1.29.1",
-        yml: "/vagrant/docker-compose.yml",
+        yml: "/vagrant/compose/docker-compose.yml",
         run:"always",
         env: {
           "TINKERBELL_HOST_IP": PROVISIONER_IP,
           "TINKERBELL_CLIENT_IP": MACHINE1_IP,
-          "REPO_TOP_LEVEL": "/vagrant",
+          "REPO_TOP_LEVEL": "/vagrant/compose",
           "TINKERBELL_HARDWARE_MANIFEST": "/manifests/hardware/hardware-libvirt.json",
           "TINKERBELL_TEMPLATE_MANIFEST": "/manifests/template/ubuntu-libvirt.yaml"
         }
diff --git a/docs/quickstarts/COMPOSE.md b/docs/quickstarts/COMPOSE.md
index c8f2a29..c9ce954 100644
--- a/docs/quickstarts/COMPOSE.md
+++ b/docs/quickstarts/COMPOSE.md
@@ -37,7 +37,7 @@ You will need to bring your own machines to provision.
 4. Start the provisioner
 
    ```bash
-   cd deploy
+   cd deploy/compose
    docker-compose up -d
    # This process will take about 5-10 minutes depending on your internet connection.
    # OSIE is about 2GB in size and the Ubuntu Focal image is about 500MB
@@ -181,7 +181,7 @@ You will need to bring your own machines to provision.
    ```bash
    # watch the workflow events and status for workflow completion
    # once the workflow is complete (see the expected output below for completion), move on to the next step
-   wid=$(cat compose/manifests/workflow/workflow_id.txt); docker exec -it deploy_tink-cli_1 watch "tink workflow events ${wid}; tink workflow state ${wid}"
+   wid=$(cat manifests/workflow/workflow_id.txt); docker exec -it compose_tink-cli_1 watch "tink workflow events ${wid}; tink workflow state ${wid}"
    ```
 
    <details>
diff --git a/docs/quickstarts/VAGRANTLVIRT.md b/docs/quickstarts/VAGRANTLVIRT.md
index f4865ce..6ad92a3 100644
--- a/docs/quickstarts/VAGRANTLVIRT.md
+++ b/docs/quickstarts/VAGRANTLVIRT.md
@@ -231,7 +231,7 @@ This option will also show you how to create a machine to provision.
    vagrant ssh provisioner
    # watch the workflow events and status for workflow completion
    # once the workflow is complete (see the expected output below for completion), move on to the next step
-   wid=$(cat /vagrant/compose/manifests/workflow/workflow_id.txt); docker exec -it vagrant_tink-cli_1 watch "tink workflow events ${wid}; tink workflow state ${wid}"
+   wid=$(cat /vagrant/compose/manifests/workflow/workflow_id.txt); docker exec -it compose_tink-cli_1 watch "tink workflow events ${wid}; tink workflow state ${wid}"
    ```
 
    <details>
diff --git a/docs/quickstarts/VAGRANTVBOX.md b/docs/quickstarts/VAGRANTVBOX.md
index ff66f25..97899c9 100644
--- a/docs/quickstarts/VAGRANTVBOX.md
+++ b/docs/quickstarts/VAGRANTVBOX.md
@@ -219,7 +219,7 @@ This option will also show you how to create a machine to provision.
    vagrant ssh provisioner
    # watch the workflow events and status for workflow completion
    # once the workflow is complete (see the expected output below for completion), move on to the next step
-   wid=$(cat /vagrant/compose/manifests/workflow/workflow_id.txt); docker exec -it vagrant_tink-cli_1 watch "tink workflow events ${wid}; tink workflow state ${wid}"
+   wid=$(cat /vagrant/compose/manifests/workflow/workflow_id.txt); docker exec -it compose_tink-cli_1 watch "tink workflow events ${wid}; tink workflow state ${wid}"
    ```
 
    <details>