diff --git a/.gitea/workflows/01-deploy-proxmox-infra.yaml b/.gitea/workflows/01-deploy-proxmox-infra.yaml
index d24e15d..3a617c9 100644
--- a/.gitea/workflows/01-deploy-proxmox-infra.yaml
+++ b/.gitea/workflows/01-deploy-proxmox-infra.yaml
@@ -6,13 +6,13 @@ on:
     branches:
       - main
     paths:
-      - 'proxmox-infra/**'
+      - '01-proxmox-infra/**'
       - '.gitea/workflows/**'
   pull_request:
     branches:
       - main
     paths:
-      - 'proxmox-infra/**'
+      - '01-proxmox-infra/**'
       - '.gitea/workflows/**'
 
 jobs:
@@ -32,35 +32,35 @@ jobs:
       - name: Cache node_modules
         uses: actions/cache@v4
         with:
-          path: proxmox-infra/node_modules
-          key: ${{ runner.os }}-npm-${{ hashFiles('proxmox-infra/package-lock.json') }}
+          path: 01-proxmox-infra/node_modules
+          key: ${{ runner.os }}-npm-${{ hashFiles('01-proxmox-infra/package-lock.json') }}
 
       - name: Cache pfSense SDK
         uses: actions/cache@v4
         with:
-          path: proxmox-infra/sdks
+          path: 01-proxmox-infra/sdks
           key: pfsense-sdk-0.22.0
 
       - name: Restore Stack Config
-        run: echo "${{ secrets.PROXMOX_INFRA_PULUMI_DEV_YAML }}" | base64 -d > proxmox-infra/Pulumi.dev.yaml
+        run: echo "${{ secrets.PROXMOX_INFRA_PULUMI_DEV_YAML }}" | base64 -d > 01-proxmox-infra/Pulumi.dev.yaml
 
       - name: Install Dependencies
         run: npm ci
-        working-directory: proxmox-infra
+        working-directory: 01-proxmox-infra
 
       - name: Install Pulumi CLI
         run: curl -fsSL https://get.pulumi.com | sh && echo "$HOME/.pulumi/bin" >> $GITHUB_PATH
 
       - name: Generate Local pfSense SDK
         run: pulumi package add terraform-provider marshallford/pfsense@0.22.0
-        working-directory: proxmox-infra
+        working-directory: 01-proxmox-infra
 
       - name: Preview
         uses: pulumi/actions@v5
         with:
           command: preview
           stack-name: dev
-          work-dir: proxmox-infra
+          work-dir: 01-proxmox-infra
           cloud-url: ${{ secrets.PULUMI_BACKEND_URL }}
         env:
           PULUMI_CONFIG_PASSPHRASE: ${{ secrets.PULUMI_CONFIG_PASSPHRASE }}
@@ -81,35 +81,35 @@ jobs:
       - name: Cache node_modules
         uses: actions/cache@v4
         with:
-          path: proxmox-infra/node_modules
-          key: ${{ runner.os }}-npm-${{ hashFiles('proxmox-infra/package-lock.json') }}
+          path: 01-proxmox-infra/node_modules
+          key: ${{ runner.os }}-npm-${{ hashFiles('01-proxmox-infra/package-lock.json') }}
 
       - name: Cache pfSense SDK
         uses: actions/cache@v4
         with:
-          path: proxmox-infra/sdks
+          path: 01-proxmox-infra/sdks
           key: pfsense-sdk-0.22.0
 
       - name: Restore Stack Config
-        run: echo "${{ secrets.PROXMOX_INFRA_PULUMI_DEV_YAML }}" | base64 -d > proxmox-infra/Pulumi.dev.yaml
+        run: echo "${{ secrets.PROXMOX_INFRA_PULUMI_DEV_YAML }}" | base64 -d > 01-proxmox-infra/Pulumi.dev.yaml
 
       - name: Install Dependencies
         run: npm ci
