diff --git a/docs/architecture.md b/docs/architecture.md
index 69f91bc..d20493f 100644
--- a/docs/architecture.md
+++ b/docs/architecture.md
@@ -209,6 +209,9 @@ mps_page_session (raw rows)
| [MPS-11](tickets/mps-11.md) | Gift Card — Purchase Flow | Complete |
| [MPS-12](tickets/mps-12.md) | Gift Card — Redemption at Checkout | Complete |
| [MPS-13](tickets/mps-13.md) | Gift Card — Shop Admin & Settings | Complete |
+| [MPS-14](tickets/mps-14.md) | Shop Environment — Dev & Stage Shops | Open |
+| [MPS-15](tickets/mps-15.md) | 21-Day Free Trial | Open |
+| [MPS-16](tickets/mps-16.md) | Bring Your Own Bucket (BYOB) | Open |
## Related Docs
diff --git a/docs/tickets/mps-14.md b/docs/tickets/mps-14.md
new file mode 100644
index 0000000..25a5663
--- /dev/null
+++ b/docs/tickets/mps-14.md
@@ -0,0 +1,128 @@
+# MPS-14: Shop Environment — Dev & Stage Shops
+
+## Summary
+
+Add an `environment` column to Shop so owners can create development and staging
+shops for practicing thumbnails, videos, product staging, and testing checkout
+flows. Non-production shops are fully independent (no sync to production) and
+invisible to the public.
+
+Every paid production shop seat includes 2 free dev/stage shops.
+
+## Model Changes
+
+### Shop model (`models/shop.py`)
+
+Add column:
+
+```python
+environment = Column(BigInteger, default=0)
+# 0 = production (default)
+# 1 = staging
+# 2 = development
+```
+
+Add properties:
+
+```python
+@property
+def is_production(self):
+ return self.environment == 0
+
+@property
+def is_staging(self):
+ return self.environment == 1
+
+@property
+def is_development(self):
+ return self.environment == 2
+
+@property
+def is_non_production(self):
+ return self.environment != 0
+
+@property
+def environment_label(self):
+ return {0: "Production", 1: "Staging", 2: "Development"}.get(self.environment, "Production")
+```
+
+### Migration
+
+- Add `environment` column to `mps_shop` (BigInteger, server_default="0", NOT NULL)
+- Idempotent guard with `_column_exists`
+
+## Exclusion Points
+
+Non-production shops (environment != 0) must be excluded from:
+
+1. **Search results** — `views/shop.py:129` `search()` — filter query to `shop.environment == 0`
+2. **Discovery ring** — `models/shop.py:656` `_build_discovery_ring()` — already scoped to shop's own products, but ring should not be reforged for non-production shops
+3. **RSS/Atom/Sitemap** — `views/feeds.py:204,222,242` — skip non-production shops entirely (return empty feed or 404)
+4. **Subscription digests** — `models/shop_subscription.py` query helpers — filter by `shop.environment == 0`
+5. **Public shop listings** — any place shops are listed publicly
+
+Non-production shops still fully function for the owner: product upload, cart,
+checkout, settings, analytics — all work normally.
+
+## Banner
+
+Display a persistent environment banner for non-production shops, similar to
+the ribbon pattern. In `base.j2` or `snippets/ribbon.j2`:
+
+```html
+{% if request.shop and request.shop.is_non_production %}
+
+ {{ request.shop.environment_label }} Shop
+
+{% endif %}
+```
+
+CSS in `common.css`:
+- Staging banner: amber/yellow background
+- Development banner: blue/purple background
+- Always visible, not dismissible
+
+## Settings UI
+
+Add environment selector to shop settings. New form section `environment-settings`
+or add to existing `shop-settings` section.
+
+Radio buttons or select:
+- Production (default)
+- Staging
+- Development
+
+Changing from non-production to production should warn: "This shop will become
+publicly visible."
+
+## Shop Creation Flow
+
+On `/s/new`, add an optional environment selector (default: production).
+This lets users create dev/stage shops directly during onboarding.
+
+## Enforcement: 2 Free Dev/Stage Per Production Shop
+
+Each paid production shop seat entitles the user to 2 free non-production shops.
+
+### Counting logic
+
+```python
+def non_production_shop_allowance(user):
+ production_count = sum(1 for s in user.shops if s.is_production)
+ allowed_non_production = production_count * 2
+ current_non_production = sum(1 for s in user.shops if s.is_non_production)
+ return allowed_non_production - current_non_production
+```
+
+### Enforcement points
+
+- **Shop creation** (`views/shop.py` POST `/s/new`): if environment != 0 and
+ allowance <= 0, flash error and reject
+- **Environment change** (`views/shop.py` settings POST): if changing to
+ non-production and allowance <= 0, reject; if changing to production, always allow
+
+## Tests
+
+- Unit: `test_models.py` — environment properties, environment_label
+- Integration: `test_integration.py` — non-production shop excluded from discovery ring query, allowance counting
+- Functional: `test_functional.py` — create dev shop, verify search excludes it, verify banner appears, verify allowance enforcement
diff --git a/docs/tickets/mps-15.md b/docs/tickets/mps-15.md
new file mode 100644
index 0000000..89382e9
--- /dev/null
+++ b/docs/tickets/mps-15.md
@@ -0,0 +1,142 @@
+# MPS-15: 21-Day Free Trial
+
+## Summary
+
+New shops get a 21-day free trial. Trial includes 1 shop, 1 seat, all features.
+After 21 days the shop enters a grace period, then becomes read-only until a
+plan is chosen.
+
+## Model Changes
+
+### Shop model (`models/shop.py`)
+
+Add columns:
+
+```python
+trial_started_timestamp = Column(BigInteger, nullable=True)
+trial_ended = Column(Boolean, default=False)
+plan_active = Column(Boolean, default=False)
+```
+
+- `trial_started_timestamp`: set to current time (ms) on shop creation
+- `trial_ended`: flipped to True when trial expires (background check or request-time check)
+- `plan_active`: True when a paid plan is active (billing integration, future ticket)
+
+### Migration
+
+- Add 3 columns to `mps_shop` with idempotent guards
+- `trial_started_timestamp` nullable (existing shops get NULL = pre-trial era, treated as paid)
+- `trial_ended` server_default="0"
+- `plan_active` server_default="0"
+
+### Properties
+
+```python
+TRIAL_DURATION_MS = 21 * 24 * 60 * 60 * 1000 # 21 days in milliseconds
+
+@property
+def trial_expiry_timestamp(self):
+ if self.trial_started_timestamp is None:
+ return None
+ return self.trial_started_timestamp + self.TRIAL_DURATION_MS
+
+@property
+def is_trial_active(self):
+ if self.plan_active:
+ return False # paid plan supersedes trial
+ if self.trial_started_timestamp is None:
+ return False # pre-trial shop (existing shops)
+ now = int(time.time() * 1000)
+ return now < self.trial_expiry_timestamp
+
+@property
+def is_trial_expired(self):
+ if self.plan_active or self.trial_started_timestamp is None:
+ return False
+ now = int(time.time() * 1000)
+ return now >= self.trial_expiry_timestamp
+
+@property
+def trial_days_remaining(self):
+ if not self.is_trial_active:
+ return 0
+ remaining_ms = self.trial_expiry_timestamp - int(time.time() * 1000)
+ return max(0, remaining_ms // (24 * 60 * 60 * 1000))
+
+@property
+def is_active(self):
+ """Shop can operate: either paid plan or active trial."""
+ return self.plan_active or self.is_trial_active
+```
+
+## Trial Enforcement
+
+### What trial shops CAN do (all features)
+- Create products, upload files, set prices
+- Accept payments (all 5 methods)
+- Use watch mode, analytics, subscriptions, gift cards
+- Create 2 dev/stage shops (per MPS-14)
+- Full settings access
+
+### What happens when trial expires
+- Shop becomes **read-only**: products visible, downloads work for existing purchases
+- New purchases blocked (checkout disabled)
+- Product creation/editing disabled
+- Settings page shows "Trial expired — choose a plan to continue"
+- Flash message on every page: "Your 21-day trial has expired. Choose a plan to keep selling."
+
+### Enforcement points
+
+Request-time check (middleware or request method):
+
+```python
+def shop_trial_check(request):
+ shop = request.shop
+ if shop and shop.is_trial_expired and not shop.plan_active:
+ # Allow read-only routes, block write routes
+ ...
+```
+
+Write routes to block when trial expired:
+- Product create/edit/delete
+- Checkout completion (all 3 paths: Stripe, PayPal, Adyen)
+- Gift card purchase
+- Settings changes (except choosing a plan)
+
+Read routes to allow:
+- Product view, shop view, search
+- Cart view (but not checkout)
+- Settings view (read-only, plan selection enabled)
+- Download (for existing purchases)
+
+## Trial Banner
+
+In `base.j2`, show trial status for shop owners:
+
+```html
+{% if request.shop and request.shop.is_trial_active and request.user in request.shop.owners %}
+
+ Free trial: {{ request.shop.trial_days_remaining }} days remaining.
+
Choose a plan
+