-        working-directory: proxmox-infra
+        working-directory: 01-proxmox-infra
 
       - name: Install Pulumi CLI
         run: curl -fsSL https://get.pulumi.com | sh && echo "$HOME/.pulumi/bin" >> $GITHUB_PATH
 
       - name: Generate Local pfSense SDK
         run: pulumi package add terraform-provider marshallford/pfsense@0.22.0
-        working-directory: proxmox-infra
+        working-directory: 01-proxmox-infra
 
       - name: Refresh State
         uses: pulumi/actions@v5
         with:
           command: refresh
           stack-name: dev
-          work-dir: proxmox-infra
+          work-dir: 01-proxmox-infra
           cloud-url: ${{ secrets.PULUMI_BACKEND_URL }}
         env:
           PULUMI_CONFIG_PASSPHRASE: ${{ secrets.PULUMI_CONFIG_PASSPHRASE }}
@@ -119,7 +119,7 @@ jobs:
         with:
           command: up
           stack-name: dev
-          work-dir: proxmox-infra
+          work-dir: 01-proxmox-infra
           cloud-url: ${{ secrets.PULUMI_BACKEND_URL }}
         env:
           PULUMI_CONFIG_PASSPHRASE: ${{ secrets.PULUMI_CONFIG_PASSPHRASE }}
diff --git a/.gitea/workflows/02-deploy-k8s-bootstrap.yaml b/.gitea/workflows/02-deploy-k8s-bootstrap.yaml
index 6bf57ea..68b5e5b 100644
--- a/.gitea/workflows/02-deploy-k8s-bootstrap.yaml
+++ b/.gitea/workflows/02-deploy-k8s-bootstrap.yaml
@@ -6,14 +6,14 @@ on:
     branches:
       - main
     paths:
-      - "k8s-bootstrap/**"
-      - ".gitea/workflows/deploy-k8s-bootstrap.yaml"
+      - "02-k8s-bootstrap/**"
+      - ".gitea/workflows/02-deploy-k8s-bootstrap.yaml"
   pull_request:
     branches:
       - main
     paths:
-      - "k8s-bootstrap/**"
-      - ".gitea/workflows/deploy-k8s-bootstrap.yaml"
+      - "02-k8s-bootstrap/**"
+      - ".gitea/workflows/02-deploy-k8s-bootstrap.yaml"
 
 jobs:
   preview:
@@ -30,18 +30,18 @@ jobs:
           node-version: "24"
 
       - name: Restore Stack Config
-        run: echo "${{ secrets.K8S_BOOTSTRAP_PULUMI_DEV_YAML }}" | base64 -d > k8s-bootstrap/Pulumi.dev.yaml
+        run: echo "${{ secrets.K8S_BOOTSTRAP_PULUMI_DEV_YAML }}" | base64 -d > 02-k8s-bootstrap/Pulumi.dev.yaml
 
       - name: Install Dependencies
         run: npm install
-        working-directory: k8s-bootstrap
+        working-directory: 02-k8s-bootstrap
 
       - name: Preview
         uses: pulumi/actions@v5
         with:
           command: preview
           stack-name: dev
-          work-dir: k8s-bootstrap
+          work-dir: 02-k8s-bootstrap
           cloud-url: ${{ secrets.PULUMI_BACKEND_URL }}
         env:
           PULUMI_CONFIG_PASSPHRASE: ${{ secrets.PULUMI_CONFIG_PASSPHRASE }}
@@ -60,18 +60,18 @@ jobs:
           node-version: "24"
 
       - name: Restore Stack Config
-        run: echo "${{ secrets.K8S_BOOTSTRAP_PULUMI_DEV_YAML }}" | base64 -d > k8s-bootstrap/Pulumi.dev.yaml
+        run: echo "${{ secrets.K8S_BOOTSTRAP_PULUMI_DEV_YAML }}" | base64 -d > 02-k8s-bootstrap/Pulumi.dev.yaml
 
       - name: Install Dependencies
         run: npm install
-        working-directory: k8s-bootstrap
+        working-directory: 02-k8s-bootstrap
 
       - name: Refresh State
         uses: pulumi/actions@v5
         with:
           command: refresh
           stack-name: dev
-          work-dir: k8s-bootstrap
+          work-dir: 02-k8s-bootstrap
           cloud-url: ${{ secrets.PULUMI_BACKEND_URL }}
         env:
           PULUMI_CONFIG_PASSPHRASE: ${{ secrets.PULUMI_CONFIG_PASSPHRASE }}
@@ -81,7 +81,7 @@ jobs:
         with:
           command: up
           stack-name: dev
-          work-dir: k8s-bootstrap
+          work-dir: 02-k8s-bootstrap
           cloud-url: ${{ secrets.PULUMI_BACKEND_URL }}
         env:
           PULUMI_CONFIG_PASSPHRASE: ${{ secrets.PULUMI_CONFIG_PASSPHRASE }}
diff --git a/.gitea/workflows/03-deploy-k8s-infra.yaml b/.gitea/workflows/03-deploy-k8s-infra.yaml
index 2b60812..2453648 100644
--- a/.gitea/workflows/03-deploy-k8s-infra.yaml
+++ b/.gitea/workflows/03-deploy-k8s-infra.yaml
@@ -6,13 +6,13 @@ on:
     branches:
       - main
     paths:
-      - 'k8s-infra/**'
+      - '03-k8s-infra/**'
       - '.gitea/workflows/**'
   pull_request:
     branches:
       - main
     paths:
-      - 'k8s-infra/**'
+      - '03-k8s-infra/**'
       - '.gitea/workflows/**'
 
 jobs:
@@ -30,21 +30,21 @@ jobs:
           node-version: '24'
 
       - name: Restore Stack Config
-        run: echo "${{ secrets.K8S_INFRA_PULUMI_DEV_YAML }}" | base64 -d > k8s-infra/Pulumi.dev.yaml
+        run: echo "${{ secrets.K8S_INFRA_PULUMI_DEV_YAML }}" | base64 -d > 03-k8s-infra/Pulumi.dev.yaml
 
       - name: Install Helm
         uses: azure/setup-helm@v4
 
       - name: Install Dependencies
         run: npm ci
-        working-directory: k8s-infra
+        working-directory: 03-k8s-infra
 
       - name: Preview
         uses: pulumi/actions@v5
         with:
           command: preview
           stack-name: dev
-          work-dir: k8s-infra
+          work-dir: 03-k8s-infra
           cloud-url: ${{ secrets.PULUMI_BACKEND_URL }}
         env:
           PULUMI_CONFIG_PASSPHRASE: ${{ secrets.PULUMI_CONFIG_PASSPHRASE }}
@@ -63,21 +63,21 @@ jobs:
           node-version: '24'
 
       - name: Restore Stack Config
-        run: echo "${{ secrets.K8S_INFRA_PULUMI_DEV_YAML }}" | base64 -d > k8s-infra/Pulumi.dev.yaml
+        run: echo "${{ secrets.K8S_INFRA_PULUMI_DEV_YAML }}" | base64 -d > 03-k8s-infra/Pulumi.dev.yaml
 
       - name: Install Helm
         uses: azure/setup-helm@v4
 
       - name: Install Dependencies
         run: npm ci
-        working-directory: k8s-infra
+        working-directory: 03-k8s-infra
 
       - name: Refresh State
         uses: pulumi/actions@v5
         with:
           command: refresh
           stack-name: dev
-          work-dir: k8s-infra
+          work-dir: 03-k8s-infra
           cloud-url: ${{ secrets.PULUMI_BACKEND_URL }}
         env:
           PULUMI_CONFIG_PASSPHRASE: ${{ secrets.PULUMI_CONFIG_PASSPHRASE }}
@@ -87,7 +87,7 @@ jobs:
         with:
           command: up
           stack-name: dev
-          work-dir: k8s-infra
+          work-dir: 03-k8s-infra
           cloud-url: ${{ secrets.PULUMI_BACKEND_URL }}
         env:
           PULUMI_CONFIG_PASSPHRASE: ${{ secrets.PULUMI_CONFIG_PASSPHRASE }}