Add kamal proxy update

For easy updates from Traefik to kamal-proxy, add `kamal proxy update`. This stops and removes Traefik and kamal-proxy containers (just in case it is run after an update). Then it starts kamal-proxy and calls `kamal-proxy deploy` to route to any app containers that are already running. It can be run with a rolling option and calls the `pre-proxy-reboot` and `post-proxy-reboot` hooks for each host.
Replace Traefik with kamal-proxy
2024-05-28 15:31:56 +01:00 · 2024-05-28 15:31:56 +01:00
201 changed files with 2007 additions and 5737 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,12 +24,25 @@ jobs:
    strategy:
      matrix:
        ruby-version:
+          - "2.7"
          - "3.1"
          - "3.2"
          - "3.3"
        gemfile:
          - Gemfile
+          - gemfiles/ruby_2.7.gemfile
          - gemfiles/rails_edge.gemfile
+        exclude:
+          - ruby-version: "2.7"
+            gemfile: Gemfile
+          - ruby-version: "2.7"
+            gemfile: gemfiles/rails_edge.gemfile
+          - ruby-version: "3.1"
+            gemfile: gemfiles/ruby_2.7.gemfile
+          - ruby-version: "3.2"
+            gemfile: gemfiles/ruby_2.7.gemfile
+          - ruby-version: "3.3"
+            gemfile: gemfiles/ruby_2.7.gemfile
    name: ${{ format('Tests (Ruby {0})', matrix.ruby-version) }}
    runs-on: ubuntu-latest
    continue-on-error: true
--- a/4
+++ b/4
@@ -1,7 +1,7 @@
 # Use the official Ruby 3.2.0 Alpine image as the base image
 FROM ruby:3.2.0-alpine

-# Install docker/buildx-bin
+# Install  docker/buildx-bin
 COPY --from=docker/buildx-bin /buildx /usr/libexec/docker/cli-plugins/docker-buildx

 # Set the working directory to /kamal
@@ -14,7 +14,7 @@ COPY Gemfile Gemfile.lock kamal.gemspec ./
 COPY lib/kamal/version.rb /kamal/lib/kamal/version.rb

 # Install system dependencies
-RUN apk add --no-cache build-base git docker openrc openssh-client-default \
+RUN apk add --no-cache --update build-base git docker openrc openssh-client-default \
    && rc-update add docker boot \
    && gem install bundler --version=2.4.3 \
    && bundle install
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,25 +1,24 @@
 PATH
  remote: .
  specs:
-    kamal (2.0.0.rc2)
+    kamal (1.5.2)
      activesupport (>= 7.0)
      base64 (~> 0.2)
      bcrypt_pbkdf (~> 1.0)
      concurrent-ruby (~> 1.2)
-      dotenv (~> 3.1)
+      dotenv (~> 2.8)
      ed25519 (~> 1.2)
      net-ssh (~> 7.0)
-      net-ssh-gateway
-      sshkit (>= 1.23.0, < 2.0)
-      thor (~> 1.3)
+      sshkit (>= 1.22.2, < 2.0)
+      thor (~> 1.2)
      zeitwerk (~> 2.5)

 GEM
  remote: https://rubygems.org/
  specs:
-    actionpack (7.1.3.4)
-      actionview (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+    actionpack (7.1.2)
+      actionview (= 7.1.2)
+      activesupport (= 7.1.2)
      nokogiri (>= 1.8.5)
      racc
      rack (>= 2.2.4)
@@ -27,13 +26,13 @@ GEM
      rack-test (>= 0.6.3)
      rails-dom-testing (~> 2.2)
      rails-html-sanitizer (~> 1.6)
-    actionview (7.1.3.4)
-      activesupport (= 7.1.3.4)
+    actionview (7.1.2)
+      activesupport (= 7.1.2)
      builder (~> 3.1)
      erubi (~> 1.11)
      rails-dom-testing (~> 2.2)
      rails-html-sanitizer (~> 1.6)
-    activesupport (7.1.3.4)
+    activesupport (7.1.2)
      base64
      bigdecimal
      concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -45,57 +44,54 @@ GEM
      tzinfo (~> 2.0)
    ast (2.4.2)
    base64 (0.2.0)
-    bcrypt_pbkdf (1.1.1)
-    bcrypt_pbkdf (1.1.1-arm64-darwin)
-    bcrypt_pbkdf (1.1.1-x86_64-darwin)
-    bigdecimal (3.1.8)
-    builder (3.3.0)
-    concurrent-ruby (1.3.3)
+    bcrypt_pbkdf (1.1.0)
+    bigdecimal (3.1.5)
+    builder (3.2.4)
+    concurrent-ruby (1.2.2)
    connection_pool (2.4.1)
    crass (1.0.6)
-    debug (1.9.2)
+    debug (1.9.1)
      irb (~> 1.10)
      reline (>= 0.3.8)
-    dotenv (3.1.2)
-    drb (2.2.1)
+    dotenv (2.8.1)
+    drb (2.2.0)
+      ruby2_keywords
    ed25519 (1.3.0)
-    erubi (1.13.0)
-    i18n (1.14.5)
+    erubi (1.12.0)
+    i18n (1.14.1)
      concurrent-ruby (~> 1.0)
-    io-console (0.7.2)
-    irb (1.14.0)
-      rdoc (>= 4.0.0)
-      reline (>= 0.4.2)
-    json (2.7.2)
+    io-console (0.7.1)
+    irb (1.11.0)
+      rdoc
+      reline (>= 0.3.8)
+    json (2.7.1)
    language_server-protocol (3.17.0.3)
    loofah (2.22.0)
      crass (~> 1.0.2)
      nokogiri (>= 1.12.0)
-    minitest (5.24.1)
-    mocha (2.4.5)
+    minitest (5.20.0)
+    mocha (2.1.0)
      ruby2_keywords (>= 0.0.5)
    mutex_m (0.2.0)
    net-scp (4.0.0)
      net-ssh (>= 2.6.5, < 8.0.0)
    net-sftp (4.0.0)
      net-ssh (>= 5.0.0, < 8.0.0)
-    net-ssh (7.2.3)
-    net-ssh-gateway (2.0.0)
-      net-ssh (>= 4.0.0)
-    nokogiri (1.16.7-arm64-darwin)
+    net-ssh (7.2.1)
+    nokogiri (1.16.0-arm64-darwin)
      racc (~> 1.4)
-    nokogiri (1.16.7-x86_64-darwin)
+    nokogiri (1.16.0-x86_64-darwin)
      racc (~> 1.4)
-    nokogiri (1.16.7-x86_64-linux)
+    nokogiri (1.16.0-x86_64-linux)
      racc (~> 1.4)
-    parallel (1.25.1)
-    parser (3.3.4.0)
+    parallel (1.24.0)
+    parser (3.3.0.5)
      ast (~> 2.4.1)
      racc
    psych (5.1.2)
      stringio
-    racc (1.8.1)
-    rack (3.1.7)
+    racc (1.7.3)
+    rack (3.0.8)
    rack-session (2.0.0)
      rack (>= 3.0.0)
    rack-test (2.1.0)
@@ -110,43 +106,42 @@ GEM
    rails-html-sanitizer (1.6.0)
      loofah (~> 2.21)
      nokogiri (~> 1.14)
-    railties (7.1.3.4)
-      actionpack (= 7.1.3.4)
-      activesupport (= 7.1.3.4)
+    railties (7.1.2)
+      actionpack (= 7.1.2)
+      activesupport (= 7.1.2)
      irb
      rackup (>= 1.0.0)
      rake (>= 12.2)
      thor (~> 1.0, >= 1.2.2)
      zeitwerk (~> 2.6)
    rainbow (3.1.1)
-    rake (13.2.1)
-    rdoc (6.7.0)
+    rake (13.1.0)
+    rdoc (6.6.2)
      psych (>= 4.0.0)
-    regexp_parser (2.9.2)
-    reline (0.5.9)
+    regexp_parser (2.9.0)
+    reline (0.4.2)
      io-console (~> 0.5)
-    rexml (3.3.4)
-      strscan
-    rubocop (1.65.1)
+    rexml (3.2.6)
+    rubocop (1.62.1)
      json (~> 2.3)
      language_server-protocol (>= 3.17.0)
      parallel (~> 1.10)
      parser (>= 3.3.0.2)
      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.4, < 3.0)
+      regexp_parser (>= 1.8, < 3.0)
      rexml (>= 3.2.5, < 4.0)
      rubocop-ast (>= 1.31.1, < 2.0)
      ruby-progressbar (~> 1.7)
      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.32.0)
-      parser (>= 3.3.1.0)
-    rubocop-minitest (0.35.1)
+    rubocop-ast (1.31.2)
+      parser (>= 3.3.0.4)
+    rubocop-minitest (0.35.0)
      rubocop (>= 1.61, < 2.0)
      rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-performance (1.21.1)
+    rubocop-performance (1.20.2)
      rubocop (>= 1.48.1, < 2.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.25.1)
+      rubocop-ast (>= 1.30.0, < 2.0)
+    rubocop-rails (2.24.0)
      activesupport (>= 4.2.0)
      rack (>= 1.1)
      rubocop (>= 1.33.0, < 2.0)
@@ -158,19 +153,19 @@ GEM
      rubocop-rails
    ruby-progressbar (1.13.0)
    ruby2_keywords (0.0.5)
-    sshkit (1.23.0)
+    sshkit (1.22.2)
      base64
+      mutex_m
      net-scp (>= 1.1.2)
      net-sftp (>= 2.1.2)
      net-ssh (>= 2.8.0)
-    stringio (3.1.1)
-    strscan (3.1.0)
-    thor (1.3.1)
+    stringio (3.1.0)
+    thor (1.3.0)
    tzinfo (2.0.6)
      concurrent-ruby (~> 1.0)
    unicode-display_width (2.5.0)
    webrick (1.8.1)
-    zeitwerk (2.6.17)
+    zeitwerk (2.6.12)

 PLATFORMS
  arm64-darwin
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Kamal: Deploy web apps anywhere

-From bare metal to cloud VMs, deploy web apps anywhere with zero downtime. Kamal uses [kamal-proxy](https://github.com/basecamp/kamal-proxy) to seamlessly switch requests between containers. Works seamlessly across multiple servers, using SSHKit to execute commands. Originally built for Rails apps, Kamal will work with any type of web app that can be containerized with Docker.
+From bare metal to cloud VMs, deploy web apps anywhere with zero downtime. Kamal uses a [custom proxy](https://github.com/basecamp/kamal-proxy) for zero-downtime deployments. Works seamlessly across multiple hosts, using SSHKit to execute commands. Originally built for Rails apps, Kamal will work with any type of web app that can be containerized with Docker.

 ➡️ See [kamal-deploy.org](https://kamal-deploy.org) for documentation on [installation](https://kamal-deploy.org/docs/installation), [configuration](https://kamal-deploy.org/docs/configuration), and [commands](https://kamal-deploy.org/docs/commands).

--- a/bin/docs
+++ b/bin/docs
@@ -1,135 +0,0 @@
-#!/usr/bin/env ruby
-require "stringio"
-
-def usage
-  puts "Usage: #{$0} <kamal_site_repo>"
-  exit 1
-end
-
-usage if ARGV.size != 1
-
-kamal_site_repo = ARGV[0]
-
-if !File.directory?(kamal_site_repo)
-  puts "Error: #{kamal_site_repo} is not a directory"
-  exit 1
-end
-
-DOCS = {
-  "accessory" => "Accessories",
-  "alias" => "Aliases",
-  "boot" => "Booting",
-  "builder" => "Builders",
-  "configuration" => "Configuration overview",
-  "env" => "Environment variables",
-  "logging" => "Logging",
-  "proxy" => "Proxy",
-  "registry" => "Docker Registry",
-  "role" => "Roles",
-  "servers" => "Servers",
-  "ssh" => "SSH",
-  "sshkit" => "SSHKit"
-}
-
-class DocWriter
-  attr_reader :from_file, :to_file, :key, :heading, :body, :output, :in_yaml
-
-  def initialize(from_file, to_dir)
-    @from_file = from_file
-    @key = File.basename(from_file, ".yml")
-    @to_file = File.join(to_dir, "#{linkify(DOCS[key])}.md")
-    @body = File.readlines(from_file)
-    @heading = body.shift.chomp("\n")
-    @output = nil
-  end
-
-  def write
-    puts "Writing #{to_file}"
-    generate_markdown
-    File.write(to_file, output.string)
-  end
-
-  private
-    def generate_markdown
-      @output = StringIO.new
-
-      generate_header
-
-      place = :in_section
-
-      loop do
-        line = body.shift&.chomp("\n")
-        break if line.nil?
-
-        case place
-        when :new_section, :in_section
-          if line.empty?
-            output.puts
-            place = :new_section
-          elsif line =~ /^ *#/
-            generate_line(line, heading: place == :new_section)
-            place = :in_section
-          else
-            output.puts "```yaml"
-            output.puts line
-            place = :in_yaml
-          end
-        when :in_yaml, :in_empty_line_yaml
-          if line =~ /^ *#/
-            output.puts "```"
-            generate_line(line, heading: place == :in_empty_line_yaml)
-            place = :in_section
-          elsif line.empty?
-            place = :in_empty_line_yaml
-          else
-            output.puts line
-          end
-        end
-      end
-
-      output.puts "```" if place == :in_yaml
-    end
-
-    def generate_header
-      output.puts "---"
-      output.puts "title: #{heading[2..-1]}"
-      output.puts "---"
-      output.puts
-      output.puts heading
-      output.puts
-    end
-
-    def generate_line(line, heading: false)
-      line = line.gsub(/^ *#\s?/, "")
-
-      if line =~ /(.*)kamal docs ([a-z]*)(.*)/
-        line = "#{$1}[#{DOCS[$2]}](../#{linkify(DOCS[$2])})#{$3}"
-      end
-
-      if line =~ /(.*)https:\/\/kamal-deploy.org([a-z\/-]*)(.*)/
-        line = "#{$1}[#{titlify($2.split("/").last)}](#{$2})#{$3}"
-      end
-
-      if heading
-        output.puts "## [#{line}](##{linkify(line)})"
-      else
-        output.puts line
-      end
-    end
-
-    def linkify(text)
-      text.downcase.gsub(" ", "-")
-    end
-
-    def titlify(text)
-      text.capitalize.gsub("-", " ")
-    end
-end
-
-from_dir = File.join(File.dirname(__FILE__), "../lib/kamal/configuration/docs")
-to_dir = File.join(kamal_site_repo, "docs/configuration")
-Dir.glob("#{from_dir}/*") do |from_file|
-  key = File.basename(from_file, ".yml")
-
-  DocWriter.new(from_file, to_dir).write
-end
--- a/gemfiles/ruby_2.7.gemfile
+++ b/gemfiles/ruby_2.7.gemfile
@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
+gemspec path: "../"
+
+gem "nokogiri", "~> 1.15.0"
--- a/kamal.gemspec
+++ b/kamal.gemspec
@@ -12,11 +12,10 @@ Gem::Specification.new do |spec|
  spec.executables = %w[ kamal ]

  spec.add_dependency "activesupport", ">= 7.0"
-  spec.add_dependency "sshkit", ">= 1.23.0", "< 2.0"
+  spec.add_dependency "sshkit", ">= 1.22.2", "< 2.0"
  spec.add_dependency "net-ssh", "~> 7.0"
-  spec.add_dependency "net-ssh-gateway"
-  spec.add_dependency "thor", "~> 1.3"
-  spec.add_dependency "dotenv", "~> 3.1"
+  spec.add_dependency "thor", "~> 1.2"
+  spec.add_dependency "dotenv", "~> 2.8"
  spec.add_dependency "zeitwerk", "~> 2.5"
  spec.add_dependency "ed25519", "~> 1.2"
  spec.add_dependency "bcrypt_pbkdf", "~> 1.0"
--- a/lib/kamal.rb
+++ b/lib/kamal.rb
@@ -1,14 +1,10 @@
 module Kamal
-  class ConfigurationError < StandardError; end
 end

 require "active_support"
 require "zeitwerk"
-require "yaml"
-require "tmpdir"
-require "pathname"

 loader = Zeitwerk::Loader.for_gem
 loader.ignore(File.join(__dir__, "kamal", "sshkit_with_ext.rb"))
 loader.setup
-loader.eager_load_namespace(Kamal::Cli) # We need all commands loaded.
+loader.eager_load # We need all commands loaded.
--- a/lib/kamal/cli.rb
+++ b/lib/kamal/cli.rb
@@ -1,7 +1,7 @@
 module Kamal::Cli
-  class BootError < StandardError; end
-  class HookError < StandardError; end
  class LockError < StandardError; end
+  class HookError < StandardError; end
+  class BootError < StandardError; end
 end

 # SSHKit uses instance eval, so we need a global const for ergonomics
--- a/lib/kamal/cli/accessory.rb
+++ b/lib/kamal/cli/accessory.rb
@@ -1,20 +1,17 @@
 class Kamal::Cli::Accessory < Kamal::Cli::Base
  desc "boot [NAME]", "Boot new accessory service on host (use NAME=all to boot all accessories)"
-  def boot(name, prepare: true)
+  def boot(name, login: true)
    with_lock do
      if name == "all"
        KAMAL.accessory_names.each { |accessory_name| boot(accessory_name) }
      else
-        prepare(name) if prepare
-
        with_accessory(name) do |accessory, hosts|
          directories(name)
          upload(name)

          on(hosts) do
+            execute *KAMAL.registry.login if login
            execute *KAMAL.auditor.record("Booted #{name} accessory"), verbosity: :debug
-            execute *accessory.ensure_env_directory
-            upload! accessory.secrets_io, accessory.secrets_path, mode: "0600"
            execute *accessory.run
          end
        end
@@ -58,10 +55,15 @@ class Kamal::Cli::Accessory < Kamal::Cli::Base
      if name == "all"
        KAMAL.accessory_names.each { |accessory_name| reboot(accessory_name) }
      else
-        prepare(name)
-        stop(name)
-        remove_container(name)
-        boot(name, prepare: false)
+        with_accessory(name) do |accessory, hosts|
+          on(hosts) do
+            execute *KAMAL.registry.login
+          end
+
+          stop(name)
+          remove_container(name)
+          boot(name, login: false)
+        end
      end
    end
  end
@@ -93,8 +95,10 @@ class Kamal::Cli::Accessory < Kamal::Cli::Base
  desc "restart [NAME]", "Restart existing accessory container on host"
  def restart(name)
    with_lock do
-      stop(name)
-      start(name)
+      with_accessory(name) do
+        stop(name)
+        start(name)
+      end
    end
  end

@@ -145,27 +149,23 @@ class Kamal::Cli::Accessory < Kamal::Cli::Base
  option :since, aliases: "-s", desc: "Show logs since timestamp (e.g. 2013-01-02T13:23:37Z) or relative (e.g. 42m for 42 minutes)"
  option :lines, type: :numeric, aliases: "-n", desc: "Number of log lines to pull from each server"
  option :grep, aliases: "-g", desc: "Show lines with grep match only (use this to fetch specific requests by id)"
-  option :grep_options, aliases: "-o", desc: "Additional options supplied to grep"
  option :follow, aliases: "-f", desc: "Follow logs on primary server (or specific host set by --hosts)"
-  option :skip_timestamps, type: :boolean, aliases: "-T", desc: "Skip appending timestamps to logging output"
  def logs(name)
    with_accessory(name) do |accessory, hosts|
      grep = options[:grep]
-      grep_options = options[:grep_options]
-      timestamps = !options[:skip_timestamps]

      if options[:follow]
        run_locally do
          info "Following logs on #{hosts}..."
-          info accessory.follow_logs(timestamps: timestamps, grep: grep, grep_options: grep_options)
-          exec accessory.follow_logs(timestamps: timestamps, grep: grep, grep_options: grep_options)
+          info accessory.follow_logs(grep: grep)
+          exec accessory.follow_logs(grep: grep)
        end
      else
        since = options[:since]
        lines = options[:lines].presence || ((since || grep) ? nil : 100) # Default to 100 lines if since or grep isn't set

        on(hosts) do
-          puts capture_with_info(*accessory.logs(timestamps: timestamps, since: since, lines: lines, grep: grep, grep_options: grep_options))
+          puts capture_with_info(*accessory.logs(since: since, lines: lines, grep: grep))
        end
      end
    end
@@ -220,25 +220,6 @@ class Kamal::Cli::Accessory < Kamal::Cli::Base
    end
  end

-  desc "upgrade", "Upgrade accessories from Kamal 1.x to 2.0 (restart them in 'kamal' network)"
-  option :rolling, type: :boolean, default: false, desc: "Upgrade one host at a time"
-  option :confirmed, aliases: "-y", type: :boolean, default: false, desc: "Proceed without confirmation question"
-  def upgrade(name)
-    confirming "This will restart all accessories" do
-      with_lock do
-        host_groups = options[:rolling] ? KAMAL.accessory_hosts : [ KAMAL.accessory_hosts ]
-        host_groups.each do |hosts|
-          host_list = Array(hosts).join(",")
-          KAMAL.with_specific_hosts(hosts) do
-            say "Upgrading #{name} accessories on #{host_list}...", :magenta
-            reboot name
-            say "Upgraded #{name} accessories on #{host_list}...", :magenta
-          end
-        end
-      end
-    end
-  end
-
  private
    def with_accessory(name)
      if KAMAL.config.accessory(name)
@@ -266,20 +247,11 @@ class Kamal::Cli::Accessory < Kamal::Cli::Base
    end

    def remove_accessory(name)
-      stop(name)
-      remove_container(name)
-      remove_image(name)
-      remove_service_directory(name)
-    end
-
-    def prepare(name)
-      with_accessory(name) do |accessory, hosts|
-        on(hosts) do
-          execute *KAMAL.registry.login unless KAMAL.config.registry.local?
-          execute *KAMAL.docker.create_network
-        rescue SSHKit::Command::Failed => e
-          raise unless e.message.include?("already exists")
-        end
+      with_accessory(name) do
+        stop(name)
+        remove_container(name)
+        remove_image(name)
+        remove_service_directory(name)
      end
    end
 end
--- a/lib/kamal/cli/alias/command.rb
+++ b/lib/kamal/cli/alias/command.rb
@@ -1,9 +0,0 @@
-class Kamal::Cli::Alias::Command < Thor::DynamicCommand
-  def run(instance, args = [])
-    if (_alias = KAMAL.config.aliases[name])
-      Kamal::Cli::Main.start(Shellwords.split(_alias.command) + ARGV[1..-1])
-    else
-      super
-    end
-  end
-end
--- a/lib/kamal/cli/app.rb
+++ b/lib/kamal/cli/app.rb
@@ -4,21 +4,21 @@ class Kamal::Cli::App < Kamal::Cli::Base
    with_lock do
      say "Get most recent version available as an image...", :magenta unless options[:version]
      using_version(version_or_latest) do |version|
-        say "Start container with version #{version} (or reboot if already running)...", :magenta
+        say "Start container with version #{version} using a #{KAMAL.config.readiness_delay}s readiness delay (or reboot if already running)...", :magenta

        # Assets are prepared in a separate step to ensure they are on all hosts before booting
        on(KAMAL.hosts) do
          KAMAL.roles_on(host).each do |role|
-            Kamal::Cli::App::PrepareAssets.new(host, role, self).run
+            PrepareAssets.new(host, role, self).run
          end
        end

        # Primary hosts and roles are returned first, so they can open the barrier
-        barrier = Kamal::Cli::Healthcheck::Barrier.new
+        barrier = Barrier.new if KAMAL.roles.many?

        on(KAMAL.hosts, **KAMAL.boot_strategy) do |host|
          KAMAL.roles_on(host).each do |role|
-            Kamal::Cli::App::Boot.new(host, role, self, version, barrier).run
+            Boot.new(host, role, self, version, barrier).run
          end
        end

@@ -44,10 +44,10 @@ class Kamal::Cli::App < Kamal::Cli::Base

          if role.running_proxy?
            version = capture_with_info(*app.current_running_version, raise_on_non_zero_exit: false).strip
-            endpoint = capture_with_info(*app.container_id_for_version(version)).strip
+            endpoint = capture_with_info(*app.container_endpoint(version: version)).strip
            raise Kamal::Cli::BootError, "Failed to get endpoint for #{role} on #{host}, did the container boot?" if endpoint.empty?

-            execute *app.deploy(target: endpoint)
+            execute *KAMAL.proxy.deploy(role.container_prefix, target: endpoint)
          end
        end
      end
@@ -62,13 +62,14 @@ class Kamal::Cli::App < Kamal::Cli::Base

        roles.each do |role|
          app = KAMAL.app(role: role, host: host)
+          version = capture_with_info(*app.current_running_version, raise_on_non_zero_exit: false).strip
+
          execute *KAMAL.auditor.record("Stopped app", role: role), verbosity: :debug

          if role.running_proxy?
-            version = capture_with_info(*app.current_running_version, raise_on_non_zero_exit: false).strip
-            endpoint = capture_with_info(*app.container_id_for_version(version)).strip
+            endpoint = capture_with_info(*app.container_endpoint(version: version)).strip
            if endpoint.present?
-              execute *app.remove(target: endpoint), raise_on_non_zero_exit: false
+              execute *KAMAL.proxy.remove(role.container_prefix, target: endpoint), raise_on_non_zero_exit: false
            end
          end

@@ -90,12 +91,11 @@ class Kamal::Cli::App < Kamal::Cli::Base
    end
  end

-  desc "exec [CMD...]", "Execute a custom command on servers within the app container (use --help to show options)"
+  desc "exec [CMD]", "Execute a custom command on servers within the app container (use --help to show options)"
  option :interactive, aliases: "-i", type: :boolean, default: false, desc: "Execute command over ssh for an interactive shell (use for console/bash)"
  option :reuse, type: :boolean, default: false, desc: "Reuse currently running container instead of starting a new one"
  option :env, aliases: "-e", type: :hash, desc: "Set environment variables for the command"
-  def exec(*cmd)
-    cmd = Kamal::Utils.join_commands(cmd)
+  def exec(cmd)
    env = options[:env]
    case
    when options[:interactive] && options[:reuse]
@@ -186,17 +186,12 @@ class Kamal::Cli::App < Kamal::Cli::Base
  option :since, aliases: "-s", desc: "Show lines since timestamp (e.g. 2013-01-02T13:23:37Z) or relative (e.g. 42m for 42 minutes)"
  option :lines, type: :numeric, aliases: "-n", desc: "Number of lines to show from each server"
  option :grep, aliases: "-g", desc: "Show lines with grep match only (use this to fetch specific requests by id)"
-  option :grep_options, aliases: "-o", desc: "Additional options supplied to grep"
  option :follow, aliases: "-f", desc: "Follow log on primary server (or specific host set by --hosts)"
-  option :skip_timestamps, type: :boolean, aliases: "-T", desc: "Skip appending timestamps to logging output"
  def logs
    # FIXME: Catch when app containers aren't running

    grep = options[:grep]
-    grep_options = options[:grep_options]
    since = options[:since]
-    timestamps = !options[:skip_timestamps]
-
    if options[:follow]
      lines = options[:lines].presence || ((since || grep) ? nil : 10) # Default to 10 lines if since or grep isn't set

@@ -207,8 +202,8 @@ class Kamal::Cli::App < Kamal::Cli::Base
        role = KAMAL.roles_on(KAMAL.primary_host).first

        app = KAMAL.app(role: role, host: host)
-        info app.follow_logs(host: KAMAL.primary_host, timestamps: timestamps, lines: lines, grep: grep, grep_options: grep_options)
-        exec app.follow_logs(host: KAMAL.primary_host, timestamps: timestamps, lines: lines, grep: grep, grep_options: grep_options)
+        info app.follow_logs(host: KAMAL.primary_host, lines: lines, grep: grep)
+        exec app.follow_logs(host: KAMAL.primary_host, lines: lines, grep: grep)
      end
    else
      lines = options[:lines].presence || ((since || grep) ? nil : 100) # Default to 100 lines if since or grep isn't set
@@ -218,7 +213,7 @@ class Kamal::Cli::App < Kamal::Cli::Base

        roles.each do |role|
          begin
-            puts_by_host host, capture_with_info(*KAMAL.app(role: role, host: host).logs(timestamps: timestamps, since: since, lines: lines, grep: grep, grep_options: grep_options))
+            puts_by_host host, capture_with_info(*KAMAL.app(role: role, host: host).logs(since: since, lines: lines, grep: grep))
          rescue SSHKit::Command::Failed
            puts_by_host host, "Nothing found"
          end
@@ -233,7 +228,6 @@ class Kamal::Cli::App < Kamal::Cli::Base
      stop
      remove_containers
      remove_images
-      remove_app_directory
    end
  end

@@ -275,20 +269,6 @@ class Kamal::Cli::App < Kamal::Cli::Base
    end
  end

-  desc "remove_app_directory", "Remove the service directory from servers", hide: true
-  def remove_app_directory
-    with_lock do
-      on(KAMAL.hosts) do |host|
-        roles = KAMAL.roles_on(host)
-
-        roles.each do |role|
-          execute *KAMAL.auditor.record("Removed #{KAMAL.config.app_directory} on all servers", role: role), verbosity: :debug
-          execute *KAMAL.server.remove_app_directory, raise_on_non_zero_exit: false
-        end
-      end
-    end
-  end
-
  desc "version", "Show app version currently running on servers"
  def version
    on(KAMAL.hosts) do |host|
--- a/lib/kamal/cli/healthcheck/barrier.rb
+++ b/lib/kamal/cli/healthcheck/barrier.rb
@@ -1,6 +1,4 @@
-require "concurrent/ivar"
-
-class Kamal::Cli::Healthcheck::Barrier
+class Kamal::Cli::App::Barrier
  def initialize
    @ivar = Concurrent::IVar.new
  end
@@ -15,7 +13,7 @@ class Kamal::Cli::Healthcheck::Barrier

  def wait
    unless opened?
-      raise Kamal::Cli::Healthcheck::Error.new("Halted at barrier")
+      raise Kamal::Cli::BootError.new("Halted at barrier")
    end
  end

--- a/lib/kamal/cli/app/boot.rb
+++ b/lib/kamal/cli/app/boot.rb
@@ -1,6 +1,6 @@
 class Kamal::Cli::App::Boot
  attr_reader :host, :role, :version, :barrier, :sshkit
-  delegate :execute, :capture_with_info, :capture_with_pretty_json, :info, :error, :upload!, to: :sshkit
+  delegate :execute, :capture_with_info, :capture_with_pretty_json, :info, :error, to: :sshkit
  delegate :assets?, :running_proxy?, to: :role

  def initialize(host, role, sshkit, version, barrier)
@@ -46,21 +46,12 @@ class Kamal::Cli::App::Boot
    def start_new_version
      audit "Booted app version #{version}"
      hostname = "#{host.to_s[0...51].gsub(/\.+$/, '')}-#{SecureRandom.hex(6)}"
-
-      execute *app.ensure_env_directory
-      upload! role.secrets_io(host), role.secrets_path, mode: "0600"
-
      execute *app.run(hostname: hostname)
      if running_proxy?
-        endpoint = capture_with_info(*app.container_id_for_version(version)).strip
+        endpoint = capture_with_info(*app.container_endpoint(version: version)).strip
        raise Kamal::Cli::BootError, "Failed to get endpoint for #{role} on #{host}, did the container boot?" if endpoint.empty?
-        execute *app.deploy(target: endpoint)
-      else
-        Kamal::Cli::Healthcheck::Poller.wait_for_healthy(pause_after_ready: true) { capture_with_info(*app.status(version: version)) }
+        execute *KAMAL.proxy.deploy(role.container_prefix, target: endpoint)
      end
-    rescue => e
-      error "Failed to boot #{role} on #{host}"
-      raise e
    end

    def stop_new_version
@@ -74,7 +65,7 @@ class Kamal::Cli::App::Boot

    def release_barrier
      if barrier.open
-        info "First #{KAMAL.primary_role} container is healthy on #{host}, booting any other roles"
+        info "First #{KAMAL.primary_role} container is healthy on #{host}, booting other roles"
      end
    end

@@ -82,20 +73,15 @@ class Kamal::Cli::App::Boot
      info "Waiting for the first healthy #{KAMAL.primary_role} container before booting #{role} on #{host}..."
      barrier.wait
      info "First #{KAMAL.primary_role} container is healthy, booting #{role} on #{host}..."
-    rescue Kamal::Cli::Healthcheck::Error
+    rescue Kamal::Cli::BootError
      info "First #{KAMAL.primary_role} container is unhealthy, not booting #{role} on #{host}"
      raise
    end

    def close_barrier
      if barrier.close
-        info "First #{KAMAL.primary_role} container is unhealthy on #{host}, not booting any other roles"
-        begin
-          error capture_with_info(*app.logs(version: version))
-          error capture_with_info(*app.container_health_log(version: version))
-        rescue SSHKit::Command::Failed
-          error "Could not fetch logs for #{version}"
-        end
+        info "First #{KAMAL.primary_role} container is unhealthy on #{host}, not booting other roles"
+        error capture_with_info(*app.logs(version: version))
      end
    end

--- a/lib/kamal/cli/base.rb
+++ b/lib/kamal/cli/base.rb
@@ -1,12 +1,12 @@
 require "thor"
+require "dotenv"
 require "kamal/sshkit_with_ext"

 module Kamal::Cli
  class Base < Thor
    include SSHKit::DSL

-    def self.exit_on_failure?() false end
-    def self.dynamic_command_class() Kamal::Cli::Alias::Command end
+    def self.exit_on_failure?() true end

    class_option :verbose, type: :boolean, aliases: "-v", desc: "Detailed logging"
    class_option :quiet, type: :boolean, aliases: "-q", desc: "Minimal logging"
@@ -22,23 +22,33 @@ module Kamal::Cli

    class_option :skip_hooks, aliases: "-H", type: :boolean, default: false, desc: "Don't run hooks"

-    def initialize(args = [], local_options = {}, config = {})
-      if config[:current_command].is_a?(Kamal::Cli::Alias::Command)
-        # When Thor generates a dynamic command, it doesn't attempt to parse the arguments.
-        # For our purposes, it means the arguments are passed in args rather than local_options.
-        super([], args, config)
-      else
-        super
-      end
-      initialize_commander unless KAMAL.configured?
+    def initialize(*)
+      super
+      @original_env = ENV.to_h.dup
+      load_envs
+      initialize_commander(options_with_subcommand_class_options)
    end

    private
+      def load_envs
+        if destination = options[:destination]
+          Dotenv.load(".env.#{destination}", ".env")
+        else
+          Dotenv.load(".env")
+        end
+      end
+
+      def reload_envs
+        ENV.clear
+        ENV.update(@original_env)
+        load_envs
+      end
+
      def options_with_subcommand_class_options
        options.merge(@_initializer.last[:class_options] || {})
      end

-      def initialize_commander
+      def initialize_commander(options)
        KAMAL.tap do |commander|
          if options[:verbose]
            ENV["VERBOSE"] = "1" # For backtraces via cli/start
@@ -73,6 +83,8 @@ module Kamal::Cli
        if KAMAL.holding_lock?
          yield
        else
+          ensure_run_and_locks_directory
+
          acquire_lock

          begin
@@ -101,8 +113,6 @@ module Kamal::Cli
      end

      def acquire_lock
-        ensure_run_directory
-
        raise_if_locked do
          say "Acquiring the deploy lock...", :magenta
          on(KAMAL.primary_host) { execute *KAMAL.lock.acquire("Automatic deploy lock", KAMAL.config.version), verbosity: :debug }
@@ -135,10 +145,8 @@ module Kamal::Cli
          details = { hosts: KAMAL.hosts.join(","), command: command, subcommand: subcommand }

          say "Running the #{hook} hook...", :magenta
-          with_env KAMAL.hook.env(**details, **extra_details) do
-            run_locally do
-              execute *KAMAL.hook.run(hook)
-            end
+          run_locally do
+            execute *KAMAL.hook.run(hook, **details, **extra_details)
          rescue SSHKit::Command::Failed => e
            raise HookError.new("Hook `#{hook}` failed:\n#{e.message}")
          end
@@ -176,23 +184,14 @@ module Kamal::Cli
        instance_variable_get("@_invocations").first
      end

-      def reset_invocation(cli_class)
-        instance_variable_get("@_invocations")[cli_class].pop
-      end
-
-      def ensure_run_directory
+      def ensure_run_and_locks_directory
        on(KAMAL.hosts) do
          execute(*KAMAL.server.ensure_run_directory)
        end
-      end

-      def with_env(env)
-        current_env = ENV.to_h.dup
-        ENV.update(env)
-        yield
-      ensure
-        ENV.clear
-        ENV.update(current_env)
+        on(KAMAL.primary_host) do
+          execute(*KAMAL.lock.ensure_locks_directory)
+        end
      end
  end
 end
--- a/lib/kamal/cli/build.rb
+++ b/lib/kamal/cli/build.rb
@@ -1,5 +1,4 @@
 require "uri"
-require "net/ssh"

 class Kamal::Cli::Build < Kamal::Cli::Base
  class BuildError < StandardError; end
@@ -31,54 +30,43 @@ class Kamal::Cli::Build < Kamal::Cli::Base
      say "Building with uncommitted changes:\n #{uncommitted_changes}", :yellow
    end

-    with_env(KAMAL.config.builder.secrets) do
-      run_locally do
-        begin
-          execute *KAMAL.builder.inspect_builder
-        rescue SSHKit::Command::Failed => e
-          if e.message =~ /(context not found|no builder|no compatible builder|does not exist)/
-            warn "Missing compatible builder, so creating a new one first"
-            begin
-              cli.remove
-            rescue SSHKit::Command::Failed
-              raise unless e.message =~ /(context not found|no builder|does not exist)/
-            end
-            cli.create
-          else
-            raise
-          end
-        end
-
-        # Get the command here to ensure the Dir.chdir doesn't interfere with it
-        push = KAMAL.builder.push
+    # Get the command here to ensure the Dir.chdir doesn't interfere with it
+    push = KAMAL.builder.push

+    run_locally do
+      begin
        KAMAL.with_verbosity(:debug) do
          Dir.chdir(KAMAL.config.builder.build_directory) { execute *push }
        end
+      rescue SSHKit::Command::Failed => e
+        if e.message =~ /(no builder)|(no such file or directory)/
+          warn "Missing compatible builder, so creating a new one first"
+
+          if cli.create
+            KAMAL.with_verbosity(:debug) do
+              Dir.chdir(KAMAL.config.builder.build_directory) { execute *push }
+            end
+          end
+        else
+          raise
+        end
      end
    end
  end

  desc "pull", "Pull app image from registry onto servers"
  def pull
-    tunnels = Kamal::Cli::Tunnel::RemotePorts.new(KAMAL.hosts, KAMAL.config.registry.local_port).tap(&:open) if KAMAL.config.registry.local?
-
-    if (first_hosts = mirror_hosts).any?
-      #  Pull on a single host per mirror first to seed them
-      say "Pulling image on #{first_hosts.join(", ")} to seed the #{"mirror".pluralize(first_hosts.count)}...", :magenta
-      pull_on_hosts(first_hosts)
-      say "Pulling image on remaining hosts...", :magenta
-      pull_on_hosts(KAMAL.hosts - first_hosts)
-    else
-      pull_on_hosts(KAMAL.hosts)
+    on(KAMAL.hosts) do
+      execute *KAMAL.auditor.record("Pulled image with version #{KAMAL.config.version}"), verbosity: :debug
+      execute *KAMAL.builder.clean, raise_on_non_zero_exit: false
+      execute *KAMAL.builder.pull
+      execute *KAMAL.builder.validate_image
    end
-  ensure
-    tunnels&.close
  end

  desc "create", "Create a build setup"
  def create
-    if (remote_host = KAMAL.config.builder.remote)
+    if (remote_host = KAMAL.config.builder.remote_host)
      connect_to_remote_host(remote_host)
    end

@@ -140,28 +128,4 @@ class Kamal::Cli::Build < Kamal::Cli::Base
        end
      end
    end
-
-    def mirror_hosts
-      if KAMAL.hosts.many?
-        mirror_hosts = Concurrent::Hash.new
-        on(KAMAL.hosts) do |host|
-          first_mirror = capture_with_info(*KAMAL.builder.first_mirror).strip.presence
-          mirror_hosts[first_mirror] ||= host.to_s if first_mirror
-        rescue SSHKit::Command::Failed => e
-          raise unless e.message =~ /error calling index: reflect: slice index out of range/
-        end
-        mirror_hosts.values
-      else
-        []
-      end
-    end
-
-    def pull_on_hosts(hosts)
-      on(hosts) do |host|
-        execute *KAMAL.auditor.record("Pulled image with version #{KAMAL.config.version}"), verbosity: :debug
-        execute *KAMAL.builder.clean, raise_on_non_zero_exit: false
-        execute *KAMAL.builder.pull
-        execute *KAMAL.builder.validate_image
-      end
-    end
 end
--- a/lib/kamal/cli/env.rb
+++ b/lib/kamal/cli/env.rb
@@ -0,0 +1,45 @@
+require "tempfile"
+
+class Kamal::Cli::Env < Kamal::Cli::Base
+  desc "push", "Push the env file to the remote hosts"
+  def push
+    with_lock do
+      on(KAMAL.hosts) do
+        execute *KAMAL.auditor.record("Pushed env files"), verbosity: :debug
+
+        KAMAL.roles_on(host).each do |role|
+          execute *KAMAL.app(role: role, host: host).make_env_directory
+          upload! role.env(host).secrets_io, role.env(host).secrets_file, mode: 400
+        end
+      end
+
+      on(KAMAL.accessory_hosts) do
+        KAMAL.accessories_on(host).each do |accessory|
+          accessory_config = KAMAL.config.accessory(accessory)
+          execute *KAMAL.accessory(accessory).make_env_directory
+          upload! accessory_config.env.secrets_io, accessory_config.env.secrets_file, mode: 400
+        end
+      end
+    end
+  end
+
+  desc "delete", "Delete the env file from the remote hosts"
+  def delete
+    with_lock do
+      on(KAMAL.hosts) do
+        execute *KAMAL.auditor.record("Deleted env files"), verbosity: :debug
+
+        KAMAL.roles_on(host).each do |role|
+          execute *KAMAL.app(role: role, host: host).remove_env_file
+        end
+      end
+
+      on(KAMAL.accessory_hosts) do
+        KAMAL.accessories_on(host).each do |accessory|
+          accessory_config = KAMAL.config.accessory(accessory)
+          execute *KAMAL.accessory(accessory).remove_env_file
+        end
+      end
+    end
+  end
+end
--- a/lib/kamal/cli/healthcheck/error.rb
+++ b/lib/kamal/cli/healthcheck/error.rb
@@ -1,2 +0,0 @@
-class Kamal::Cli::Healthcheck::Error < StandardError
-end
--- a/lib/kamal/cli/healthcheck/poller.rb
+++ b/lib/kamal/cli/healthcheck/poller.rb
@@ -1,42 +0,0 @@
-module Kamal::Cli::Healthcheck::Poller
-  extend self
-
-  def wait_for_healthy(role, &block)
-    attempt = 1
-    timeout_at = Time.now + KAMAL.config.deploy_timeout
-    readiness_delay = KAMAL.config.readiness_delay
-
-    begin
-      status = block.call
-
-      if status == "running"
-        # Wait for the readiness delay and confirm it is still running
-        if readiness_delay > 0
-          info "Container is running, waiting for readiness delay of #{readiness_delay} seconds"
-          sleep readiness_delay
-          status = block.call
-        end
-      end
-
-      unless %w[ running healthy ].include?(status)
-        raise Kamal::Cli::Healthcheck::Error, "container not ready after #{KAMAL.config.deploy_timeout} seconds (#{status})"
-      end
-    rescue Kamal::Cli::Healthcheck::Error => e
-      time_left = timeout_at - Time.now
-      if time_left > 0
-        sleep [ attempt, time_left ].min
-        attempt += 1
-        retry
-      else
-        raise
-      end
-    end
-
-    info "Container is healthy!"
-  end
-
-  private
-    def info(message)
-      SSHKit.config.output.info(message)
-    end
-end
--- a/lib/kamal/cli/lock.rb
+++ b/lib/kamal/cli/lock.rb
@@ -3,6 +3,7 @@ class Kamal::Cli::Lock < Kamal::Cli::Base
  def status
    handle_missing_lock do
      on(KAMAL.primary_host) do
+        execute *KAMAL.server.ensure_run_directory
        puts capture_with_debug(*KAMAL.lock.status)
      end
    end
@@ -12,10 +13,9 @@ class Kamal::Cli::Lock < Kamal::Cli::Base
  option :message, aliases: "-m", type: :string, desc: "A lock message", required: true
  def acquire
    message = options[:message]
-    ensure_run_directory
-
    raise_if_locked do
      on(KAMAL.primary_host) do
+        execute *KAMAL.server.ensure_run_directory
        execute *KAMAL.lock.acquire(message, KAMAL.config.version), verbosity: :debug
      end
      say "Acquired the deploy lock"
@@ -26,6 +26,7 @@ class Kamal::Cli::Lock < Kamal::Cli::Base
  def release
    handle_missing_lock do
      on(KAMAL.primary_host) do
+        execute *KAMAL.server.ensure_run_directory
        execute *KAMAL.lock.release, verbosity: :debug
      end
      say "Released the deploy lock"
--- a/lib/kamal/cli/main.rb
+++ b/lib/kamal/cli/main.rb
@@ -9,6 +9,9 @@ class Kamal::Cli::Main < Kamal::Cli::Base
        say "Ensure Docker is installed...", :magenta
        invoke "kamal:cli:server:bootstrap", [], invoke_options

+        say "Evaluate and push env files...", :magenta
+        invoke "kamal:cli:main:envify", [], invoke_options
+
        invoke "kamal:cli:accessory:boot", [ "all" ], invoke_options
        deploy
      end
@@ -22,7 +25,7 @@ class Kamal::Cli::Main < Kamal::Cli::Base
      invoke_options = deploy_options

      say "Log into image registry...", :magenta
-      invoke "kamal:cli:registry:setup", [], invoke_options.merge(skip_local: options[:skip_push])
+      invoke "kamal:cli:registry:login", [], invoke_options

      if options[:skip_push]
        say "Pull app image...", :magenta
@@ -33,9 +36,9 @@ class Kamal::Cli::Main < Kamal::Cli::Base
      end

      with_lock do
-        run_hook "pre-deploy", secrets: true
+        run_hook "pre-deploy"

-        say "Ensure kamal-proxy is running...", :magenta
+        say "Ensure proxy is running...", :magenta
        invoke "kamal:cli:proxy:boot", [], invoke_options

        say "Detect stale containers...", :magenta
@@ -48,10 +51,10 @@ class Kamal::Cli::Main < Kamal::Cli::Base
      end
    end

-    run_hook "post-deploy", secrets: true, runtime: runtime.round.to_s
+    run_hook "post-deploy", runtime: runtime.round
  end

-  desc "redeploy", "Deploy app to servers without bootstrapping servers, starting kamal-proxy, pruning, and registry login"
+  desc "redeploy", "Deploy app to servers without bootstrapping servers, starting proxy, pruning, and registry login"
  option :skip_push, aliases: "-P", type: :boolean, default: false, desc: "Skip image build and push"
  def redeploy
    runtime = print_runtime do
@@ -66,7 +69,7 @@ class Kamal::Cli::Main < Kamal::Cli::Base
      end

      with_lock do
-        run_hook "pre-deploy", secrets: true
+        run_hook "pre-deploy"

        say "Detect stale containers...", :magenta
        invoke "kamal:cli:app:stale_containers", [], invoke_options.merge(stop: true)
@@ -75,7 +78,7 @@ class Kamal::Cli::Main < Kamal::Cli::Base
      end
    end

-    run_hook "post-deploy", secrets: true, runtime: runtime.round.to_s
+    run_hook "post-deploy", runtime: runtime.round
  end

  desc "rollback [VERSION]", "Rollback app to VERSION"
@@ -89,7 +92,7 @@ class Kamal::Cli::Main < Kamal::Cli::Base
        old_version = nil

        if container_available?(version)
-          run_hook "pre-deploy", secrets: true
+          run_hook "pre-deploy"

          invoke "kamal:cli:app:boot", [], invoke_options.merge(version: version)
          rolled_back = true
@@ -99,7 +102,7 @@ class Kamal::Cli::Main < Kamal::Cli::Base
      end
    end

-    run_hook "post-deploy", secrets: true, runtime: runtime.round.to_s if rolled_back
+    run_hook "post-deploy", runtime: runtime.round if rolled_back
  end

  desc "details", "Show details about all containers"
@@ -123,18 +126,6 @@ class Kamal::Cli::Main < Kamal::Cli::Base
    end
  end

-  desc "docs [SECTION]", "Show Kamal configuration documentation"
-  def docs(section = nil)
-    case section
-    when NilClass
-      puts Kamal::Configuration.validation_doc
-    else
-      puts Kamal::Configuration.const_get(section.titlecase.to_sym).validation_doc
-    end
-  rescue NameError
-    puts "No documentation found for #{section}"
-  end
-
  desc "init", "Create config stub in config/deploy.yml and env stub in .env"
  option :bundle, type: :boolean, default: false, desc: "Add Kamal to the Gemfile and create a bin/kamal binstub"
  def init
@@ -148,10 +139,9 @@ class Kamal::Cli::Main < Kamal::Cli::Base
      puts "Created configuration file in config/deploy.yml"
    end

-    unless (secrets_file = Pathname.new(File.expand_path(".kamal/secrets"))).exist?
-      FileUtils.mkdir_p secrets_file.dirname
-      FileUtils.cp_r Pathname.new(File.expand_path("templates/secrets", __dir__)), secrets_file
-      puts "Created .kamal/secrets file"
+    unless (deploy_file = Pathname.new(File.expand_path(".env"))).exist?
+      FileUtils.cp_r Pathname.new(File.expand_path("templates/template.env", __dir__)), deploy_file
+      puts "Created .env file"
    end

    unless (hooks_dir = Pathname.new(File.expand_path(".kamal/hooks"))).exist?
@@ -176,46 +166,38 @@ class Kamal::Cli::Main < Kamal::Cli::Base
    end
  end

-  desc "remove", "Remove kamal-proxy, app, accessories, and registry session from servers"
+  desc "envify", "Create .env by evaluating .env.erb (or .env.staging.erb -> .env.staging when using -d staging)"
+  option :skip_push, aliases: "-P", type: :boolean, default: false, desc: "Skip .env file push"
+  def envify
+    if destination = options[:destination]
+      env_template_path = ".env.#{destination}.erb"
+      env_path          = ".env.#{destination}"
+    else
+      env_template_path = ".env.erb"
+      env_path          = ".env"
+    end
+
+    if Pathname.new(File.expand_path(env_template_path)).exist?
+      File.write(env_path, ERB.new(File.read(env_template_path), trim_mode: "-").result, perm: 0600)
+
+      unless options[:skip_push]
+        reload_envs
+        invoke "kamal:cli:env:push", options
+      end
+    else
+      puts "Skipping envify (no #{env_template_path} exist)"
+    end
+  end
+
+  desc "remove", "Remove proxy, app, accessories, and registry session from servers"
  option :confirmed, aliases: "-y", type: :boolean, default: false, desc: "Proceed without confirmation question"
  def remove
    confirming "This will remove all containers and images. Are you sure?" do
      with_lock do
-        invoke "kamal:cli:app:remove", [], options.without(:confirmed)
        invoke "kamal:cli:proxy:remove", [], options.without(:confirmed)
+        invoke "kamal:cli:app:remove", [], options.without(:confirmed)
        invoke "kamal:cli:accessory:remove", [ "all" ], options
-        invoke "kamal:cli:registry:remove", [], options.without(:confirmed).merge(skip_local: true)
-      end
-    end
-  end
-
-  desc "upgrade", "Upgrade from Kamal 1.x to 2.0"
-  option :confirmed, aliases: "-y", type: :boolean, default: false, desc: "Proceed without confirmation question"
-  option :rolling, type: :boolean, default: false, desc: "Upgrade one host at a time"
-  def upgrade
-    confirming "This will replace Traefik with kamal-proxy and restart all accessories" do
-      with_lock do
-        if options[:rolling]
-          (KAMAL.hosts | KAMAL.accessory_hosts).each do |host|
-            KAMAL.with_specific_hosts(host) do
-              say "Upgrading #{host}...", :magenta
-              if KAMAL.hosts.include?(host)
-                invoke "kamal:cli:proxy:upgrade", [], options.merge(confirmed: true, rolling: false)
-                reset_invocation(Kamal::Cli::Proxy)
-              end
-              if KAMAL.accessory_hosts.include?(host)
-                invoke "kamal:cli:accessory:upgrade", [ "all" ], options.merge(confirmed: true, rolling: false)
-                reset_invocation(Kamal::Cli::Accessory)
-              end
-              say "Upgraded #{host}", :magenta
-            end
-          end
-        else
-          say "Upgrading all hosts...", :magenta
-          invoke "kamal:cli:proxy:upgrade", [], options.merge(confirmed: true)
-          invoke "kamal:cli:accessory:upgrade", [ "all" ], options.merge(confirmed: true)
-          say "Upgraded all hosts", :magenta
-        end
+        invoke "kamal:cli:registry:logout", [], options.without(:confirmed)
      end
    end
  end
@@ -234,24 +216,24 @@ class Kamal::Cli::Main < Kamal::Cli::Base
  desc "build", "Build application image"
  subcommand "build", Kamal::Cli::Build

+  desc "env", "Manage environment files"
+  subcommand "env", Kamal::Cli::Env
+
  desc "lock", "Manage the deploy lock"
  subcommand "lock", Kamal::Cli::Lock

-  desc "proxy", "Manage kamal-proxy"
-  subcommand "proxy", Kamal::Cli::Proxy
-
  desc "prune", "Prune old application images and containers"
  subcommand "prune", Kamal::Cli::Prune

  desc "registry", "Login and -out of the image registry"
  subcommand "registry", Kamal::Cli::Registry

-  desc "secrets", "Helpers for extracting secrets"
-  subcommand "secrets", Kamal::Cli::Secrets
-
  desc "server", "Bootstrap servers with curl and Docker"
  subcommand "server", Kamal::Cli::Server

+  desc "proxy", "Manage load balancer proxy"
+  subcommand "proxy", Kamal::Cli::Proxy
+
  private
    def container_available?(version)
      begin
--- a/lib/kamal/cli/proxy.rb
+++ b/lib/kamal/cli/proxy.rb
@@ -2,20 +2,8 @@ class Kamal::Cli::Proxy < Kamal::Cli::Base
  desc "boot", "Boot proxy on servers"
  def boot
    with_lock do
-      on(KAMAL.hosts) do |host|
-        execute *KAMAL.docker.create_network
-      rescue SSHKit::Command::Failed => e
-        raise unless e.message.include?("already exists")
-      end
-
-      on(KAMAL.proxy_hosts) do |host|
-        execute *KAMAL.registry.login unless KAMAL.config.registry.local?
-
-        version = capture_with_info(*KAMAL.proxy.version).strip.presence
-
-        if version && Kamal::Utils.older_version?(version, Kamal::Configuration::PROXY_MINIMUM_VERSION)
-          raise "kamal-proxy version #{version} is too old, please reboot to update to at least #{Kamal::Configuration::PROXY_MINIMUM_VERSION}"
-        end
+      on(KAMAL.proxy_hosts) do
+        execute *KAMAL.registry.login
        execute *KAMAL.proxy.start_or_run
      end
    end
@@ -31,30 +19,12 @@ class Kamal::Cli::Proxy < Kamal::Cli::Base
        host_groups.each do |hosts|
          host_list = Array(hosts).join(",")
          run_hook "pre-proxy-reboot", hosts: host_list
-          on(hosts) do |host|
+          on(hosts) do
            execute *KAMAL.auditor.record("Rebooted proxy"), verbosity: :debug
-            execute *KAMAL.registry.login unless KAMAL.config.registry.local?
-
-            "Stopping and removing Traefik on #{host}, if running..."
-            execute *KAMAL.proxy.cleanup_traefik
-
-            "Stopping and removing kamal-proxy on #{host}, if running..."
+            execute *KAMAL.registry.login
            execute *KAMAL.proxy.stop, raise_on_non_zero_exit: false
            execute *KAMAL.proxy.remove_container
-
            execute *KAMAL.proxy.run
-
-            KAMAL.roles_on(host).select(&:running_proxy?).each do |role|
-              app = KAMAL.app(role: role, host: host)
-
-              version = capture_with_info(*app.current_running_version, raise_on_non_zero_exit: false).strip
-              endpoint = capture_with_info(*app.container_id_for_version(version)).strip
-
-              if endpoint.present?
-                info "Deploying #{endpoint} for role `#{role}` on #{host}..."
-                execute *app.deploy(target: endpoint)
-              end
-            end
          end
          run_hook "post-proxy-reboot", hosts: host_list
        end
@@ -62,50 +32,10 @@ class Kamal::Cli::Proxy < Kamal::Cli::Base
    end
  end

-  desc "upgrade", "Upgrade to kamal-proxy on servers (stop container, remove container, start new container, reboot app)", hide: true
-  option :rolling, type: :boolean, default: false, desc: "Reboot proxy on hosts in sequence, rather than in parallel"
-  option :confirmed, aliases: "-y", type: :boolean, default: false, desc: "Proceed without confirmation question"
-  def upgrade
-    invoke_options = { "version" => KAMAL.config.latest_tag }.merge(options)
-
-    confirming "This will cause a brief outage on each host. Are you sure?" do
-      host_groups = options[:rolling] ? KAMAL.hosts : [ KAMAL.hosts ]
-      host_groups.each do |hosts|
-        host_list = Array(hosts).join(",")
-        say "Upgrading proxy on #{host_list}...", :magenta
-        run_hook "pre-proxy-reboot", hosts: host_list
-        on(hosts) do |host|
-          execute *KAMAL.auditor.record("Rebooted proxy"), verbosity: :debug
-          execute *KAMAL.registry.login unless KAMAL.config.registry.local?
-
-          "Stopping and removing Traefik on #{host}, if running..."
-          execute *KAMAL.proxy.cleanup_traefik
-
-          "Stopping and removing kamal-proxy on #{host}, if running..."
-          execute *KAMAL.proxy.stop, raise_on_non_zero_exit: false
-          execute *KAMAL.proxy.remove_container
-          execute *KAMAL.proxy.remove_image
-        end
-
-        KAMAL.with_specific_hosts(hosts) do
-          invoke "kamal:cli:proxy:boot", [], invoke_options
-          reset_invocation(Kamal::Cli::Proxy)
-          invoke "kamal:cli:app:boot", [], invoke_options
-          reset_invocation(Kamal::Cli::App)
-          invoke "kamal:cli:prune:all", [], invoke_options
-          reset_invocation(Kamal::Cli::Prune)
-        end
-
-        run_hook "post-proxy-reboot", hosts: host_list
-        say "Upgraded proxy on #{host_list}", :magenta
-      end
-    end
-  end
-
  desc "start", "Start existing proxy container on servers"
  def start
    with_lock do
-      on(KAMAL.proxy_hosts) do |host|
+      on(KAMAL.proxy_hosts) do
        execute *KAMAL.auditor.record("Started proxy"), verbosity: :debug
        execute *KAMAL.proxy.start
      end
@@ -115,7 +45,7 @@ class Kamal::Cli::Proxy < Kamal::Cli::Base
  desc "stop", "Stop existing proxy container on servers"
  def stop
    with_lock do
-      on(KAMAL.proxy_hosts) do |host|
+      on(KAMAL.proxy_hosts) do
        execute *KAMAL.auditor.record("Stopped proxy"), verbosity: :debug
        execute *KAMAL.proxy.stop, raise_on_non_zero_exit: false
      end
@@ -130,6 +60,50 @@ class Kamal::Cli::Proxy < Kamal::Cli::Base
    end
  end

+  desc "update", "Update from Traefik to kamal-proxy, for when moving from Kamal v1 to Kamal v2"
+  option :rolling, type: :boolean, default: false, desc: "Reboot proxy on hosts in sequence, rather than in parallel"
+  option :confirmed, aliases: "-y", type: :boolean, default: false, desc: "Proceed without confirmation question"
+  def update
+    confirming "This will cause a brief outage on each host. Are you sure?" do
+      with_lock do
+        host_groups = options[:rolling] ? KAMAL.proxy_hosts : [ KAMAL.proxy_hosts ]
+        host_groups.each do |hosts|
+          host_list = Array(hosts).join(",")
+          run_hook "pre-proxy-reboot", hosts: host_list
+          on(hosts) do
+            info "Updating proxy from Traefik to kamal-proxy on #{host}..."
+            execute *KAMAL.auditor.record("Updated proxy from Traefik to kamal-proxy"), verbosity: :debug
+            execute *KAMAL.registry.login
+
+            info "Stopping and removing Traefik on #{host}..."
+            execute *KAMAL.proxy.stop(name: "traefik"), raise_on_non_zero_exit: false
+            execute *KAMAL.proxy.remove_container(filter: "label=org.opencontainers.image.title=traefik")
+            execute *KAMAL.proxy.remove_image(filter: "label=org.opencontainers.image.title=traefik")
+
+            info "Stopping and removing kamal-proxy on #{host}, if running..."
+            execute *KAMAL.proxy.stop, raise_on_non_zero_exit: false
+            execute *KAMAL.proxy.remove_container
+
+            info "Starting kamal-proxy on #{host}..."
+            execute *KAMAL.proxy.run
+
+            KAMAL.roles_on(host).select(&:running_proxy?).each do |role|
+              app = KAMAL.app(role: role, host: host)
+
+              version = capture_with_info(*app.current_running_version, raise_on_non_zero_exit: false).strip
+              endpoint = capture_with_info(*app.container_endpoint(version: version)).strip
+              raise Kamal::Cli::BootError, "Failed to get endpoint for #{role} on #{host}, is the app container running?" if endpoint.empty?
+
+              info "Deploying #{endpoint} for role `#{role}` on #{host}..."
+              execute *KAMAL.proxy.deploy(role.container_prefix, target: endpoint)
+            end
+          end
+          run_hook "post-proxy-reboot", hosts: host_list
+        end
+      end
+    end
+  end
+
  desc "details", "Show details about proxy container from servers"
  def details
    on(KAMAL.proxy_hosts) { |host| puts_by_host host, capture_with_info(*KAMAL.proxy.info), type: "Proxy" }
@@ -140,36 +114,31 @@ class Kamal::Cli::Proxy < Kamal::Cli::Base
  option :lines, type: :numeric, aliases: "-n", desc: "Number of log lines to pull from each server"
  option :grep, aliases: "-g", desc: "Show lines with grep match only (use this to fetch specific requests by id)"
  option :follow, aliases: "-f", desc: "Follow logs on primary server (or specific host set by --hosts)"
-  option :skip_timestamps, type: :boolean, aliases: "-T", desc: "Skip appending timestamps to logging output"
  def logs
    grep = options[:grep]
-    timestamps = !options[:skip_timestamps]

    if options[:follow]
      run_locally do
        info "Following logs on #{KAMAL.primary_host}..."
-        info KAMAL.proxy.follow_logs(host: KAMAL.primary_host, timestamps: timestamps, grep: grep)
-        exec KAMAL.proxy.follow_logs(host: KAMAL.primary_host, timestamps: timestamps, grep: grep)
+        info KAMAL.proxy.follow_logs(host: KAMAL.primary_host, grep: grep)
+        exec KAMAL.proxy.follow_logs(host: KAMAL.primary_host, grep: grep)
      end
    else
      since = options[:since]
      lines = options[:lines].presence || ((since || grep) ? nil : 100) # Default to 100 lines if since or grep isn't set

      on(KAMAL.proxy_hosts) do |host|
-        puts_by_host host, capture(*KAMAL.proxy.logs(timestamps: timestamps, since: since, lines: lines, grep: grep)), type: "Proxy"
+        puts_by_host host, capture(*KAMAL.proxy.logs(since: since, lines: lines, grep: grep)), type: "Proxy"
      end
    end
  end

  desc "remove", "Remove proxy container and image from servers"
-  option :force, type: :boolean, default: false, desc: "Force removing proxy when apps are still installed"
  def remove
    with_lock do
-      if removal_allowed?(options[:force])
-        stop
-        remove_container
-        remove_image
-      end
+      stop
+      remove_container
+      remove_image
    end
  end

@@ -192,24 +161,4 @@ class Kamal::Cli::Proxy < Kamal::Cli::Base
      end
    end
  end
-
-  private
-    def removal_allowed?(force)
-      on(KAMAL.proxy_hosts) do |host|
-        app_count = capture_with_info(*KAMAL.server.app_directory_count).chomp.to_i
-        raise "The are other applications installed on #{host}" if app_count > 0
-      end
-
-      true
-    rescue SSHKit::Runner::ExecuteError => e
-      raise unless e.message.include?("The are other applications installed on")
-
-      if force
-        say "Forcing, so removing the proxy, even though other apps are installed", :magenta
-      else
-        say "Not removing the proxy, as other apps are installed, ignore this check with kamal proxy remove --force", :magenta
-      end
-
-      force
-    end
 end
--- a/lib/kamal/cli/registry.rb
+++ b/lib/kamal/cli/registry.rb
@@ -1,25 +1,18 @@
 class Kamal::Cli::Registry < Kamal::Cli::Base
-  desc "login", "Setup local registry or log in to remote registry locally and remotely"
-  option :skip_local, aliases: "-L", type: :boolean, default: false, desc: "Skip local login"
-  option :skip_remote, aliases: "-R", type: :boolean, default: false, desc: "Skip remote login"
-  def setup
-    if KAMAL.registry.local?
-      run_locally    { execute *KAMAL.registry.setup } unless options[:skip_local]
-    else
-      run_locally    { execute *KAMAL.registry.login } unless options[:skip_local]
-      on(KAMAL.hosts) { execute *KAMAL.registry.login } unless options[:skip_remote]
-    end
+  desc "login", "Log in to registry locally and remotely"
+  def login
+    run_locally    { execute *KAMAL.registry.login }
+    on(KAMAL.hosts) { execute *KAMAL.registry.login }
+  # FIXME: This rescue needed?
+  rescue ArgumentError => e
+    puts e.message
  end

-  desc "remove", "Remove local registry or log out of remote registry locally and remotely"
-  option :skip_local, aliases: "-L", type: :boolean, default: false, desc: "Skip local login"
-  option :skip_remote, aliases: "-R", type: :boolean, default: false, desc: "Skip remote login"
-  def remove
-    if KAMAL.registry.local?
-      run_locally    { execute *KAMAL.registry.remove, raise_on_non_zero_exit: false } unless options[:skip_local]
-    else
-      run_locally    { execute *KAMAL.registry.logout } unless options[:skip_local]
-      on(KAMAL.hosts) { execute *KAMAL.registry.logout } unless options[:skip_remote]
-    end
+  desc "logout", "Log out of registry remotely"
+  def logout
+    on(KAMAL.hosts) { execute *KAMAL.registry.logout }
+  # FIXME: This rescue needed?
+  rescue ArgumentError => e
+    puts e.message
  end
 end
--- a/lib/kamal/cli/secrets.rb
+++ b/lib/kamal/cli/secrets.rb
@@ -1,36 +0,0 @@
-class Kamal::Cli::Secrets < Kamal::Cli::Base
-  desc "fetch [SECRETS...]", "Fetch secrets from a vault"
-  option :adapter, type: :string, aliases: "-a", required: true, desc: "Which vault adapter to use"
-  option :account, type: :string, required: true, desc: "The account identifier or username"
-  option :from, type: :string, required: false, desc: "A vault or folder to fetch the secrets from"
-  option :inline, type: :boolean, required: false, hidden: true
-  def fetch(*secrets)
-    results = adapter(options[:adapter]).fetch(secrets, **options.slice(:account, :from).symbolize_keys)
-
-    return_or_puts JSON.dump(results).shellescape, inline: options[:inline]
-  end
-
-  desc "extract", "Extract a single secret from the results of a fetch call"
-  option :inline, type: :boolean, required: false, hidden: true
-  def extract(name, secrets)
-    parsed_secrets = JSON.parse(secrets)
-    value = parsed_secrets[name] || parsed_secrets.find { |k, v| k.end_with?("/#{name}") }&.last
-
-    raise "Could not find secret #{name}" if value.nil?
-
-    return_or_puts value, inline: options[:inline]
-  end
-
-  private
-    def adapter(adapter)
-      Kamal::Secrets::Adapters.lookup(adapter)
-    end
-
-    def return_or_puts(value, inline: nil)
-      if inline
-        value
-      else
-        puts value
-      end
-    end
-end
--- a/lib/kamal/cli/server.rb
+++ b/lib/kamal/cli/server.rb
@@ -1,8 +1,7 @@
 class Kamal::Cli::Server < Kamal::Cli::Base
  desc "exec", "Run a custom command on the server (use --help to show options)"
  option :interactive, type: :boolean, aliases: "-i", default: false, desc: "Run the command interactively (use for console/bash)"
-  def exec(*cmd)
-    cmd = Kamal::Utils.join_commands(cmd)
+  def exec(cmd)
    hosts = KAMAL.hosts | KAMAL.accessory_hosts

    case
@@ -36,6 +35,8 @@ class Kamal::Cli::Server < Kamal::Cli::Base
            missing << host
          end
        end
+
+        execute(*KAMAL.server.ensure_run_directory)
      end

      if missing.any?
--- a/lib/kamal/cli/templates/deploy.yml
+++ b/lib/kamal/cli/templates/deploy.yml
@@ -18,10 +18,6 @@ registry:
  password:
    - KAMAL_REGISTRY_PASSWORD

-# Configure builder setup.
-builder:
-  arch: amd64
-
 # Inject ENV variables into containers (secrets come from .env).
 # Remember to run `kamal env push` after making changes!
 # env:
@@ -34,6 +30,16 @@ builder:
 # ssh:
 #   user: app

+# Configure builder setup.
+# builder:
+#   args:
+#     RUBY_VERSION: 3.2.0
+#   secrets:
+#     - GITHUB_TOKEN
+#   remote:
+#     arch: amd64
+#     host: ssh://app@192.168.0.1
+
 # Use accessory services (secrets come from .env).
 # accessories:
 #   db:
--- a/lib/kamal/cli/templates/sample_hooks/docker-setup.sample
+++ b/lib/kamal/cli/templates/sample_hooks/docker-setup.sample
@@ -2,12 +2,6 @@

 # A sample docker-setup hook
 #
-# Sets up a Docker network on defined hosts which can then be used by the application’s containers
+# Sets up a Docker network which can then be used by the application’s containers

-hosts = ENV["KAMAL_HOSTS"].split(",")
-
-hosts.each do |ip|
-  destination = "root@#{ip}"
-  puts "Creating a Docker network \"kamal\" on #{destination}"
-  `ssh #{destination} docker network create kamal`
-end
+ssh user@example.com docker network create kamal
--- a/lib/kamal/cli/templates/sample_hooks/post-proxy-reboot.sample
+++ b/lib/kamal/cli/templates/sample_hooks/post-proxy-reboot.sample
@@ -1,3 +1,3 @@
 #!/bin/sh

-echo "Rebooted kamal-proxy on $KAMAL_HOSTS"
+echo "Rebooted proxy on $KAMAL_HOSTS"
--- a/lib/kamal/cli/templates/sample_hooks/pre-proxy-reboot.sample
+++ b/lib/kamal/cli/templates/sample_hooks/pre-proxy-reboot.sample
@@ -1,3 +1,3 @@
 #!/bin/sh

-echo "Rebooting Traefik on $KAMAL_HOSTS..."
+echo "Rebooting proxy on $KAMAL_HOSTS..."
--- a/lib/kamal/cli/templates/secrets
+++ b/lib/kamal/cli/templates/secrets
@@ -1,16 +0,0 @@
-# WARNING: Avoid adding secrets directly to this file
-# If you must, then add `.kamal/secrets*` to your .gitignore file
-
-# Option 1: Read secrets from the environment
-KAMAL_REGISTRY_PASSWORD=$KAMAL_REGISTRY_PASSWORD
-
-# Option 2: Read secrets via a command
-# RAILS_MASTER_KEY=$(cat config/master.key)
-
-# Option 3: Read secrets via kamal secrets helpers
-# These will handle logging in and fetching the secrets in as few calls as possible
-# There are adapters for 1Password, LastPass + Bitwarden
-#
-# SECRETS=$(kamal secrets fetch --adapter 1password --account my-account --from MyVault/MyItem KAMAL_REGISTRY_PASSWORD RAILS_MASTER_KEY)
-# KAMAL_REGISTRY_PASSWORD=$(kamal secrets extract KAMAL_REGISTRY_PASSWORD $SECRETS)
-# RAILS_MASTER_KEY=$(kamal secrets extract RAILS_MASTER_KEY $SECRETS)
--- a/lib/kamal/cli/templates/template.env
+++ b/lib/kamal/cli/templates/template.env
@@ -0,0 +1,2 @@
+KAMAL_REGISTRY_PASSWORD=change-this
+RAILS_MASTER_KEY=another-env
--- a/lib/kamal/cli/tunnel/remote_ports.rb
+++ b/lib/kamal/cli/tunnel/remote_ports.rb
@@ -1,66 +0,0 @@
-Signal.trap "SIGPROF" do
-  Thread.list.each do |thread|
-    puts thread.name
-    puts thread.backtrace.map { |bt| "  #{bt}" }
-    puts
-  end
-end
-
-require "concurrent/map"
-
-class Kamal::Cli::Tunnel::RemotePorts
-  attr_reader :hosts, :port
-
-  def initialize(hosts, port)
-    @hosts = hosts
-    @port = port
-    @open = false
-  end
-
-  def open
-    @open = true
-    @opened = Concurrent::Map.new
-
-    @threads = hosts.map do |host|
-      Thread.new do
-        Net::SSH.start(host, KAMAL.config.ssh.user) do |ssh|
-          forwarding = nil
-          ssh.forward.remote(port, "localhost", port, "localhost") do |actual_remote_port|
-            forwarding = !!actual_remote_port
-            :no_exception # will yield the exception on my own thread
-          end
-          ssh.loop { forwarding.nil? }
-          if forwarding
-            @opened[host] = true
-            ssh.loop(0.1) { @open }
-
-            ssh.forward.cancel_remote(port, "localhost")
-            ssh.loop(0.1) { ssh.forward.active_remotes.include?([ port, "localhost" ]) }
-          else
-            @opened[host] = false
-          end
-        end
-      rescue => e
-        @opened[host] = false
-
-        puts e.message
-        puts e.backtrace
-      end
-    end
-
-    loop do
-      break if @opened.size == hosts.size
-      sleep 0.1
-    end
-
-    raise "Could not open tunnels on #{opened.reject { |k, v| v }.join(", ")}" unless @opened.values.all?
-  end
-
-  def close
-    p "Closing"
-    @open = false
-    p "Joining"
-    @threads.each(&:join)
-    p "Joined"
-  end
-end
--- a/lib/kamal/commander.rb
+++ b/lib/kamal/commander.rb
@@ -1,6 +1,5 @@
 require "active_support/core_ext/enumerable"
 require "active_support/core_ext/module/delegation"
-require "active_support/core_ext/object/blank"

 class Kamal::Commander
  attr_accessor :verbosity, :holding_lock, :connected
@@ -24,19 +23,11 @@ class Kamal::Commander
    @config, @config_kwargs = nil, kwargs
  end

-  def configured?
-    @config || @config_kwargs
-  end
-
  attr_reader :specific_roles, :specific_hosts

  def specific_primary!
    @specifics = nil
-    if specific_roles.present?
-      self.specific_hosts = [ specific_roles.first.primary_host ]
-    else
-      self.specific_hosts = [ config.primary_host ]
-    end
+    self.specific_hosts = [ config.primary_host ]
  end

  def specific_roles=(role_names)
@@ -65,13 +56,6 @@ class Kamal::Commander
    end
  end

-  def with_specific_hosts(hosts)
-    original_hosts, self.specific_hosts = specific_hosts, hosts
-    yield
-  ensure
-    self.specific_hosts = original_hosts
-  end
-
  def accessory_names
    config.accessories&.collect(&:name) || []
  end
@@ -109,10 +93,6 @@ class Kamal::Commander
    @lock ||= Kamal::Commands::Lock.new(config)
  end

-  def proxy
-    @proxy ||= Kamal::Commands::Proxy.new(config)
-  end
-
  def prune
    @prune ||= Kamal::Commands::Prune.new(config)
  end
@@ -125,8 +105,8 @@ class Kamal::Commander
    @server ||= Kamal::Commands::Server.new(config)
  end

-  def alias(name)
-    config.aliases[name]
+  def proxy
+    @proxy ||= Kamal::Commands::Proxy.new(config)
  end


--- a/lib/kamal/commander/specifics.rb
+++ b/lib/kamal/commander/specifics.rb
@@ -23,7 +23,7 @@ class Kamal::Commander::Specifics
  end

  def accessory_hosts
-    config.accessories.flat_map(&:hosts) & specified_hosts
+    specific_hosts || config.accessories.flat_map(&:hosts)
  end

  private
--- a/lib/kamal/commands/accessory.rb
+++ b/lib/kamal/commands/accessory.rb
@@ -1,9 +1,7 @@
 class Kamal::Commands::Accessory < Kamal::Commands::Base
  attr_reader :accessory_config
  delegate :service_name, :image, :hosts, :port, :files, :directories, :cmd,
-           :publish_args, :env_args, :volume_args, :label_args, :option_args,
-           :secrets_io, :secrets_path, :env_directory,
-           to: :accessory_config
+           :publish_args, :env_args, :volume_args, :label_args, :option_args, to: :accessory_config

  def initialize(config, name:)
    super(config)
@@ -15,7 +13,6 @@ class Kamal::Commands::Accessory < Kamal::Commands::Base
      "--name", service_name,
      "--detach",
      "--restart", "unless-stopped",
-      "--network", "kamal",
      *config.logging_args,
      *publish_args,
      *env_args,
@@ -39,17 +36,17 @@ class Kamal::Commands::Accessory < Kamal::Commands::Base
  end


-  def logs(timestamps: true, since: nil, lines: nil, grep: nil, grep_options: nil)
+  def logs(since: nil, lines: nil, grep: nil)
    pipe \
-      docker(:logs, service_name, (" --since #{since}" if since), (" --tail #{lines}" if lines), ("--timestamps" if timestamps), "2>&1"),
-      ("grep '#{grep}'#{" #{grep_options}" if grep_options}" if grep)
+      docker(:logs, service_name, (" --since #{since}" if since), (" --tail #{lines}" if lines), "--timestamps", "2>&1"),
+      ("grep '#{grep}'" if grep)
  end

-  def follow_logs(timestamps: true, grep: nil, grep_options: nil)
+  def follow_logs(grep: nil)
    run_over_ssh \
      pipe \
-        docker(:logs, service_name, ("--timestamps" if timestamps), "--tail", "10", "--follow", "2>&1"),
-        (%(grep "#{grep}"#{" #{grep_options}" if grep_options}) if grep)
+        docker(:logs, service_name, "--timestamps", "--tail", "10", "--follow", "2>&1"),
+        (%(grep "#{grep}") if grep)
  end


@@ -64,7 +61,6 @@ class Kamal::Commands::Accessory < Kamal::Commands::Base
    docker :run,
      ("-it" if interactive),
      "--rm",
-      "--network", "kamal",
      *env_args,
      *volume_args,
      image,
@@ -102,8 +98,12 @@ class Kamal::Commands::Accessory < Kamal::Commands::Base
    docker :image, :rm, "--force", image
  end

-  def ensure_env_directory
-    make_directory env_directory
+  def make_env_directory
+    make_directory accessory_config.env.secrets_directory
+  end
+
+  def remove_env_file
+    [ :rm, "-f", accessory_config.env.secrets_file ]
  end

  private
--- a/lib/kamal/commands/app.rb
+++ b/lib/kamal/commands/app.rb
@@ -1,12 +1,10 @@
 class Kamal::Commands::App < Kamal::Commands::Base
-  include Assets, Containers, Execution, Images, Logging, Proxy
+  include Assets, Containers, Execution, Images, Logging

  ACTIVE_DOCKER_STATUSES = [ :running, :restarting ]

  attr_reader :role, :host

-  delegate :container_name, to: :role
-
  def initialize(config, role: nil, host: nil)
    super(config)
    @role = role
@@ -18,7 +16,6 @@ class Kamal::Commands::App < Kamal::Commands::Base
      "--detach",
      "--restart unless-stopped",
      "--name", container_name,
-      "--network", "kamal",
      *([ "--hostname", hostname ] if hostname),
      "-e", "KAMAL_CONTAINER_NAME=\"#{container_name}\"",
      "-e", "KAMAL_VERSION=\"#{config.version}\"",
@@ -43,7 +40,7 @@ class Kamal::Commands::App < Kamal::Commands::Base
  def stop(version: nil)
    pipe \
      version ? container_id_for_version(version) : current_running_container_id,
-      xargs(docker(:stop, *role.stop_args))
+      xargs(config.stop_wait_time ? docker(:stop, "-t", config.stop_wait_time) : docker(:stop))
  end

  def info
@@ -59,6 +56,10 @@ class Kamal::Commands::App < Kamal::Commands::Base
    container_id_for(container_name: container_name(version), only_running: only_running)
  end

+  def container_name(version = nil)
+    [ role.container_prefix, version || config.version ].compact.join("-")
+  end
+
  def current_running_version
    pipe \
      current_running_container(format: "--format '{{.Names}}'"),
@@ -71,11 +72,21 @@ class Kamal::Commands::App < Kamal::Commands::Base
      extract_version_from_name
  end

-  def ensure_env_directory
-    make_directory role.env_directory
+
+  def make_env_directory
+    make_directory role.env(host).secrets_directory
  end

+  def remove_env_file
+    [ :rm, "-f", role.env(host).secrets_file ]
+  end
+
+
  private
+    def container_name(version = nil)
+      [ role.container_prefix, version || config.version ].compact.join("-")
+    end
+
    def latest_image_id
      docker :image, :ls, *argumentize("--filter", "reference=#{config.latest_image}"), "--format", "'{{.ID}}'"
    end
--- a/lib/kamal/commands/app/assets.rb
+++ b/lib/kamal/commands/app/assets.rb
@@ -3,18 +3,18 @@ module Kamal::Commands::App::Assets
    asset_container = "#{role.container_prefix}-assets"

    combine \
-      make_directory(role.asset_extracted_directory),
+      make_directory(role.asset_extracted_path),
      [ *docker(:stop, "-t 1", asset_container, "2> /dev/null"), "|| true" ],
-      docker(:run, "--name", asset_container, "--detach", "--rm", "--entrypoint", "sleep", config.absolute_image, "1000000"),
-      docker(:cp, "-L", "#{asset_container}:#{role.asset_path}/.", role.asset_extracted_directory),
+      docker(:run, "--name", asset_container, "--detach", "--rm", config.absolute_image, "sleep 1000000"),
+      docker(:cp, "-L", "#{asset_container}:#{role.asset_path}/.", role.asset_extracted_path),
      docker(:stop, "-t 1", asset_container),
      by: "&&"
  end

  def sync_asset_volumes(old_version: nil)
-    new_extracted_path, new_volume_path = role.asset_extracted_directory(config.version), role.asset_volume.host_path
+    new_extracted_path, new_volume_path = role.asset_extracted_path(config.version), role.asset_volume.host_path
    if old_version.present?
-      old_extracted_path, old_volume_path = role.asset_extracted_directory(old_version), role.asset_volume(old_version).host_path
+      old_extracted_path, old_volume_path = role.asset_extracted_path(old_version), role.asset_volume(old_version).host_path
    end

    commands = [ make_directory(new_volume_path), copy_contents(new_extracted_path, new_volume_path) ]
@@ -29,8 +29,8 @@ module Kamal::Commands::App::Assets

  def clean_up_assets
    chain \
-      find_and_remove_older_siblings(role.asset_extracted_directory),
-      find_and_remove_older_siblings(role.asset_volume_directory)
+      find_and_remove_older_siblings(role.asset_extracted_path),
+      find_and_remove_older_siblings(role.asset_volume_path)
  end

  private
@@ -39,7 +39,7 @@ module Kamal::Commands::App::Assets
        :find,
        Pathname.new(path).dirname.to_s,
        "-maxdepth 1",
-        "-name", "'#{role.name}-*'",
+        "-name", "'#{role.container_prefix}-*'",
        "!", "-name", Pathname.new(path).basename.to_s,
        "-exec rm -rf \"{}\" +"
      ]
--- a/lib/kamal/commands/app/containers.rb
+++ b/lib/kamal/commands/app/containers.rb
@@ -23,9 +23,10 @@ module Kamal::Commands::App::Containers
    docker :container, :prune, "--force", *filter_args
  end

-  def container_health_log(version:)
+  def container_endpoint(version:)
    pipe \
      container_id_for(container_name: container_name(version)),
-      xargs(docker(:inspect, "--format", DOCKER_HEALTH_LOG_FORMAT))
+      xargs(docker(:inspect, "--format", "'{{.NetworkSettings.IPAddress}}{{range $k, $v := .NetworkSettings.Ports}}{{printf \":%s\" $k}}{{break}}{{end}}'")),
+      [ :sed, "-e", "'s/\\/tcp$//'" ]
  end
 end
--- a/lib/kamal/commands/app/execution.rb
+++ b/lib/kamal/commands/app/execution.rb
@@ -11,7 +11,6 @@ module Kamal::Commands::App::Execution
    docker :run,
      ("-it" if interactive),
      "--rm",
-      "--network", "kamal",
      *role&.env_args(host),
      *argumentize("--env", env),
      *config.volume_args,
--- a/lib/kamal/commands/app/logging.rb
+++ b/lib/kamal/commands/app/logging.rb
@@ -1,17 +1,17 @@
 module Kamal::Commands::App::Logging
-  def logs(version: nil, timestamps: true, since: nil, lines: nil, grep: nil, grep_options: nil)
+  def logs(version: nil, since: nil, lines: nil, grep: nil)
    pipe \
      version ? container_id_for_version(version) : current_running_container_id,
-      "xargs docker logs#{" --timestamps" if timestamps}#{" --since #{since}" if since}#{" --tail #{lines}" if lines} 2>&1",
-      ("grep '#{grep}'#{" #{grep_options}" if grep_options}" if grep)
+      "xargs docker logs#{" --since #{since}" if since}#{" --tail #{lines}" if lines} 2>&1",
+      ("grep '#{grep}'" if grep)
  end

-  def follow_logs(host:, timestamps: true, lines: nil, grep: nil, grep_options: nil)
+  def follow_logs(host:, lines: nil, grep: nil)
    run_over_ssh \
      pipe(
        current_running_container_id,
-        "xargs docker logs#{" --timestamps" if timestamps}#{" --tail #{lines}" if lines} --follow 2>&1",
-        (%(grep "#{grep}"#{" #{grep_options}" if grep_options}) if grep)
+        "xargs docker logs --timestamps#{" --tail #{lines}" if lines} --follow 2>&1",
+        (%(grep "#{grep}") if grep)
      ),
      host: host
  end
--- a/lib/kamal/commands/app/proxy.rb
+++ b/lib/kamal/commands/app/proxy.rb
@@ -1,16 +0,0 @@
-module Kamal::Commands::App::Proxy
-  delegate :proxy_container_name, to: :config
-
-  def deploy(target:)
-    proxy_exec :deploy, role.container_prefix, *role.proxy.deploy_command_args(target: target)
-  end
-
-  def remove(target:)
-    proxy_exec :remove, role.container_prefix, *role.proxy.remove_command_args(target: target)
-  end
-
-  private
-    def proxy_exec(*command)
-      docker :exec, proxy_container_name, "kamal-proxy", *command
-    end
-end
--- a/lib/kamal/commands/auditor.rb
+++ b/lib/kamal/commands/auditor.rb
@@ -8,12 +8,9 @@ class Kamal::Commands::Auditor < Kamal::Commands::Base

  # Runs remotely
  def record(line, **details)
-    combine \
-      [ :mkdir, "-p", config.run_directory ],
-      append(
-        [ :echo, audit_tags(**details).except(:version, :service_version, :service).to_s, line ],
-        audit_log_file
-      )
+    append \
+      [ :echo, audit_tags(**details).except(:version, :service_version).to_s, line ],
+      audit_log_file
  end

  def reveal
--- a/lib/kamal/commands/base.rb
+++ b/lib/kamal/commands/base.rb
@@ -37,10 +37,6 @@ module Kamal::Commands
      [ :rm, "-r", path ]
    end

-    def remove_file(path)
-      [ :rm, path ]
-    end
-
    private
      def combine(*commands, by: "&&")
        commands
@@ -85,10 +81,6 @@ module Kamal::Commands
        [ :git, *([ "-C", path ] if path), *args.compact ]
      end

-      def grep(*args)
-        args.compact.unshift :grep
-      end
-
      def tags(**details)
        Kamal::Tags.from_config(config, **details)
      end
--- a/lib/kamal/commands/builder.rb
+++ b/lib/kamal/commands/builder.rb
@@ -1,8 +1,7 @@
 require "active_support/core_ext/string/filters"

 class Kamal::Commands::Builder < Kamal::Commands::Base
-  delegate :create, :remove, :push, :clean, :pull, :info, :inspect_builder, :validate_image, :first_mirror, to: :target
-  delegate :local?, :remote?, to: "config.builder"
+  delegate :create, :remove, :push, :clean, :pull, :info, :validate_image, to: :target

  include Clone

@@ -11,27 +10,38 @@ class Kamal::Commands::Builder < Kamal::Commands::Base
  end

  def target
-    if remote?
-      if local?
-        hybrid
-      else
-        remote
-      end
+    case
+    when !config.builder.multiarch? && !config.builder.cached?
+      native
+    when !config.builder.multiarch? && config.builder.cached?
+      native_cached
+    when config.builder.local? && config.builder.remote?
+      multiarch_remote
+    when config.builder.remote?
+      native_remote
    else
-      local
+      multiarch
    end
  end

-  def remote
-    @remote ||= Kamal::Commands::Builder::Remote.new(config)
+  def native
+    @native ||= Kamal::Commands::Builder::Native.new(config)
  end

-  def local
-    @local ||= Kamal::Commands::Builder::Local.new(config)
+  def native_cached
+    @native ||= Kamal::Commands::Builder::Native::Cached.new(config)
  end

-  def hybrid
-    @hybrid ||= Kamal::Commands::Builder::Hybrid.new(config)
+  def native_remote
+    @native ||= Kamal::Commands::Builder::Native::Remote.new(config)
+  end
+
+  def multiarch
+    @multiarch ||= Kamal::Commands::Builder::Multiarch.new(config)
+  end
+
+  def multiarch_remote
+    @multiarch_remote ||= Kamal::Commands::Builder::Multiarch::Remote.new(config)
  end


--- a/lib/kamal/commands/builder/base.rb
+++ b/lib/kamal/commands/builder/base.rb
@@ -1,41 +1,18 @@
+
 class Kamal::Commands::Builder::Base < Kamal::Commands::Base
  class BuilderError < StandardError; end

-  ENDPOINT_DOCKER_HOST_INSPECT = "'{{.Endpoints.docker.Host}}'"
-
  delegate :argumentize, to: Kamal::Utils
-  delegate \
-    :args, :secrets, :dockerfile, :target, :arches, :local_arches, :remote_arches, :remote,
-    :cache_from, :cache_to, :ssh, :driver, :docker_driver?,
-    to: :builder_config
+  delegate :args, :secrets, :dockerfile, :target, :local_arch, :local_host, :remote_arch, :remote_host, :cache_from, :cache_to, :ssh, to: :builder_config

  def clean
    docker :image, :rm, "--force", config.absolute_image
  end

-  def push
-    docker :buildx, :build,
-      "--push",
-      *platform_options(arches),
-      *([ "--builder", builder_name ] unless docker_driver?),
-      *build_options,
-      build_context
-  end
-
  def pull
    docker :pull, config.absolute_image
  end

-  def info
-    combine \
-      docker(:context, :ls),
-      docker(:buildx, :ls)
-  end
-
-  def inspect_builder
-    docker :buildx, :inspect, builder_name unless docker_driver?
-  end
-
  def build_options
    [ *build_tags, *build_cache, *build_labels, *build_args, *build_secrets, *build_dockerfile, *build_target, *build_ssh ]
  end
@@ -53,9 +30,6 @@ class Kamal::Commands::Builder::Base < Kamal::Commands::Base
      )
  end

-  def first_mirror
-    docker(:info, "--format '{{index .RegistryConfig.Mirrors 0}}'")
-  end

  private
    def build_tags
@@ -78,7 +52,7 @@ class Kamal::Commands::Builder::Base < Kamal::Commands::Base
    end

    def build_secrets
-      argumentize "--secret", secrets.keys.collect { |secret| [ "id", secret ] }
+      argumentize "--secret", secrets.collect { |secret| [ "id", secret ] }
    end

    def build_dockerfile
@@ -100,8 +74,4 @@ class Kamal::Commands::Builder::Base < Kamal::Commands::Base
    def builder_config
      config.builder
    end
-
-    def platform_options(arches)
-      argumentize "--platform", arches.map { |arch| "linux/#{arch}" }.join(",") if arches.any?
-    end
 end
--- a/lib/kamal/commands/builder/clone.rb
+++ b/lib/kamal/commands/builder/clone.rb
@@ -6,7 +6,7 @@ module Kamal::Commands::Builder::Clone
  end

  def clone
-    git :clone, Kamal::Git.root, "--recurse-submodules", path: clone_directory
+    git :clone, Kamal::Git.root, path: clone_directory
  end

  def clone_reset_steps
@@ -14,8 +14,7 @@ module Kamal::Commands::Builder::Clone
      git(:remote, "set-url", :origin, Kamal::Git.root, path: build_directory),
      git(:fetch, :origin, path: build_directory),
      git(:reset, "--hard", Kamal::Git.revision, path: build_directory),
-      git(:clean, "-fdx", path: build_directory),
-      git(:submodule, :update, "--init", path: build_directory)
+      git(:clean, "-fdx", path: build_directory)
    ]
  end

--- a/lib/kamal/commands/builder/hybrid.rb
+++ b/lib/kamal/commands/builder/hybrid.rb
@@ -1,21 +0,0 @@
-class Kamal::Commands::Builder::Hybrid < Kamal::Commands::Builder::Remote
-  def create
-    combine \
-      create_local_buildx,
-      create_remote_context,
-      append_remote_buildx
-  end
-
-  private
-    def builder_name
-      "kamal-hybrid-#{driver}-#{remote.gsub(/[^a-z0-9_-]/, "-")}"
-    end
-
-    def create_local_buildx
-      docker :buildx, :create, *platform_options(local_arches), "--name", builder_name, "--driver=#{driver}"
-    end
-
-    def append_remote_buildx
-      docker :buildx, :create, *platform_options(remote_arches), "--append", "--name", builder_name, remote_context_name
-    end
-end
--- a/lib/kamal/commands/builder/local.rb
+++ b/lib/kamal/commands/builder/local.rb
@@ -1,14 +0,0 @@
-class Kamal::Commands::Builder::Local < Kamal::Commands::Builder::Base
-  def create
-    docker :buildx, :create, "--name", builder_name, "--driver=#{driver}" unless docker_driver?
-  end
-
-  def remove
-    docker :buildx, :rm, builder_name unless docker_driver?
-  end
-
-  private
-    def builder_name
-      "kamal-local-#{driver}"
-    end
-end
--- a/lib/kamal/commands/builder/multiarch.rb
+++ b/lib/kamal/commands/builder/multiarch.rb
@@ -0,0 +1,37 @@
+class Kamal::Commands::Builder::Multiarch < Kamal::Commands::Builder::Base
+  def create
+    docker :buildx, :create, "--use", "--name", builder_name
+  end
+
+  def remove
+    docker :buildx, :rm, builder_name
+  end
+
+  def info
+    combine \
+      docker(:context, :ls),
+      docker(:buildx, :ls)
+  end
+
+  def push
+    docker :buildx, :build,
+      "--push",
+      "--platform", platform_names,
+      "--builder", builder_name,
+      *build_options,
+      build_context
+  end
+
+  private
+    def builder_name
+      "kamal-#{config.service}-multiarch"
+    end
+
+    def platform_names
+      if local_arch
+        "linux/#{local_arch}"
+      else
+        "linux/amd64,linux/arm64"
+      end
+    end
+end
--- a/lib/kamal/commands/builder/multiarch/remote.rb
+++ b/lib/kamal/commands/builder/multiarch/remote.rb
@@ -0,0 +1,51 @@
+class Kamal::Commands::Builder::Multiarch::Remote < Kamal::Commands::Builder::Multiarch
+  def create
+    combine \
+      create_contexts,
+      create_local_buildx,
+      append_remote_buildx
+  end
+
+  def remove
+    combine \
+      remove_contexts,
+      super
+  end
+
+  private
+    def builder_name
+      super + "-remote"
+    end
+
+    def builder_name_with_arch(arch)
+      "#{builder_name}-#{arch}"
+    end
+
+    def create_local_buildx
+      docker :buildx, :create, "--name", builder_name, builder_name_with_arch(local_arch), "--platform", "linux/#{local_arch}"
+    end
+
+    def append_remote_buildx
+      docker :buildx, :create, "--append", "--name", builder_name, builder_name_with_arch(remote_arch), "--platform", "linux/#{remote_arch}"
+    end
+
+    def create_contexts
+      combine \
+        create_context(local_arch, local_host),
+        create_context(remote_arch, remote_host)
+    end
+
+    def create_context(arch, host)
+      docker :context, :create, builder_name_with_arch(arch), "--description", "'#{builder_name} #{arch} native host'", "--docker", "'host=#{host}'"
+    end
+
+    def remove_contexts
+      combine \
+        remove_context(local_arch),
+        remove_context(remote_arch)
+    end
+
+    def remove_context(arch)
+      docker :context, :rm, builder_name_with_arch(arch)
+    end
+end
--- a/lib/kamal/commands/builder/native.rb
+++ b/lib/kamal/commands/builder/native.rb
@@ -0,0 +1,20 @@
+class Kamal::Commands::Builder::Native < Kamal::Commands::Builder::Base
+  def create
+    # No-op on native without cache
+  end
+
+  def remove
+    # No-op on native without cache
+  end
+
+  def info
+    # No-op on native
+  end
+
+  def push
+    combine \
+      docker(:build, *build_options, build_context),
+      docker(:push, config.absolute_image),
+      docker(:push, config.latest_image)
+  end
+end
--- a/lib/kamal/commands/builder/native/cached.rb
+++ b/lib/kamal/commands/builder/native/cached.rb
@@ -0,0 +1,16 @@
+class Kamal::Commands::Builder::Native::Cached < Kamal::Commands::Builder::Native
+  def create
+    docker :buildx, :create, "--use", "--driver=docker-container"
+  end
+
+  def remove
+    docker :buildx, :rm, builder_name
+  end
+
+  def push
+    docker :buildx, :build,
+      "--push",
+      *build_options,
+      build_context
+  end
+end
--- a/lib/kamal/commands/builder/native/remote.rb
+++ b/lib/kamal/commands/builder/native/remote.rb
@@ -0,0 +1,59 @@
+class Kamal::Commands::Builder::Native::Remote < Kamal::Commands::Builder::Native
+  def create
+    chain \
+      create_context,
+      create_buildx
+  end
+
+  def remove
+    chain \
+      remove_context,
+      remove_buildx
+  end
+
+  def info
+    chain \
+      docker(:context, :ls),
+      docker(:buildx, :ls)
+  end
+
+  def push
+    docker :buildx, :build,
+    "--push",
+    "--platform", platform,
+    "--builder", builder_name,
+    *build_options,
+    build_context
+  end
+
+
+  private
+    def builder_name
+      "kamal-#{config.service}-native-remote"
+    end
+
+    def builder_name_with_arch
+      "#{builder_name}-#{remote_arch}"
+    end
+
+    def platform
+      "linux/#{remote_arch}"
+    end
+
+    def create_context
+      docker :context, :create,
+        builder_name_with_arch, "--description", "'#{builder_name} #{remote_arch} native host'", "--docker", "'host=#{remote_host}'"
+    end
+
+    def remove_context
+      docker :context, :rm, builder_name_with_arch
+    end
+
+    def create_buildx
+      docker :buildx, :create, "--name", builder_name, builder_name_with_arch, "--platform", platform
+    end
+
+    def remove_buildx
+      docker :buildx, :rm, builder_name
+    end
+end
--- a/lib/kamal/commands/builder/remote.rb
+++ b/lib/kamal/commands/builder/remote.rb
@@ -1,63 +0,0 @@
-class Kamal::Commands::Builder::Remote < Kamal::Commands::Builder::Base
-  def create
-    chain \
-      create_remote_context,
-      create_buildx
-  end
-
-  def remove
-    chain \
-      remove_remote_context,
-      remove_buildx
-  end
-
-  def info
-    chain \
-      docker(:context, :ls),
-      docker(:buildx, :ls)
-  end
-
-  def inspect_builder
-    combine \
-      combine inspect_buildx, inspect_remote_context,
-      [ "(echo no compatible builder && exit 1)" ],
-      by: "||"
-  end
-
-  private
-    def builder_name
-      "kamal-remote-#{remote.gsub(/[^a-z0-9_-]/, "-")}"
-    end
-
-    def remote_context_name
-      "#{builder_name}-context"
-    end
-
-    def inspect_buildx
-      pipe \
-        docker(:buildx, :inspect, builder_name),
-        grep("-q", "Endpoint:.*#{remote_context_name}")
-    end
-
-    def inspect_remote_context
-      pipe \
-        docker(:context, :inspect, remote_context_name, "--format", ENDPOINT_DOCKER_HOST_INSPECT),
-        grep("-xq", remote)
-    end
-
-    def create_remote_context
-      docker :context, :create, remote_context_name, "--description", "'#{builder_name} host'", "--docker", "'host=#{remote}'"
-    end
-
-    def remove_remote_context
-      docker :context, :rm, remote_context_name
-    end
-
-    def create_buildx
-      docker :buildx, :create, "--name", builder_name, remote_context_name
-    end
-
-    def remove_buildx
-      docker :buildx, :rm, builder_name
-    end
-end
--- a/lib/kamal/commands/docker.rb
+++ b/lib/kamal/commands/docker.rb
@@ -19,10 +19,6 @@ class Kamal::Commands::Docker < Kamal::Commands::Base
    [ '[ "${EUID:-$(id -u)}" -eq 0 ] || command -v sudo >/dev/null || command -v su >/dev/null' ]
  end

-  def create_network
-    docker :network, :create, :kamal
-  end
-
  private
    def get_docker
      shell \
--- a/lib/kamal/commands/hook.rb
+++ b/lib/kamal/commands/hook.rb
@@ -1,12 +1,6 @@
 class Kamal::Commands::Hook < Kamal::Commands::Base
-  def run(hook)
-    [ hook_file(hook) ]
-  end
-
-  def env(secrets: false, **details)
-    tags(**details).env.tap do |env|
-      env.merge!(config.secrets.to_h) if secrets
-    end
+  def run(hook, **details)
+    [ hook_file(hook), env: tags(**details).env ]
  end

  def hook_exists?(hook)
--- a/lib/kamal/commands/lock.rb
+++ b/lib/kamal/commands/lock.rb
@@ -44,10 +44,14 @@ class Kamal::Commands::Lock < Kamal::Commands::Base
        "/dev/null"
    end

-    def lock_dir
-      dir_name = [ "lock", config.service, config.destination ].compact.join("-")
+    def locks_dir
+      File.join(config.run_directory, "locks")
+    end

-      File.join(config.run_directory, dir_name)
+    def lock_dir
+      dir_name = [ config.service, config.destination ].compact.join("-")
+
+      File.join(locks_dir, dir_name)
    end

    def lock_details_file
--- a/lib/kamal/commands/proxy.rb
+++ b/lib/kamal/commands/proxy.rb
@@ -1,16 +1,25 @@
 class Kamal::Commands::Proxy < Kamal::Commands::Base
  delegate :argumentize, :optionize, to: Kamal::Utils
+  delegate :container_name, to: :proxy_config
+
+  attr_reader :proxy_config
+
+  def initialize(config)
+    super
+    @proxy_config = config.proxy
+  end

  def run
    docker :run,
      "--name", container_name,
-      "--network", "kamal",
      "--detach",
      "--restart", "unless-stopped",
-      *config.proxy_publish_args,
-      "--volume", "kamal-proxy-config:/home/kamal-proxy/.config/kamal-proxy",
+      *proxy_config.publish_args,
+      "--volume", "/var/run/docker.sock:/var/run/docker.sock",
+      "--volume", "#{container_name}:/root/.config/kamal-proxy",
      *config.logging_args,
-      config.proxy_image
+      *proxy_config.docker_options_args,
+      proxy_config.image
  end

  def start
@@ -25,48 +34,46 @@ class Kamal::Commands::Proxy < Kamal::Commands::Base
    combine start, run, by: "||"
  end

+  def deploy(service, target:)
+    optionize({ target: target })
+    docker :exec, container_name, "kamal-proxy", :deploy, service, *optionize({ target: target }), *proxy_config.deploy_command_args
+  end
+
+  def remove(service, target:)
+    docker :exec, container_name, "kamal-proxy", :remove, service, *optionize({ target: target })
+  end
+
  def info
    docker :ps, "--filter", "name=^#{container_name}$"
  end

-  def version
+  def logs(since: nil, lines: nil, grep: nil)
    pipe \
-      docker(:inspect, container_name, "--format '{{.Config.Image}}'"),
-      [ :cut, "-d:", "-f2" ]
+      docker(:logs, container_name, (" --since #{since}" if since), (" --tail #{lines}" if lines), "--timestamps", "2>&1"),
+      ("grep '#{grep}'" if grep)
  end

-  def logs(timestamps: true, since: nil, lines: nil, grep: nil, grep_options: nil)
-    pipe \
-      docker(:logs, container_name, ("--since #{since}" if since), ("--tail #{lines}" if lines), ("--timestamps" if timestamps), "2>&1"),
-      ("grep '#{grep}'#{" #{grep_options}" if grep_options}" if grep)
-  end
-
-  def follow_logs(host:, timestamps: true, grep: nil, grep_options: nil)
+  def follow_logs(host:, grep: nil)
    run_over_ssh pipe(
-      docker(:logs, container_name, ("--timestamps" if timestamps), "--tail", "10", "--follow", "2>&1"),
-      (%(grep "#{grep}"#{" #{grep_options}" if grep_options}) if grep)
+      docker(:logs, container_name, "--timestamps", "--tail", "10", "--follow", "2>&1"),
+      (%(grep "#{grep}") if grep)
    ).join(" "), host: host
  end

-  def remove_container
-    docker :container, :prune, "--force", "--filter", "label=org.opencontainers.image.title=kamal-proxy"
+  def remove_container(filter: container_filter)
+    docker :container, :prune, "--force", "--filter", filter
  end

-  def remove_image
-    docker :image, :prune, "--all", "--force", "--filter", "label=org.opencontainers.image.title=kamal-proxy"
-  end
-
-  def cleanup_traefik
-    chain \
-      docker(:container, :stop, "traefik"),
-      combine(
-        docker(:container, :prune, "--force", "--filter", "label=org.opencontainers.image.title=Traefik"),
-        docker(:image, :prune, "--all", "--force", "--filter", "label=org.opencontainers.image.title=Traefik")
-      )
+  def remove_image(filter: image_filter)
+    docker :image, :prune, "--all", "--force", "--filter", filter
  end

  private
-    def container_name
-      config.proxy_container_name
+    def container_filter
+      "label=org.opencontainers.image.title=kamal-proxy"
+    end
+
+    def image_filter
+      "label=org.opencontainers.image.title=kamal-proxy"
    end
 end
--- a/lib/kamal/commands/prune.rb
+++ b/lib/kamal/commands/prune.rb
@@ -9,7 +9,7 @@ class Kamal::Commands::Prune < Kamal::Commands::Base
  def tagged_images
    pipe \
      docker(:image, :ls, *service_filter, "--format", "'{{.ID}} {{.Repository}}:{{.Tag}}'"),
-      grep("-v -w \"#{active_image_list}\""),
+      "grep -v -w \"#{active_image_list}\"",
      "while read image tag; do docker rmi $tag; done"
  end

--- a/lib/kamal/commands/registry.rb
+++ b/lib/kamal/commands/registry.rb
@@ -1,37 +1,23 @@
 class Kamal::Commands::Registry < Kamal::Commands::Base
  delegate :registry, to: :config
-  delegate :local?, :local_port, to: :registry

  def login
    docker :login,
-      registry.server,
-      "-u", sensitive(Kamal::Utils.escape_shell_value(registry.username)),
-      "-p", sensitive(Kamal::Utils.escape_shell_value(registry.password))
+      registry["server"],
+      "-u", sensitive(Kamal::Utils.escape_shell_value(lookup("username"))),
+      "-p", sensitive(Kamal::Utils.escape_shell_value(lookup("password")))
  end

  def logout
-    docker :logout, registry.server
+    docker :logout, registry["server"]
  end

-  def setup
-    combine \
-      docker(:start, "kamal-docker-registry"),
-      docker(:run, "--detach", "-p", "127.0.0.1:#{local_port}:5000", "--name", "kamal-docker-registry", "registry:2"),
-      by: "||"
-  end
-
-  def remove
-    combine \
-      docker(:stop, "kamal-docker-registry"),
-      docker(:rm, "kamal-docker-registry"),
-      by: "&&"
-  end
-
-  def logout
-    docker :logout, registry.server
-  end
-
-  def tunnel(host)
-    run_over_ssh "-R", "#{local_port}:localhost:#{local_port}", host: host
-  end
+  private
+    def lookup(key)
+      if registry[key].is_a?(Array)
+        ENV.fetch(registry[key].first).dup
+      else
+        registry[key]
+      end
+    end
 end
--- a/lib/kamal/commands/server.rb
+++ b/lib/kamal/commands/server.rb
@@ -1,15 +1,5 @@
 class Kamal::Commands::Server < Kamal::Commands::Base
  def ensure_run_directory
-    make_directory config.run_directory
-  end
-
-  def remove_app_directory
-    remove_directory config.app_directory
-  end
-
-  def app_directory_count
-    pipe \
-      [ :ls, config.apps_directory ],
-      [ :wc, "-l" ]
+    [ :mkdir, "-p", config.run_directory ]
  end
 end
--- a/lib/kamal/configuration.rb
+++ b/lib/kamal/configuration.rb
@@ -1,22 +1,15 @@
 require "active_support/ordered_options"
 require "active_support/core_ext/string/inquiry"
 require "active_support/core_ext/module/delegation"
-require "active_support/core_ext/hash/keys"
+require "pathname"
 require "erb"
 require "net/ssh/proxy/jump"

 class Kamal::Configuration
-  delegate :service, :image, :labels, :hooks_path, to: :raw_config, allow_nil: true
+  delegate :service, :image, :port, :servers, :labels, :registry, :stop_wait_time, :hooks_path, :logging, to: :raw_config, allow_nil: true
  delegate :argumentize, :optionize, to: Kamal::Utils

-  attr_reader :destination, :raw_config, :secrets
-  attr_reader :accessories, :aliases, :boot, :builder, :env, :logging, :proxy, :servers, :ssh, :sshkit, :registry
-
-  include Validation
-
-  PROXY_MINIMUM_VERSION = "v0.4.0"
-  PROXY_HTTP_PORT = 80
-  PROXY_HTTPS_PORT = 443
+  attr_reader :destination, :raw_config

  class << self
    def create_from(config_file:, destination: nil, version: nil)
@@ -49,34 +42,7 @@ class Kamal::Configuration
    @raw_config = ActiveSupport::InheritableOptions.new(raw_config)
    @destination = destination
    @declared_version = version
-
-    validate! raw_config, example: validation_yml.symbolize_keys, context: "", with: Kamal::Configuration::Validator::Configuration
-
-    @secrets = Kamal::Secrets.new(destination: destination)
-
-    # Eager load config to validate it, these are first as they have dependencies later on
-    @servers = Servers.new(config: self)
-    @registry = Registry.new(config: self)
-
-    @accessories = @raw_config.accessories&.keys&.collect { |name| Accessory.new(name, config: self) } || []
-    @aliases = @raw_config.aliases&.keys&.to_h { |name| [ name, Alias.new(name, config: self) ] } || {}
-    @boot = Boot.new(config: self)
-    @builder = Builder.new(config: self)
-    @env = Env.new(config: @raw_config.env || {}, secrets: secrets)
-
-    @logging = Logging.new(logging_config: @raw_config.logging)
-    @proxy = Proxy.new(config: self, proxy_config: @raw_config.proxy || {})
-    @ssh = Ssh.new(config: self)
-    @sshkit = Sshkit.new(config: self)
-
-    ensure_destination_if_required
-    ensure_required_keys_present
-    ensure_valid_kamal_version
-    ensure_retain_containers_valid
-    ensure_valid_service_name
-    ensure_no_traefik_reboot_hooks
-    ensure_one_host_for_ssl_roles
-    ensure_unique_hosts_for_ssl_roles
+    valid? if validate
  end


@@ -105,13 +71,17 @@ class Kamal::Configuration


  def roles
-    servers.roles
+    @roles ||= role_names.collect { |role_name| Role.new(role_name, config: self) }
  end

  def role(name)
    roles.detect { |r| r.name == name.to_s }
  end

+  def accessories
+    @accessories ||= raw_config.accessories&.keys&.collect { |name| Kamal::Configuration::Accessory.new(name, config: self) } || []
+  end
+
  def accessory(name)
    accessories.detect { |a| a.name == name.to_s }
  end
@@ -150,7 +120,7 @@ class Kamal::Configuration
  end

  def repository
-    [ registry.server, image ].compact.join("/")
+    [ raw_config.registry["server"], image ].compact.join("/")
  end

  def absolute_image
@@ -187,7 +157,33 @@ class Kamal::Configuration
  end

  def logging_args
-    logging.args
+    if logging.present?
+      optionize({ "log-driver" => logging["driver"] }.compact) +
+        argumentize("--log-opt", logging["options"])
+    else
+      argumentize("--log-opt", { "max-size" => "10m" })
+    end
+  end
+
+
+  def boot
+    Kamal::Configuration::Boot.new(config: self)
+  end
+
+  def builder
+    Kamal::Configuration::Builder.new(config: self)
+  end
+
+  def proxy
+    Kamal::Configuration::Proxy.new(config: self)
+  end
+
+  def ssh
+    Kamal::Configuration::Ssh.new(config: self)
+  end
+
+  def sshkit
+    Kamal::Configuration::Sshkit.new(config: self)
  end


@@ -195,36 +191,23 @@ class Kamal::Configuration
    raw_config.readiness_delay || 7
  end

-  def deploy_timeout
-    raw_config.deploy_timeout || 30
-  end
-
-  def drain_timeout
-    raw_config.drain_timeout || 30
+  def run_id
+    @run_id ||= SecureRandom.hex(16)
  end


  def run_directory
-    ".kamal"
+    raw_config.run_directory || ".kamal"
  end

-  def apps_directory
-    File.join run_directory, "apps"
+  def run_directory_as_docker_volume
+    if Pathname.new(run_directory).absolute?
+      run_directory
+    else
+      File.join "$(pwd)", run_directory
+    end
  end

-  def app_directory
-    File.join apps_directory, [ service, destination ].compact.join("-")
-  end
-
-  def env_directory
-    File.join app_directory, "env"
-  end
-
-  def assets_directory
-    File.join app_directory, "assets"
-  end
-
-
  def hooks_path
    raw_config.hooks_path || ".kamal/hooks"
  end
@@ -234,9 +217,17 @@ class Kamal::Configuration
  end


+  def host_env_directory
+    File.join(run_directory, "env")
+  end
+
+  def env
+    raw_config.env || {}
+  end
+
  def env_tags
    @env_tags ||= if (tags = raw_config.env["tags"])
-      tags.collect { |name, config| Env::Tag.new(name, config: config, secrets: secrets) }
+      tags.collect { |name, config| Kamal::Configuration::Env::Tag.new(name, config: config) }
    else
      []
    end
@@ -246,19 +237,11 @@ class Kamal::Configuration
    env_tags.detect { |t| t.name == name.to_s }
  end

-  def proxy_publish_args
-    argumentize "--publish", [ "#{PROXY_HTTP_PORT}:#{PROXY_HTTP_PORT}", "#{PROXY_HTTPS_PORT}:#{PROXY_HTTPS_PORT}" ]
-  end

-  def proxy_image
-    "basecamp/kamal-proxy:#{PROXY_MINIMUM_VERSION}"
+  def valid?
+    ensure_destination_if_required && ensure_required_keys_present && ensure_valid_kamal_version && ensure_retain_containers_valid && ensure_valid_service_name
  end

-  def proxy_container_name
-    "kamal-proxy"
-  end
-
-
  def to_h
    {
      roles: role_names,
@@ -277,6 +260,7 @@ class Kamal::Configuration
    }.compact
  end

+
  private
    # Will raise ArgumentError if any required config keys are missing
    def ensure_destination_if_required
@@ -289,21 +273,29 @@ class Kamal::Configuration

    def ensure_required_keys_present
      %i[ service image registry servers ].each do |key|
-        raise Kamal::ConfigurationError, "Missing required configuration for #{key}" unless raw_config[key].present?
+        raise ArgumentError, "Missing required configuration for #{key}" unless raw_config[key].present?
      end

-      unless role(primary_role_name).present?
-        raise Kamal::ConfigurationError, "The primary_role #{primary_role_name} isn't defined"
+      if raw_config.registry["username"].blank?
+        raise ArgumentError, "You must specify a username for the registry in config/deploy.yml"
+      end
+
+      if raw_config.registry["password"].blank?
+        raise ArgumentError, "You must specify a password for the registry in config/deploy.yml (or set the ENV variable if that's used)"
+      end
+
+      unless role_names.include?(primary_role_name)
+        raise ArgumentError, "The primary_role #{primary_role_name} isn't defined"
      end

      if primary_role.hosts.empty?
-        raise Kamal::ConfigurationError, "No servers specified for the #{primary_role.name} primary_role"
+        raise ArgumentError, "No servers specified for the #{primary_role.name} primary_role"
      end

      unless allow_empty_roles?
        roles.each do |role|
          if role.hosts.empty?
-            raise Kamal::ConfigurationError, "No servers specified for the #{role.name} role. You can ignore this with allow_empty_roles: true"
+            raise ArgumentError, "No servers specified for the #{role.name} role. You can ignore this with allow_empty_roles: true"
          end
        end
      end
@@ -312,49 +304,25 @@ class Kamal::Configuration
    end

    def ensure_valid_service_name
-      raise Kamal::ConfigurationError, "Service name can only include alphanumeric characters, hyphens, and underscores" unless raw_config[:service] =~ /^[a-z0-9_-]+$/i
+      raise ArgumentError, "Service name can only include alphanumeric characters, hyphens, and underscores" unless raw_config[:service] =~ /^[a-z0-9_-]+$/i

      true
    end

    def ensure_valid_kamal_version
      if minimum_version && Gem::Version.new(minimum_version) > Gem::Version.new(Kamal::VERSION)
-        raise Kamal::ConfigurationError, "Current version is #{Kamal::VERSION}, minimum required is #{minimum_version}"
+        raise ArgumentError, "Current version is #{Kamal::VERSION}, minimum required is #{minimum_version}"
      end

      true
    end

    def ensure_retain_containers_valid
-      raise Kamal::ConfigurationError, "Must retain at least 1 container" if retain_containers < 1
+      raise ArgumentError, "Must retain at least 1 container" if retain_containers < 1

      true
    end

-    def ensure_no_traefik_reboot_hooks
-      hooks = %w[ pre-traefik-reboot post-traefik-reboot ].select { |hook_file| File.exist?(File.join(hooks_path, hook_file)) }
-
-      if hooks.any?
-        raise Kamal::ConfigurationError, "Found #{hooks.join(", ")}, these should be renamed to (pre|post)-proxy-reboot"
-      end
-
-      true
-    end
-
-    def ensure_one_host_for_ssl_roles
-      roles.each(&:ensure_one_host_for_ssl)
-
-      true
-    end
-
-    def ensure_unique_hosts_for_ssl_roles
-      hosts = roles.select(&:ssl?).map { |role| role.proxy.host }
-      duplicates = hosts.tally.filter_map { |host, count| host if count > 1 }
-
-      raise Kamal::ConfigurationError, "Different roles can't share the same host for SSL: #{duplicates.join(", ")}" if duplicates.any?
-
-      true
-    end

    def role_names
      raw_config.servers.is_a?(Array) ? [ "web" ] : raw_config.servers.keys.sort
--- a/lib/kamal/configuration/accessory.rb
+++ b/lib/kamal/configuration/accessory.rb
@@ -1,39 +1,30 @@
 class Kamal::Configuration::Accessory
-  include Kamal::Configuration::Validation
-
  delegate :argumentize, :optionize, to: Kamal::Utils

-  attr_reader :name, :accessory_config, :env
+  attr_accessor :name, :specifics

  def initialize(name, config:)
-    @name, @config, @accessory_config = name.inquiry, config, config.raw_config["accessories"][name]
-
-    validate! \
-      accessory_config,
-      example: validation_yml["accessories"]["mysql"],
-      context: "accessories/#{name}",
-      with: Kamal::Configuration::Validator::Accessory
-
-    @env = Kamal::Configuration::Env.new \
-      config: accessory_config.fetch("env", {}),
-      secrets: config.secrets,
-      context: "accessories/#{name}/env"
+    @name, @config, @specifics = name.inquiry, config, config.raw_config["accessories"][name]
  end

  def service_name
-    accessory_config["service"] || "#{config.service}-#{name}"
+    specifics["service"] || "#{config.service}-#{name}"
  end

  def image
-    accessory_config["image"]
+    specifics["image"]
  end

  def hosts
+    if (specifics.keys & [ "host", "hosts", "roles" ]).size != 1
+      raise ArgumentError, "Specify one of `host`, `hosts` or `roles` for accessory `#{name}`"
+    end
+
    hosts_from_host || hosts_from_hosts || hosts_from_roles
  end

  def port
-    if port = accessory_config["port"]&.to_s
+    if port = specifics["port"]&.to_s
      port.include?(":") ? port : "#{port}:#{port}"
    end
  end
@@ -43,38 +34,32 @@ class Kamal::Configuration::Accessory
  end

  def labels
-    default_labels.merge(accessory_config["labels"] || {})
+    default_labels.merge(specifics["labels"] || {})
  end

  def label_args
    argumentize "--label", labels
  end

+  def env
+    Kamal::Configuration::Env.from_config \
+      config: specifics.fetch("env", {}),
+      secrets_file: File.join(config.host_env_directory, "accessories", "#{service_name}.env")
+  end
+
  def env_args
-    [ *env.clear_args, *argumentize("--env-file", secrets_path) ]
-  end
-
-  def env_directory
-    File.join(config.env_directory, "accessories")
-  end
-
-  def secrets_io
-    env.secrets_io
-  end
-
-  def secrets_path
-    File.join(config.env_directory, "accessories", "#{name}.env")
+    env.args
  end

  def files
-    accessory_config["files"]&.to_h do |local_to_remote_mapping|
+    specifics["files"]&.to_h do |local_to_remote_mapping|
      local_file, remote_file = local_to_remote_mapping.split(":")
      [ expand_local_file(local_file), expand_remote_file(remote_file) ]
    end || {}
  end

  def directories
-    accessory_config["directories"]&.to_h do |host_to_container_mapping|
+    specifics["directories"]&.to_h do |host_to_container_mapping|
      host_path, container_path = host_to_container_mapping.split(":")
      [ expand_host_path(host_path), container_path ]
    end || {}
@@ -89,7 +74,7 @@ class Kamal::Configuration::Accessory
  end

  def option_args
-    if args = accessory_config["options"]
+    if args = specifics["options"]
      optionize args
    else
      []
@@ -97,7 +82,7 @@ class Kamal::Configuration::Accessory
  end

  def cmd
-    accessory_config["cmd"]
+    specifics["cmd"]
  end

  private
@@ -131,18 +116,18 @@ class Kamal::Configuration::Accessory
    end

    def specific_volumes
-      accessory_config["volumes"] || []
+      specifics["volumes"] || []
    end

    def remote_files_as_volumes
-      accessory_config["files"]&.collect do |local_to_remote_mapping|
+      specifics["files"]&.collect do |local_to_remote_mapping|
        _, remote_file = local_to_remote_mapping.split(":")
        "#{service_data_directory + remote_file}:#{remote_file}"
      end || []
    end

    def remote_directories_as_volumes
-      accessory_config["directories"]&.collect do |host_to_container_mapping|
+      specifics["directories"]&.collect do |host_to_container_mapping|
        host_path, container_path = host_to_container_mapping.split(":")
        [ expand_host_path(host_path), container_path ].join(":")
      end || []
@@ -161,16 +146,30 @@ class Kamal::Configuration::Accessory
    end

    def hosts_from_host
-      [ accessory_config["host"] ] if accessory_config.key?("host")
+      if specifics.key?("host")
+        host = specifics["host"]
+        if host
+          [ host ]
+        else
+          raise ArgumentError, "Missing host for accessory `#{name}`"
+        end
+      end
    end

    def hosts_from_hosts
-      accessory_config["hosts"] if accessory_config.key?("hosts")
+      if specifics.key?("hosts")
+        hosts = specifics["hosts"]
+        if hosts.is_a?(Array)
+          hosts
+        else
+          raise ArgumentError, "Hosts should be an Array for accessory `#{name}`"
+        end
+      end
    end

    def hosts_from_roles
-      if accessory_config.key?("roles")
-        accessory_config["roles"].flat_map { |role| config.role(role).hosts }
+      if specifics.key?("roles")
+        specifics["roles"].flat_map { |role| config.role(role).hosts }
      end
    end
 end
--- a/lib/kamal/configuration/alias.rb
+++ b/lib/kamal/configuration/alias.rb
@@ -1,15 +0,0 @@
-class Kamal::Configuration::Alias
-  include Kamal::Configuration::Validation
-
-  attr_reader :name, :command
-
-  def initialize(name, config:)
-    @name, @command = name.inquiry, config.raw_config["aliases"][name]
-
-    validate! \
-      command,
-      example: validation_yml["aliases"]["uname"],
-      context: "aliases/#{name}",
-      with: Kamal::Configuration::Validator::Alias
-  end
-end
--- a/lib/kamal/configuration/boot.rb
+++ b/lib/kamal/configuration/boot.rb
@@ -1,25 +1,20 @@
 class Kamal::Configuration::Boot
-  include Kamal::Configuration::Validation
-
-  attr_reader :boot_config, :host_count
-
  def initialize(config:)
-    @boot_config = config.raw_config.boot || {}
+    @options = config.raw_config.boot || {}
    @host_count = config.all_hosts.count
-    validate! boot_config
  end

  def limit
-    limit = boot_config["limit"]
+    limit = @options["limit"]

    if limit.to_s.end_with?("%")
-      [ host_count * limit.to_i / 100, 1 ].max
+      [ @host_count * limit.to_i / 100, 1 ].max
    else
      limit
    end
  end

  def wait
-    boot_config["wait"]
+    @options["wait"]
  end
 end
--- a/lib/kamal/configuration/builder.rb
+++ b/lib/kamal/configuration/builder.rb
@@ -1,93 +1,73 @@
 class Kamal::Configuration::Builder
-  include Kamal::Configuration::Validation
-
-  attr_reader :config, :builder_config
-  delegate :image, :service, to: :config
-  delegate :server, to: :"config.registry"
-
  def initialize(config:)
-    @config = config
-    @builder_config = config.raw_config.builder || {}
+    @options = config.raw_config.builder || {}
    @image = config.image
-    @server = config.registry.server
+    @server = config.registry["server"]
    @service = config.service
+    @destination = config.destination

-    validate! builder_config, with: Kamal::Configuration::Validator::Builder
+    valid?
  end

  def to_h
-    builder_config
+    @options
  end

-  def remote
-    builder_config["remote"]
-  end
-
-  def arches
-    Array(builder_config.fetch("arch", default_arch))
-  end
-
-  def local_arches
-    @local_arches ||= if local_disabled?
-      []
-    elsif remote
-      arches & [ Kamal::Utils.docker_arch ]
-    else
-      arches
-    end
-  end
-
-  def remote_arches
-    @remote_arches ||= if remote
-      arches - local_arches
-    else
-      []
-    end
-  end
-
-  def remote?
-    remote_arches.any?
+  def multiarch?
+    @options["multiarch"] != false
  end

  def local?
-    !local_disabled? && (arches.empty? || local_arches.any?)
+    !!@options["local"]
+  end
+
+  def remote?
+    !!@options["remote"]
  end

  def cached?
-    !!builder_config["cache"]
+    !!@options["cache"]
  end

  def args
-    builder_config["args"] || {}
+    @options["args"] || {}
  end

  def secrets
-    (builder_config["secrets"] || []).to_h { |key| [ key, config.secrets[key] ] }
+    @options["secrets"] || []
  end

  def dockerfile
-    builder_config["dockerfile"] || "Dockerfile"
+    @options["dockerfile"] || "Dockerfile"
  end

  def target
-    builder_config["target"]
+    @options["target"]
  end

  def context
-    builder_config["context"] || "."
+    @options["context"] || "."
  end

-  def driver
-    builder_config.fetch("driver", "docker-container")
+  def local_arch
+    @options["local"]["arch"] if local?
  end

-  def local_disabled?
-    builder_config["local"] == false
+  def local_host
+    @options["local"]["host"] if local?
+  end
+
+  def remote_arch
+    @options["remote"]["arch"] if remote?
+  end
+
+  def remote_host
+    @options["remote"]["host"] if remote?
  end

  def cache_from
    if cached?
-      case builder_config["cache"]["type"]
+      case @options["cache"]["type"]
      when "gha"
        cache_from_config_for_gha
      when "registry"
@@ -98,7 +78,7 @@ class Kamal::Configuration::Builder

  def cache_to
    if cached?
-      case builder_config["cache"]["type"]
+      case @options["cache"]["type"]
      when "gha"
        cache_to_config_for_gha
      when "registry"
@@ -108,15 +88,15 @@ class Kamal::Configuration::Builder
  end

  def ssh
-    builder_config["ssh"]
+    @options["ssh"]
  end

  def git_clone?
-    Kamal::Git.used? && builder_config["context"].nil?
+    Kamal::Git.used? && @options["context"].nil?
  end

  def clone_directory
-    @clone_directory ||= File.join Dir.tmpdir, "kamal-clones", [ service, pwd_sha ].compact.join("-")
+    @clone_directory ||= File.join Dir.tmpdir, "kamal-clones", [ @service, pwd_sha ].compact.join("-")
  end

  def build_directory
@@ -128,29 +108,19 @@ class Kamal::Configuration::Builder
      end
  end

-  def docker_driver?
-    driver == "docker"
-  end
-
  private
    def valid?
-      if docker_driver?
-        raise ArgumentError, "Invalid builder configuration: the `docker` driver does not not support remote builders" if remote
-        raise ArgumentError, "Invalid builder configuration: the `docker` driver does not not support caching" if cached?
-        raise ArgumentError, "Invalid builder configuration: the `docker` driver does not not support multiple arches" if arches.many?
-      end
-
      if @options["cache"] && @options["cache"]["type"]
        raise ArgumentError, "Invalid cache type: #{@options["cache"]["type"]}" unless [ "gha", "registry" ].include?(@options["cache"]["type"])
      end
    end

    def cache_image
-      builder_config["cache"]&.fetch("image", nil) || "#{image}-build-cache"
+      @options["cache"]&.fetch("image", nil) || "#{@image}-build-cache"
    end

    def cache_image_ref
-      [ server, cache_image ].compact.join("/")
+      [ @server, cache_image ].compact.join("/")
    end

    def cache_from_config_for_gha
@@ -162,11 +132,11 @@ class Kamal::Configuration::Builder
    end

    def cache_to_config_for_gha
-      [ "type=gha", builder_config["cache"]&.fetch("options", nil) ].compact.join(",")
+      [ "type=gha", @options["cache"]&.fetch("options", nil) ].compact.join(",")
    end

    def cache_to_config_for_registry
-      [ "type=registry", builder_config["cache"]&.fetch("options", nil), "ref=#{cache_image_ref}" ].compact.join(",")
+      [ "type=registry", @options["cache"]&.fetch("options", nil), "ref=#{cache_image_ref}" ].compact.join(",")
    end

    def repo_basename
@@ -180,8 +150,4 @@ class Kamal::Configuration::Builder
    def pwd_sha
      Digest::SHA256.hexdigest(Dir.pwd)[0..12]
    end
-
-    def default_arch
-      docker_driver? ? [] : [ "amd64", "arm64" ]
-    end
 end
--- a/lib/kamal/configuration/docs/accessory.yml
+++ b/lib/kamal/configuration/docs/accessory.yml
@@ -1,90 +0,0 @@
-# Accessories
-#
-# Accessories can be booted on a single host, a list of hosts, or on specific roles.
-# The hosts do not need to be defined in the Kamal servers configuration.
-#
-# Accessories are managed separately from the main service - they are not updated
-# when you deploy and they do not have zero-downtime deployments.
-#
-# Run `kamal accessory boot <accessory>` to boot an accessory.
-# See `kamal accessory --help` for more information.
-
-# Configuring accessories
-#
-# First define the accessory in the `accessories`
-accessories:
-  mysql:
-
-    # Service name
-    #
-    # This is used in the service label and defaults to `<service>-<accessory>`
-    # where `<service>` is the main service name from the root configuration
-    service: mysql
-
-    # Image
-    #
-    # The Docker image to use, prefix with a registry if not using Docker hub
-    image: mysql:8.0
-
-    # Accessory hosts
-    #
-    # Specify one  of `host`, `hosts` or `roles`
-    host: mysql-db1
-    hosts:
-      - mysql-db1
-      - mysql-db2
-    roles:
-      - mysql
-
-    # Custom command
-    #
-    # You can set a custom command to run in the container, if you do not want to use the default
-    cmd: "bin/mysqld"
-
-    # Port mappings
-    #
-    # See https://docs.docker.com/network/, especially note the warning about the security
-    # implications of exposing ports publicly.
-    port: "127.0.0.1:3306:3306"
-
-    # Labels
-    labels:
-      app: myapp
-
-    # Options
-    # These are passed to the Docker run command in the form `--<name> <value>`
-    options:
-      restart: always
-      cpus: 2
-
-    # Environment variables
-    # See kamal docs env for more information
-    env:
-      ...
-
-    # Copying files
-    #
-    # You can specify files to mount into the container.
-    # The format is `local:remote` where `local` is the path to the file on the local machine
-    # and `remote` is the path to the file in the container.
-    #
-    # They will be uploaded from the local repo to the host and then mounted.
-    #
-    # ERB files will be evaluated before being copied.
-    files:
-      - config/my.cnf.erb:/etc/mysql/my.cnf
-      - config/myoptions.cnf:/etc/mysql/myoptions.cnf
-
-    # Directories
-    #
-    # You can specify directories to mount into the container. They will be created on the host
-    # before being mounted
-    directories:
-      - mysql-logs:/var/log/mysql
-
-    # Volumes
-    #
-    # Any other volumes to mount, in addition to the files and directories.
-    # They are not created or copied before mounting
-    volumes:
-      - /path/to/mysql-logs:/var/log/mysql
--- a/lib/kamal/configuration/docs/alias.yml
+++ b/lib/kamal/configuration/docs/alias.yml
@@ -1,26 +0,0 @@
-# Aliases
-#
-# Aliases are shortcuts for Kamal commands.
-#
-# For example, for a Rails app, you might open a console with:
-#
-# ```shell
-# kamal app exec -i -r console "rails console"
-# ```
-#
-# By defining an alias, like this:
-aliases:
-  console: app exec -r console -i "rails console"
-# You can now open the console with:
-# ```shell
-# kamal console
-# ```
-
-# Configuring aliases
-#
-# Aliases are defined in the root config under the alias key
-#
-# Each alias is named and can only contain lowercase letters, numbers, dashes and underscores.
-
-aliases:
-  uname: app exec -p -q -r web "uname -a"
--- a/lib/kamal/configuration/docs/boot.yml
+++ b/lib/kamal/configuration/docs/boot.yml
@@ -1,19 +0,0 @@
-# Booting
-#
-# When deploying to large numbers of hosts, you might prefer not to restart your services on every host at the same time.
-#
-# Kamal’s default is to boot new containers on all hosts in parallel. But you can control this with the boot configuration.
-
-# Fixed group sizes
-#
-# Here we boot 2 hosts at a time with a 10 second gap between each group.
-boot:
-  limit: 2
-  wait: 10
-
-# Percentage of hosts
-#
-# Here we boot 25% of the hosts at a time with a 2 second gap between each group.
-boot:
-  limit: 25%
-  wait: 2
--- a/lib/kamal/configuration/docs/builder.yml
+++ b/lib/kamal/configuration/docs/builder.yml
@@ -1,106 +0,0 @@
-# Builder
-#
-# The builder configuration controls how the application is built with `docker build`
-#
-# See https://kamal-deploy.org/docs/configuration/builder-examples/ for more information
-
-# Builder options
-#
-# Options go under the builder key in the root configuration.
-builder:
-
-  # Arch
-  #
-  # The architectures to build for - you can set an array or just a single value.
-  #
-  # Allowed values are `amd64` and `arm64`
-  arch:
-    - amd64
-
-  # Remote
-  #
-  # The connection string for a remote builder. If supplied Kamal will use this
-  # for builds that do not match the local architecture of the deployment host.
-  remote: ssh://docker@docker-builder
-
-  # Local
-  #
-  # If set to false, Kamal will always use the remote builder even when building
-  # the local architecture.
-  #
-  # Defaults to true
-  local: true
-
-  # Builder cache
-  #
-  # The type must be either 'gha' or 'registry'
-  #
-  # The image is only used for registry cache. Not compatible with the docker driver
-  cache:
-    type: registry
-    options: mode=max
-    image: kamal-app-build-cache
-
-  # Build context
-  #
-  # If this is not set, then a local git clone of the repo is used.
-  # This ensures a clean build with no uncommitted changes.
-  #
-  # To use the local checkout instead you can set the context to `.`, or a path to another directory.
-  context: .
-
-  # Dockerfile
-  #
-  # The Dockerfile to use for building, defaults to `Dockerfile`
-  dockerfile: Dockerfile.production
-
-  # Build target
-  #
-  # If not set, then the default target is used
-  target: production
-
-  # Build Arguments
-  #
-  # Any additional build arguments, passed to `docker build` with `--build-arg <key>=<value>`
-  args:
-    ENVIRONMENT: production
-
-  # Referencing build arguments
-  #
-  # ```shell
-  # ARG RUBY_VERSION
-  # FROM ruby:$RUBY_VERSION-slim as base
-  # ```
-
-  # Build secrets
-  #
-  # Values are read from .kamal/secrets.
-  #
-  secrets:
-    - SECRET1
-    - SECRET2
-
-  # Referencing Build Secrets
-  #
-  # ```shell
-  # # Copy Gemfiles
-  # COPY Gemfile Gemfile.lock ./
-  #
-  # # Install dependencies, including private repositories via access token
-  # # Then remove bundle cache with exposed GITHUB_TOKEN)
-  # RUN --mount=type=secret,id=GITHUB_TOKEN \
-  #   BUNDLE_GITHUB__COM=x-access-token:$(cat /run/secrets/GITHUB_TOKEN) \
-  #   bundle install && \
-  #   rm -rf /usr/local/bundle/cache
-  # ```
-
-
-  # SSH
-  #
-  # SSH agent socket or keys to expose to the build
-  ssh: default=$SSH_AUTH_SOCK
-
-  # Driver
-  #
-  # The build driver to use, defaults to `docker-container`
-  driver: docker
--- a/lib/kamal/configuration/docs/configuration.yml
+++ b/lib/kamal/configuration/docs/configuration.yml
@@ -1,178 +0,0 @@
-# Kamal Configuration
-#
-# Configuration is read from the `config/deploy.yml`
-#
-
-# Destinations
-#
-# When running commands, you can specify a destination with the `-d` flag,
-# e.g. `kamal deploy -d staging`
-#
-# In this case the configuration will also be read from `config/deploy.staging.yml`
-# and merged with the base configuration.
-
-# Extensions
-#
-# Kamal will not accept unrecognized keys in the configuration file.
-#
-# However, you might want to declare a configuration block using YAML anchors
-# and aliases to avoid repetition.
-#
-# You can use prefix a configuration section with `x-` to indicate that it is an
-# extension. Kamal will ignore the extension and not raise an error.
-
-# The service name
-# This is a required value. It is used as the container name prefix.
-service: myapp
-
-# The Docker image name
-#
-# The image will be pushed to the configured registry.
-image: my-image
-
-# Labels
-#
-# Additional labels to add to the container
-labels:
-  my-label: my-value
-
-# Volumes
-#
-# Additional volumes to mount into the container
-volumes:
-  - /path/on/host:/path/in/container:ro
-
-# Registry
-#
-# The Docker registry configuration, see kamal docs registry
-registry:
-  ...
-
-# Servers
-#
-# The servers to deploy to, optionally with custom roles, see kamal docs servers
-servers:
-  ...
-
-# Environment variables
-#
-# See kamal docs env
-env:
-  ...
-
-# Asset Path
-#
-# Used for asset bridging across deployments, default to `nil`
-#
-# If there are changes to CSS or JS files, we may get requests
-# for the old versions on the new container and vice-versa.
-#
-# To avoid 404s we can specify an asset path.
-# Kamal will replace that path in the container with a mapped
-# volume containing both sets of files.
-# This requires that file names change when the contents change
-# (e.g. by including a hash of the contents in the name).
-#
-# To configure this, set the path to the assets:
-asset_path: /path/to/assets
-
-# Hooks path
-#
-# Path to hooks, defaults to `.kamal/hooks`
-# See https://kamal-deploy.org/docs/hooks for more information
-hooks_path: /user_home/kamal/hooks
-
-# Require destinations
-#
-# Whether deployments require a destination to be specified, defaults to `false`
-require_destination: true
-
-# Primary role
-#
-# This defaults to `web`, but if you have no web role, you can change this
-primary_role: workers
-
-# Allowing empty roles
-#
-# Whether roles with no servers are allowed. Defaults to `false`.
-allow_empty_roles: false
-
-# Retain containers
-#
-# How many old containers and images we retain, defaults to 5
-retain_containers: 3
-
-# Minimum version
-#
-# The minimum version of Kamal required to deploy this configuration, defaults to nil
-minimum_version: 1.3.0
-
-# Readiness delay
-#
-# Seconds to wait for a container to boot after is running, default 7
-#
-# This only applies to containers that do not run a proxy or specify a healthcheck
-readiness_delay: 4
-
-# Deploy timeout
-#
-# How long to wait for a container to become ready, default 30
-deploy_timeout: 10
-
-# Drain timeout
-#
-# How long to wait for a containers to drain, default 30
-drain_timeout: 10
-
-# Run directory
-#
-# Directory to store kamal runtime files in on the host, default `.kamal`
-run_directory: /etc/kamal
-
-# SSH options
-#
-# See kamal docs ssh
-ssh:
-  ...
-
-# Builder options
-#
-# See kamal docs builder
-builder:
-  ...
-
-# Accessories
-#
-# Additionals services to run in Docker, see kamal docs accessory
-accessories:
-  ...
-
-# Proxy
-#
-# Configuration for kamal-proxy, see kamal docs proxy
-proxy:
-  ...
-
-# SSHKit
-#
-# See kamal docs sshkit
-sshkit:
-  ...
-
-# Boot options
-#
-# See kamal docs boot
-boot:
-  ...
-
-# Logging
-#
-# Docker logging configuration, see kamal docs logging
-logging:
-  ...
-
-# Aliases
-#
-# Alias configuration, see kamal docs alias
-aliases:
-  ...
--- a/lib/kamal/configuration/docs/env.yml
+++ b/lib/kamal/configuration/docs/env.yml
@@ -1,84 +0,0 @@
-# Environment variables
-#
-# Environment variables can be set directly in the Kamal configuration or
-# read from .kamal/secrets.
-
-# Reading environment variables from the configuration
-#
-# Environment variables can be set directly in the configuration file.
-#
-# These are passed to the docker run command when deploying.
-env:
-  DATABASE_HOST: mysql-db1
-  DATABASE_PORT: 3306
-
-# Secrets
-#
-# Kamal uses dotenv to automatically load environment variables set in the `.kamal/secrets` file.
-#
-# If you are using destinations, secrets will instead be read from `.kamal/secrets-<DESTINATION>` if
-# it exists.
-#
-# Common secrets across all destinations can be set in `.kamal/secrets-common`.
-#
-# This file can be used to set variables like `KAMAL_REGISTRY_PASSWORD` or database passwords.
-# You can use variable or command substitution in the secrets file.
-#
-# ```
-# KAMAL_REGISTRY_PASSWORD=$KAMAL_REGISTRY_PASSWORD
-# RAILS_MASTER_KEY=$(cat config/master.key)
-# ```
-#
-# You can also use [secret helpers](../commands/secrets) for some common password managers.
-# ```
-# SECRETS=$(kamal secrets fetch ...)
-#
-# REGISTRY_PASSWORD=$(kamal secrets extract REGISTRY_PASSWORD $SECRETS)
-# DB_PASSWORD=$(kamal secrets extract DB_PASSWORD $SECRETS)
-# ```
-#
-# If you store secrets directly in .kamal/secrets, ensure that it is not checked into version control.
-#
-# To pass the secrets you should list them under the `secret` key. When you do this the
-# other variables need to be moved under the `clear` key.
-#
-# Unlike clear values, secrets are not passed directly to the container,
-# but are stored in an env file on the host
-env:
-  clear:
-    DB_USER: app
-  secret:
-    - DB_PASSWORD
-
-# Tags
-#
-# Tags are used to add extra env variables to specific hosts.
-# See kamal docs servers for how to tag hosts.
-#
-# Tags are only allowed in the top level env configuration (i.e not under a role specific env).
-#
-# The env variables can be specified with secret and clear values as explained above.
-env:
-  tags:
-    <tag1>:
-      MYSQL_USER: monitoring
-    <tag2>:
-      clear:
-        MYSQL_USER: readonly
-      secret:
-        - MYSQL_PASSWORD
-
-# Example configuration
-env:
-  clear:
-    MYSQL_USER: app
-  secret:
-    - MYSQL_PASSWORD
-  tags:
-    monitoring:
-      MYSQL_USER: monitoring
-    replica:
-      clear:
-        MYSQL_USER: readonly
-      secret:
-        - READONLY_PASSWORD
--- a/lib/kamal/configuration/docs/logging.yml
+++ b/lib/kamal/configuration/docs/logging.yml
@@ -1,21 +0,0 @@
-# Custom logging configuration
-#
-# Set these to control the Docker logging driver and options.
-
-# Logging settings
-#
-# These go under the logging key in the configuration file.
-#
-# This can be specified in the root level or for a specific role.
-logging:
-
-  # Driver
-  #
-  # The logging driver to use, passed to Docker via `--log-driver`
-  driver: json-file
-
-  # Options
-  #
-  # Any logging options to pass to the driver, passed to Docker via `--log-opt`
-  options:
-    max-size: 100m
--- a/lib/kamal/configuration/docs/proxy.yml
+++ b/lib/kamal/configuration/docs/proxy.yml
@@ -1,100 +0,0 @@
-# Proxy
-#
-# Kamal uses [kamal-proxy](https://github.com/basecamp/kamal-proxy) to provide
-# gapless deployments. It runs on ports 80 and 443 and forwards requests to the
-# application container.
-#
-# The proxy is configured in the root configuration under `proxy`. These are
-# options that are set when deploying the application, not when booting the proxy
-#
-# They are application specific, so are not shared when multiple applications
-# run on the same proxy.
-#
-# The proxy is enabled by default on the primary role, but can be disabled by
-# setting `proxy: false`.
-#
-# It is disabled by default on all other roles, but can be enabled by setting
-# `proxy: true`, or providing a proxy configuration.
-proxy:
-
-  # Host
-  #
-  # The hosts that will be used to serve the app. The proxy will only route requests
-  # to this host to your app.
-  #
-  # If no hosts are set, then all requests will be forwarded, except for matching
-  # requests for other apps deployed on that server that do have a host set.
-  host: foo.example.com
-
-  # App port
-  #
-  # The port the application container is exposed on
-  #
-  # Defaults to 80
-  app_port: 3000
-
-  # SSL
-  #
-  # kamal-proxy can provide automatic HTTPS for your application via Let's Encrypt.
-  #
-  # This requires that we are deploying to a one server and the host option is set.
-  # The host value must point to the server we are deploying to and port 443 must be
-  # open for the Let's Encrypt challenge to succeed.
-  #
-  # Defaults to false
-  ssl: true
-
-  # Response timeout
-  #
-  # How long to wait for requests to complete before timing out, defaults to 30 seconds
-  response_timeout: 10
-
-  # Healthcheck
-  #
-  # When deploying, the proxy will by default hit /up once every second until we hit
-  # the deploy timeout, with a 5 second timeout for each request.
-  #
-  # Once the app is up, the proxy will stop hitting the healthcheck endpoint.
-  healthcheck:
-    interval: 3
-    path: /health
-    timeout: 3
-
-  # Buffering
-  #
-  # Whether to buffer request and response bodies in the proxy
-  #
-  # By default buffering is enabled with a max request body size of 1GB and no limit
-  # for response size.
-  #
-  # You can also set the memory limit for buffering, which defaults to 1MB, anything
-  # larger than that is written to disk.
-  buffering:
-    requests: true
-    responses: true
-    max_request_body: 40_000_000
-    max_response_body: 0
-    memory: 2_000_000
-
-  # Logging
-  #
-  # Configure request logging for the proxy
-  # You can specify request and response headers to log.
-  # By default, Cache-Control, Last-Modified and User-Agent request headers are logged
-  logging:
-    request_headers:
-      - Cache-Control
-      - X-Forwarded-Proto
-    response_headers:
-      - X-Request-ID
-      - X-Request-Start
-
-  # Forward headers
-  #
-  # Whether to forward the X-Forwarded-For and X-Forwarded-Proto headers.
-  #
-  # If you are behind a trusted proxy, you can set this to true to forward the headers.
-  #
-  # By default kamal-proxy will not forward the headers the ssl option is set to true, and
-  # will forward them if it is set to false.
-  forward_headers: true
--- a/lib/kamal/configuration/docs/registry.yml
+++ b/lib/kamal/configuration/docs/registry.yml
@@ -1,51 +0,0 @@
-# Registry
-#
-# The default registry is Docker Hub, but you can change it using registry/server:
-#
-# A reference to secret (in this case DOCKER_REGISTRY_TOKEN) will look up the secret
-# in the local environment.
-
-registry:
-  server: registry.digitalocean.com
-  username:
-    - DOCKER_REGISTRY_TOKEN
-  password:
-    - DOCKER_REGISTRY_TOKEN
-
-# Using AWS ECR as the container registry
-# You will need to have the aws CLI installed locally for this to work.
-# AWS ECR’s access token is only valid for 12hrs. In order to not have to manually regenerate the token every time, you can use ERB in the deploy.yml file to shell out to the aws cli command, and obtain the token:
-
-registry:
-  server: <your aws account id>.dkr.ecr.<your aws region id>.amazonaws.com
-  username: AWS
-  password: <%= %x(aws ecr get-login-password) %>
-
-# Using GCP Artifact Registry as the container registry
-# To sign into Artifact Registry, you would need to
-# [create a service account](https://cloud.google.com/iam/docs/service-accounts-create#creating)
-# and [set up roles and permissions](https://cloud.google.com/artifact-registry/docs/access-control#permissions).
-# Normally, assigning a roles/artifactregistry.writer role should be sufficient.
-#
-# Once the service account is ready, you need to generate and download a JSON key and base64 encode it:
-#
-# ```shell
-# base64 -i /path/to/key.json | tr -d "\\n")
-# ```
-# You'll then need to set the KAMAL_REGISTRY_PASSWORD secret to that value.
-#
-# Use the env variable as password along with _json_key_base64 as username.
-# Here’s the final configuration:
-
-registry:
-  server: <your registry region>-docker.pkg.dev
-  username: _json_key_base64
-  password:
-    - KAMAL_REGISTRY_PASSWORD
-
-# Validating the configuration
-#
-# You can validate the configuration by running:
-# ```shell
-# kamal registry login
-# ```
--- a/lib/kamal/configuration/docs/role.yml
+++ b/lib/kamal/configuration/docs/role.yml
@@ -1,54 +0,0 @@
-# Roles
-#
-# Roles are used to configure different types of servers in the deployment.
-# The most common use for this is to run a web servers and job servers.
-#
-# Kamal expects there to be a `web` role, unless you set a different `primary_role`
-# in the root configuration.
-
-# Role configuration
-#
-# Roles are specified under the servers key
-servers:
-
-  # Simple role configuration
-  #
-  #
-  # This can be a list of hosts, if you don't need custom configuration for the role.
-  #
-  # You can set tags on the hosts for custom env variables (see kamal docs env)
-  web:
-    - 172.1.0.1
-    - 172.1.0.2: experiment1
-    - 172.1.0.2: [ experiment1, experiment2 ]
-
-  # Custom role configuration
-  #
-  # When there are other options to set, the list of hosts goes under the `hosts` key
-  #
-  # By default only the primary role uses a proxy.
-  #
-  # For other roles, you can set it to `proxy: true` enable it and inherit the root proxy
-  # configuration or provide a map of options to override the root configuration.
-  #
-  # For the primary role, you can set `proxy: false` to disable the proxy.
-  #
-  # You can also set a custom cmd to run in the container, and overwrite other settings
-  # from the root configuration.
-  workers:
-    hosts:
-      - 172.1.0.3
-      - 172.1.0.4: experiment1
-    cmd: "bin/jobs"
-    options:
-      memory: 2g
-      cpus: 4
-    logging:
-      ...
-    proxy:
-      ...
-    labels:
-      my-label: workers
-    env:
-      ...
-    asset_path: /public
--- a/lib/kamal/configuration/docs/servers.yml
+++ b/lib/kamal/configuration/docs/servers.yml
@@ -1,27 +0,0 @@
-# Servers
-#
-# Servers are split into different roles, with each role having its own configuration.
-#
-# For simpler deployments though where all servers are identical, you can just specify a list of servers
-# They will be implicitly assigned to the `web` role.
-servers:
-  - 172.0.0.1
-  - 172.0.0.2
-  - 172.0.0.3
-
-# Tagging servers
-#
-# Servers can be tagged, with the tags used to add custom env variables (see kamal docs env).
-servers:
-  - 172.0.0.1
-  - 172.0.0.2: experiments
-  - 172.0.0.3: [ experiments, three ]
-
-# Roles
-#
-# For more complex deployments (e.g. if you are running job hosts), you can specify roles, and configure each separately (see kamal docs role)
-servers:
-  web:
-    ...
-  workers:
-    ...
--- a/lib/kamal/configuration/docs/ssh.yml
+++ b/lib/kamal/configuration/docs/ssh.yml
@@ -1,66 +0,0 @@
-# SSH configuration
-#
-# Kamal uses SSH to connect run commands on your hosts.
-# By default it will attempt to connect to the root user on port 22
-#
-# If you are using non-root user, you may need to bootstrap your servers manually, before using them with Kamal. On Ubuntu, you’d do:
-#
-# ```shell
-# sudo apt update
-# sudo apt upgrade -y
-# sudo apt install -y docker.io curl git
-# sudo usermod -a -G docker app
-# ```
-
-
-# SSH options
-#
-# The options are specified under the ssh key in the configuration file.
-ssh:
-
-  # The SSH user
-  #
-  # Defaults to `root`
-  #
-  user: app
-
-  # The SSH port
-  #
-  # Defaults to 22
-  port: "2222"
-
-  # Proxy host
-  #
-  # Specified in the form <host> or <user>@<host>
-  proxy: root@proxy-host
-
-  # Proxy command
-  #
-  # A custom proxy command, required for older versions of SSH
-  proxy_command: "ssh -W %h:%p user@proxy"
-
-  # Log level
-  #
-  # Defaults to `fatal`. Set this to debug if you are having
-  # SSH connection issues.
-  log_level: debug
-
-  # Keys Only
-  #
-  # Set to true to use only private keys from keys and key_data parameters, 
-  # even if ssh-agent offers more identities. This option is intended for 
-  # situations where ssh-agent offers many different identites or you have 
-  # a need to overwrite all identites and force a single one.
-  keys_only: false
-
-  # Keys
-  #
-  # An array of file names of private keys to use for publickey
-  # and hostbased authentication
-  keys: [ "~/.ssh/id.pem" ]
-
-  # Key Data
-  #
-  # An array of strings, with each element of the array being
-  # a raw private key in PEM format.
-  key_data: [ "-----BEGIN OPENSSH PRIVATE KEY-----" ]
--- a/lib/kamal/configuration/docs/sshkit.yml
+++ b/lib/kamal/configuration/docs/sshkit.yml
@@ -1,23 +0,0 @@
-# SSHKit
-#
-# [SSHKit](https://github.com/capistrano/sshkit) is the SSH toolkit used by Kamal.
-#
-# The default settings should be sufficient for most use cases, but
-# when connecting to a large number of hosts you may need to adjust
-
-# SSHKit options
-#
-# The options are specified under the sshkit key in the configuration file.
-sshkit:
-
-  # Max concurrent starts
-  #
-  # Creating SSH connections concurrently can be an issue when deploying to many servers.
-  # By default Kamal will limit concurrent connection starts to 30 at a time.
-  max_concurrent_starts: 10
-
-  # Pool idle timeout
-  #
-  # Kamal sets a long idle timeout of 900 seconds on connections to try to avoid
-  # re-connection storms after an idle period, like building an image or waiting for CI.
-  pool_idle_timeout: 300
--- a/lib/kamal/configuration/env.rb
+++ b/lib/kamal/configuration/env.rb
@@ -1,29 +1,40 @@
 class Kamal::Configuration::Env
-  include Kamal::Configuration::Validation
-
-  attr_reader :context, :secrets
-  attr_reader :clear, :secret_keys
+  attr_reader :secrets_keys, :clear, :secrets_file
  delegate :argumentize, to: Kamal::Utils

-  def initialize(config:, secrets:, context: "env")
-    @clear = config.fetch("clear", config.key?("secret") || config.key?("tags") ? {} : config)
-    @secrets = secrets
-    @secret_keys = config.fetch("secret", [])
-    @context = context
-    validate! config, context: context, with: Kamal::Configuration::Validator::Env
+  def self.from_config(config:, secrets_file: nil)
+    secrets_keys = config.fetch("secret", [])
+    clear = config.fetch("clear", config.key?("secret") || config.key?("tags") ? {} : config)
+
+    new clear: clear, secrets_keys: secrets_keys, secrets_file: secrets_file
  end

-  def clear_args
-    argumentize("--env", clear)
+  def initialize(clear:, secrets_keys:, secrets_file:)
+    @clear = clear
+    @secrets_keys = secrets_keys
+    @secrets_file = secrets_file
+  end
+
+  def args
+    [ "--env-file", secrets_file, *argumentize("--env", clear) ]
  end

  def secrets_io
-    Kamal::EnvFile.new(secret_keys.to_h { |key| [ key, secrets[key] ] }).to_io
+    StringIO.new(Kamal::EnvFile.new(secrets).to_s)
+  end
+
+  def secrets
+    @secrets ||= secrets_keys.to_h { |key| [ key, ENV.fetch(key) ] }
+  end
+
+  def secrets_directory
+    File.dirname(secrets_file)
  end

  def merge(other)
    self.class.new \
-      config: { "clear" => clear.merge(other.clear), "secret" => secret_keys | other.secret_keys },
-      secrets: secrets
+      clear: @clear.merge(other.clear),
+      secrets_keys: @secrets_keys | other.secrets_keys,
+      secrets_file: secrets_file
  end
 end
--- a/lib/kamal/configuration/env/tag.rb
+++ b/lib/kamal/configuration/env/tag.rb
@@ -1,13 +1,12 @@
 class Kamal::Configuration::Env::Tag
-  attr_reader :name, :config, :secrets
+  attr_reader :name, :config

-  def initialize(name, config:, secrets:)
+  def initialize(name, config:)
    @name = name
    @config = config
-    @secrets = secrets
  end

  def env
-    Kamal::Configuration::Env.new(config: config, secrets: secrets)
+    Kamal::Configuration::Env.from_config(config: config)
  end
 end
--- a/lib/kamal/configuration/logging.rb
+++ b/lib/kamal/configuration/logging.rb
@@ -1,33 +0,0 @@
-class Kamal::Configuration::Logging
-  delegate :optionize, :argumentize, to: Kamal::Utils
-
-  include Kamal::Configuration::Validation
-
-  attr_reader :logging_config
-
-  def initialize(logging_config:, context: "logging")
-    @logging_config = logging_config || {}
-    validate! @logging_config, context: context
-  end
-
-  def driver
-    logging_config["driver"]
-  end
-
-  def options
-    logging_config.fetch("options", {})
-  end
-
-  def merge(other)
-    self.class.new logging_config: logging_config.deep_merge(other.logging_config)
-  end
-
-  def args
-    if driver.present? || options.present?
-      optionize({ "log-driver" => driver }.compact) +
-        argumentize("--log-opt", options)
-    else
-      argumentize("--log-opt", { "max-size" => "10m" })
-    end
-  end
-end
--- a/lib/kamal/configuration/proxy.rb
+++ b/lib/kamal/configuration/proxy.rb
@@ -1,66 +1,50 @@
 class Kamal::Configuration::Proxy
-  include Kamal::Configuration::Validation
-
-  DEFAULT_LOG_REQUEST_HEADERS = [ "Cache-Control", "Last-Modified", "User-Agent" ]
-  CONTAINER_NAME = "kamal-proxy"
+  DEFAULT_HTTP_PORT = 80
+  DEFAULT_HTTPS_PORT = 443
+  DEFAULT_IMAGE = "basecamp/kamal-proxy:latest"

  delegate :argumentize, :optionize, to: Kamal::Utils

-  attr_reader :config, :proxy_config
-
-  def initialize(config:, proxy_config:, context: "proxy")
-    @config = config
-    @proxy_config = proxy_config
-    validate! @proxy_config, with: Kamal::Configuration::Validator::Proxy, context: context
+  def initialize(config:)
+    @options = config.raw_config.proxy || {}
  end

-  def app_port
-    proxy_config.fetch("app_port", 80)
+  def image
+    options.fetch("image", DEFAULT_IMAGE)
  end

-  def ssl?
-    proxy_config.fetch("ssl", false)
+  def debug?
+    !!options[:debug]
  end

-  def host
-    proxy_config["host"]
+  def http_port
+    options.fetch(:http_port, DEFAULT_HTTP_PORT)
+  end
+
+  def https_port
+    options.fetch(:http_port, DEFAULT_HTTPS_PORT)
+  end
+
+  def container_name
+    "kamal-proxy"
+  end
+
+  def docker_options_args
+    optionize(options.fetch("options", {}))
+  end
+
+  def publish_args
+    argumentize "--publish", [ *("#{http_port}:#{DEFAULT_HTTP_PORT}" if http_port), *("#{https_port}:#{DEFAULT_HTTPS_PORT}" if https_port) ]
  end

  def deploy_options
-    {
-      host: proxy_config["host"],
-      tls: proxy_config["ssl"],
-      "deploy-timeout": seconds_duration(config.deploy_timeout),
-      "drain-timeout": seconds_duration(config.drain_timeout),
-      "health-check-interval": seconds_duration(proxy_config.dig("healthcheck", "interval")),
-      "health-check-timeout": seconds_duration(proxy_config.dig("healthcheck", "timeout")),
-      "health-check-path": proxy_config.dig("healthcheck", "path"),
-      "target-timeout": seconds_duration(proxy_config["response_timeout"]),
-      "buffer-requests": proxy_config.fetch("buffering", { "requests": true }).fetch("requests", true),
-      "buffer-responses": proxy_config.fetch("buffering", { "responses": true }).fetch("responses", true),
-      "buffer-memory": proxy_config.dig("buffering", "memory"),
-      "max-request-body": proxy_config.dig("buffering", "max_request_body"),
-      "max-response-body": proxy_config.dig("buffering", "max_response_body"),
-      "forward-headers": proxy_config.dig("forward_headers"),
-      "log-request-header": proxy_config.dig("logging", "request_headers") || DEFAULT_LOG_REQUEST_HEADERS,
-      "log-response-header": proxy_config.dig("logging", "response_headers")
-    }.compact
+    options.fetch(:deploy, {})
  end

-  def deploy_command_args(target:)
-    optionize ({ target: "#{target}:#{app_port}" }).merge(deploy_options)
-  end
-
-  def remove_command_args(target:)
-    optionize({ target: "#{target}:#{app_port}" })
-  end
-
-  def merge(other)
-    self.class.new config: config, proxy_config: proxy_config.deep_merge(other.proxy_config)
+  def deploy_command_args
+    optionize deploy_options
  end

  private
-    def seconds_duration(value)
-      value ? "#{value}s" : nil
-    end
+    attr_accessor :options
 end
--- a/lib/kamal/configuration/registry.rb
+++ b/lib/kamal/configuration/registry.rb
@@ -1,40 +0,0 @@
-class Kamal::Configuration::Registry
-  include Kamal::Configuration::Validation
-
-  attr_reader :registry_config, :secrets
-
-  def initialize(config:)
-    @registry_config = config.raw_config.registry || {}
-    @secrets = config.secrets
-    validate! registry_config, with: Kamal::Configuration::Validator::Registry
-  end
-
-  def server
-    registry_config["server"]
-  end
-
-  def username
-    lookup("username")
-  end
-
-  def password
-    lookup("password")
-  end
-
-  def local?
-    server&.match?("^localhost[:$]")
-  end
-
-  def local_port
-    local? ? (server.split(":").last.to_i || 80) : nil
-  end
-
-  private
-    def lookup(key)
-      if registry_config[key].is_a?(Array)
-        secrets[registry_config[key].first]
-      else
-        registry_config[key]
-      end
-    end
-end
--- a/lib/kamal/configuration/role.rb
+++ b/lib/kamal/configuration/role.rb
@@ -1,30 +1,12 @@
 class Kamal::Configuration::Role
-  include Kamal::Configuration::Validation
-
  delegate :argumentize, :optionize, to: Kamal::Utils

-  attr_reader :name, :config, :specialized_env, :specialized_logging, :specialized_proxy
-
+  attr_accessor :name
  alias to_s name

  def initialize(name, config:)
    @name, @config = name.inquiry, config
-    validate! \
-      specializations,
-      example: validation_yml["servers"]["workers"],
-      context: "servers/#{name}",
-      with: Kamal::Configuration::Validator::Role
-
-    @specialized_env = Kamal::Configuration::Env.new \
-      config: specializations.fetch("env", {}),
-      secrets: config.secrets,
-      context: "servers/#{name}/env"
-
-    @specialized_logging = Kamal::Configuration::Logging.new \
-      logging_config: specializations.fetch("logging", {}),
-      context: "servers/#{name}/logging"
-
-    initialize_specialized_proxy
+    @tagged_hosts ||= extract_tagged_hosts_from_config
  end

  def primary_host
@@ -60,51 +42,25 @@ class Kamal::Configuration::Role
  end

  def logging_args
-    logging.args
+    args = config.logging || {}
+    args.deep_merge!(specializations["logging"]) if specializations["logging"].present?
+
+    if args.any?
+      optionize({ "log-driver" => args["driver"] }.compact) +
+        argumentize("--log-opt", args["options"])
+    else
+      config.logging_args
+    end
  end

-  def logging
-    @logging ||= config.logging.merge(specialized_logging)
-  end
-
-  def proxy
-    @proxy ||= config.proxy.merge(specialized_proxy) if running_proxy?
-  end
-
-  def running_proxy?
-    @running_proxy
-  end
-
-  def ssl?
-    running_proxy? && proxy.ssl?
-  end
-
-  def stop_args
-    # When deploying with the proxy, kamal-proxy will drain request before returning so we don't need to wait.
-    timeout = running_proxy? ? nil : config.drain_timeout
-
-    [ *argumentize("-t", timeout) ]
-  end

  def env(host)
    @envs ||= {}
-    @envs[host] ||= [ config.env, specialized_env, *env_tags(host).map(&:env) ].reduce(:merge)
+    @envs[host] ||= [ base_env, specialized_env, *env_tags(host).map(&:env) ].reduce(:merge)
  end

  def env_args(host)
-    [ *env(host).clear_args, *argumentize("--env-file", secrets_path) ]
-  end
-
-  def env_directory
-    File.join(config.env_directory, "roles")
-  end
-
-  def secrets_io(host)
-    env(host).secrets_io
-  end
-
-  def secrets_path
-    File.join(config.env_directory, "roles", "#{name}.env")
+    env(host).args
  end

  def asset_volume_args
@@ -112,8 +68,16 @@ class Kamal::Configuration::Role
  end


+  def running_proxy?
+    if specializations["proxy"].nil?
+      primary?
+    else
+      specializations["proxy"]
+    end
+  end
+
  def primary?
-    name == @config.primary_role_name
+    self == @config.primary_role
  end


@@ -134,67 +98,46 @@ class Kamal::Configuration::Role
    asset_path.present? && running_proxy?
  end

-  def asset_volume(version = config.version)
+  def asset_volume(version = nil)
    if assets?
      Kamal::Configuration::Volume.new \
-        host_path: asset_volume_directory(version), container_path: asset_path
+        host_path: asset_volume_path(version), container_path: asset_path
    end
  end

-  def asset_extracted_directory(version = config.version)
-    File.join config.assets_directory, "extracted", [ name, version ].join("-")
+  def asset_extracted_path(version = nil)
+    File.join config.run_directory, "assets", "extracted", container_name(version)
  end

-  def asset_volume_directory(version = config.version)
-    File.join config.assets_directory, "volumes", [ name, version ].join("-")
-  end
-
-  def ensure_one_host_for_ssl
-    if running_proxy? && proxy.ssl? && hosts.size > 1
-      raise Kamal::ConfigurationError, "SSL is only supported on a single server, found #{hosts.size} servers for role #{name}"
-    end
+  def asset_volume_path(version = nil)
+    File.join config.run_directory, "assets", "volumes", container_name(version)
  end

  private
-    def initialize_specialized_proxy
-      proxy_specializations = specializations["proxy"]
+    attr_accessor :config, :tagged_hosts

-      if primary?
-        # only false means no proxy for non-primary roles
-        @running_proxy = proxy_specializations != false
-      else
-        # false and nil both mean no proxy for non-primary roles
-        @running_proxy = !!proxy_specializations
-      end
-
-      if running_proxy?
-        proxy_config = proxy_specializations == true || proxy_specializations.nil? ? {} : proxy_specializations
-
-        @specialized_proxy = Kamal::Configuration::Proxy.new \
-          config: config,
-          proxy_config: proxy_config,
-          context: "servers/#{name}/proxy"
-      end
-    end
-
-    def tagged_hosts
+    def extract_tagged_hosts_from_config
      {}.tap do |tagged_hosts|
        extract_hosts_from_config.map do |host_config|
          if host_config.is_a?(Hash)
+            raise ArgumentError, "Multiple hosts found: #{host_config.inspect}" unless host_config.size == 1
+
            host, tags = host_config.first
            tagged_hosts[host] = Array(tags)
-          elsif host_config.is_a?(String)
+          elsif host_config.is_a?(String) || host_config.is_a?(Symbol)
            tagged_hosts[host_config] = []
+          else
+            raise ArgumentError, "Invalid host config: #{host_config.inspect}"
          end
        end
      end
    end

    def extract_hosts_from_config
-      if config.raw_config.servers.is_a?(Array)
-        config.raw_config.servers
+      if config.servers.is_a?(Array)
+        config.servers
      else
-        servers = config.raw_config.servers[name]
+        servers = config.servers[name]
        servers.is_a?(Array) ? servers : Array(servers["hosts"])
      end
    end
@@ -203,18 +146,29 @@ class Kamal::Configuration::Role
      { "service" => config.service, "role" => name, "destination" => config.destination }
    end

-    def specializations
-      if config.raw_config.servers.is_a?(Array) || config.raw_config.servers[name].is_a?(Array)
-        {}
-      else
-        config.raw_config.servers[name]
-      end
-    end
-
    def custom_labels
      Hash.new.tap do |labels|
        labels.merge!(config.labels) if config.labels.present?
        labels.merge!(specializations["labels"]) if specializations["labels"].present?
      end
    end
+
+    def specializations
+      if config.servers.is_a?(Array) || config.servers[name].is_a?(Array)
+        {}
+      else
+        config.servers[name].except("hosts")
+      end
+    end
+
+    def specialized_env
+      Kamal::Configuration::Env.from_config config: specializations.fetch("env", {})
+    end
+
+    # Secrets are stored in an array, which won't merge by default, so have to do it by hand.
+    def base_env
+      Kamal::Configuration::Env.from_config \
+        config: config.env,
+        secrets_file: File.join(config.host_env_directory, "roles", "#{container_prefix}.env")
+    end
 end
--- a/lib/kamal/configuration/servers.rb
+++ b/lib/kamal/configuration/servers.rb
@@ -1,18 +0,0 @@
-class Kamal::Configuration::Servers
-  include Kamal::Configuration::Validation
-
-  attr_reader :config, :servers_config, :roles
-
-  def initialize(config:)
-    @config = config
-    @servers_config = config.raw_config.servers
-    validate! servers_config, with: Kamal::Configuration::Validator::Servers
-
-    @roles = role_names.map { |role_name| Kamal::Configuration::Role.new role_name, config: config }
-  end
-
-  private
-    def role_names
-      servers_config.is_a?(Array) ? [ "web" ] : servers_config.keys.sort
-    end
-end
--- a/lib/kamal/configuration/ssh.rb
+++ b/lib/kamal/configuration/ssh.rb
@@ -1,45 +1,28 @@
 class Kamal::Configuration::Ssh
  LOGGER = ::Logger.new(STDERR)

-  include Kamal::Configuration::Validation
-
-  attr_reader :ssh_config
-
  def initialize(config:)
-    @ssh_config = config.raw_config.ssh || {}
-    validate! ssh_config
+    @config = config.raw_config.ssh || {}
  end

  def user
-    ssh_config.fetch("user", "root")
+    config.fetch("user", "root")
  end

  def port
-    ssh_config.fetch("port", 22)
+    config.fetch("port", 22)
  end

  def proxy
-    if (proxy = ssh_config["proxy"])
+    if (proxy = config["proxy"])
      Net::SSH::Proxy::Jump.new(proxy.include?("@") ? proxy : "root@#{proxy}")
-    elsif (proxy_command = ssh_config["proxy_command"])
+    elsif (proxy_command = config["proxy_command"])
      Net::SSH::Proxy::Command.new(proxy_command)
    end
  end

-  def keys_only
-    ssh_config["keys_only"]
-  end
-
-  def keys
-    ssh_config["keys"]
-  end
-
-  def key_data
-    ssh_config["key_data"]
-  end
-
  def options
-    { user: user, port: port, proxy: proxy, logger: logger, keepalive: true, keepalive_interval: 30, keys_only: keys_only, keys: keys, key_data: key_data }.compact
+    { user: user, port: port, proxy: proxy, logger: logger, keepalive: true, keepalive_interval: 30 }.compact
  end

  def to_h
@@ -47,11 +30,13 @@ class Kamal::Configuration::Ssh
  end

  private
+    attr_accessor :config
+
    def logger
      LOGGER.tap { |logger| logger.level = log_level }
    end

    def log_level
-      ssh_config.fetch("log_level", :fatal)
+      config.fetch("log_level", :fatal)
    end
 end
--- a/lib/kamal/configuration/sshkit.rb
+++ b/lib/kamal/configuration/sshkit.rb
@@ -1,22 +1,20 @@
 class Kamal::Configuration::Sshkit
-  include Kamal::Configuration::Validation
-
-  attr_reader :sshkit_config
-
  def initialize(config:)
-    @sshkit_config = config.raw_config.sshkit || {}
-    validate! sshkit_config
+    @options = config.raw_config.sshkit || {}
  end

  def max_concurrent_starts
-    sshkit_config.fetch("max_concurrent_starts", 30)
+    options.fetch("max_concurrent_starts", 30)
  end

  def pool_idle_timeout
-    sshkit_config.fetch("pool_idle_timeout", 900)
+    options.fetch("pool_idle_timeout", 900)
  end

  def to_h
-    sshkit_config
+    options
  end
+
+  private
+    attr_accessor :options
 end
--- a/lib/kamal/configuration/validation.rb
+++ b/lib/kamal/configuration/validation.rb
@@ -1,27 +0,0 @@
-require "yaml"
-require "active_support/inflector"
-
-module Kamal::Configuration::Validation
-  extend ActiveSupport::Concern
-
-  class_methods do
-    def validation_doc
-      @validation_doc ||= File.read(File.join(File.dirname(__FILE__), "docs", "#{validation_config_key}.yml"))
-    end
-
-    def validation_config_key
-      @validation_config_key ||= name.demodulize.underscore
-    end
-  end
-
-  def validate!(config, example: nil, context: nil, with: Kamal::Configuration::Validator)
-    context ||= self.class.validation_config_key
-    example ||= validation_yml[self.class.validation_config_key]
-
-    with.new(config, example: example, context: context).validate!
-  end
-
-  def validation_yml
-    @validation_yml ||= YAML.load(self.class.validation_doc)
-  end
-end
--- a/lib/kamal/configuration/validator.rb
+++ b/lib/kamal/configuration/validator.rb
@@ -1,171 +0,0 @@
-class Kamal::Configuration::Validator
-  attr_reader :config, :example, :context
-
-  def initialize(config, example:, context:)
-    @config = config
-    @example = example
-    @context = context
-  end
-
-  def validate!
-    validate_against_example! config, example
-  end
-
-  private
-    def validate_against_example!(validation_config, example)
-      validate_type! validation_config, example.class
-
-      if example.class == Hash
-        check_unknown_keys! validation_config, example
-
-        validation_config.each do |key, value|
-          next if extension?(key)
-          with_context(key) do
-            example_value = example[key]
-
-            if example_value == "..."
-              unless key.to_s == "proxy" && boolean?(value.class)
-                validate_type! value, *(Array if key == :servers), Hash
-              end
-            elsif key == "hosts"
-              validate_servers! value
-            elsif example_value.is_a?(Array)
-              if key == "arch"
-                validate_array_of_or_type! value, example_value.first.class
-              else
-                validate_array_of! value, example_value.first.class
-              end
-            elsif example_value.is_a?(Hash)
-              case key.to_s
-              when "options", "args"
-                validate_type! value, Hash
-              when "labels"
-                validate_hash_of! value, example_value.first[1].class
-              else
-                validate_against_example! value, example_value
-              end
-            else
-              validate_type! value, example_value.class
-            end
-          end
-        end
-      end
-    end
-
-
-    def valid_type?(value, type)
-      value.is_a?(type) ||
-        (type == String && stringish?(value)) ||
-        (boolean?(type) && boolean?(value.class))
-    end
-
-    def type_description(type)
-      if type == Integer || type == Array
-        "an #{type.name.downcase}"
-      elsif type == TrueClass || type == FalseClass
-        "a boolean"
-      else
-        "a #{type.name.downcase}"
-      end
-    end
-
-    def boolean?(type)
-      type == TrueClass || type == FalseClass
-    end
-
-    def stringish?(value)
-      value.is_a?(String) || value.is_a?(Symbol) || value.is_a?(Numeric) || value.is_a?(TrueClass) || value.is_a?(FalseClass)
-    end
-
-    def validate_array_of_or_type!(value, type)
-      if value.is_a?(Array)
-        validate_array_of! value, type
-      else
-        validate_type! value, type
-      end
-    rescue Kamal::ConfigurationError
-      type_error(Array, type)
-    end
-
-    def validate_array_of!(array, type)
-      validate_type! array, Array
-
-      array.each_with_index do |value, index|
-        with_context(index) do
-          validate_type! value, type
-        end
-      end
-    end
-
-    def validate_hash_of!(hash, type)
-      validate_type! hash, Hash
-
-      hash.each do |key, value|
-        with_context(key) do
-          validate_type! value, type
-        end
-      end
-    end
-
-    def validate_servers!(servers)
-      validate_type! servers, Array
-
-      servers.each_with_index do |server, index|
-        with_context(index) do
-          validate_type! server, String, Hash
-
-          if server.is_a?(Hash)
-            error "multiple hosts found" unless server.size == 1
-            host, tags = server.first
-
-            with_context(host) do
-              validate_type! tags, String, Array
-              validate_array_of! tags, String if tags.is_a?(Array)
-            end
-          end
-        end
-      end
-    end
-
-    def validate_type!(value, *types)
-      type_error(*types) unless types.any? { |type| valid_type?(value, type) }
-    end
-
-    def error(message)
-      raise Kamal::ConfigurationError, "#{error_context}#{message}"
-    end
-
-    def type_error(*expected_types)
-      error "should be #{expected_types.map { |type| type_description(type) }.join(" or ")}"
-    end
-
-    def unknown_keys_error(unknown_keys)
-      error "unknown #{"key".pluralize(unknown_keys.count)}: #{unknown_keys.join(", ")}"
-    end
-
-    def error_context
-      "#{context}: " if context.present?
-    end
-
-    def with_context(context)
-      old_context = @context
-      @context = [ @context, context ].select(&:present?).join("/")
-      yield
-    ensure
-      @context = old_context
-    end
-
-    def allow_extensions?
-      false
-    end
-
-    def extension?(key)
-      key.to_s.start_with?("x-")
-    end
-
-    def check_unknown_keys!(config, example)
-      unknown_keys = config.keys - example.keys
-      unknown_keys.reject! { |key| extension?(key) } if allow_extensions?
-      unknown_keys_error unknown_keys if unknown_keys.present?
-    end
-end
--- a/lib/kamal/configuration/validator/accessory.rb
+++ b/lib/kamal/configuration/validator/accessory.rb
@@ -1,9 +0,0 @@
-class Kamal::Configuration::Validator::Accessory < Kamal::Configuration::Validator
-  def validate!
-    super
-
-    if (config.keys & [ "host", "hosts", "roles" ]).size != 1
-      error "specify one of `host`, `hosts` or `roles`"
-    end
-  end
-end
--- a/lib/kamal/configuration/validator/alias.rb
+++ b/lib/kamal/configuration/validator/alias.rb
@@ -1,15 +0,0 @@
-class Kamal::Configuration::Validator::Alias < Kamal::Configuration::Validator
-  def validate!
-    super
-
-    name = context.delete_prefix("aliases/")
-
-    if name !~ /\A[a-z0-9_-]+\z/
-      error "Invalid alias name: '#{name}'. Must only contain lowercase letters, alphanumeric, hyphens and underscores."
-    end
-
-    if Kamal::Cli::Main.commands.include?(name)
-      error "Alias '#{name}' conflicts with a built-in command."
-    end
-  end
-end
--- a/lib/kamal/configuration/validator/builder.rb
+++ b/lib/kamal/configuration/validator/builder.rb
@@ -1,13 +0,0 @@
-class Kamal::Configuration::Validator::Builder < Kamal::Configuration::Validator
-  def validate!
-    super
-
-    if config["cache"] && config["cache"]["type"]
-      error "Invalid cache type: #{config["cache"]["type"]}" unless [ "gha", "registry" ].include?(config["cache"]["type"])
-    end
-
-    error "Builder arch not set" unless config["arch"].present?
-
-    error "Cannot disable local builds, no remote is set" if config["local"] == false && config["remote"].blank?
-  end
-end
--- a/lib/kamal/configuration/validator/configuration.rb
+++ b/lib/kamal/configuration/validator/configuration.rb
@@ -1,6 +0,0 @@
-class Kamal::Configuration::Validator::Configuration < Kamal::Configuration::Validator
-  private
-    def allow_extensions?
-      true
-    end
-end
--- a/lib/kamal/configuration/validator/env.rb
+++ b/lib/kamal/configuration/validator/env.rb
@@ -1,54 +0,0 @@
-class Kamal::Configuration::Validator::Env < Kamal::Configuration::Validator
-  SPECIAL_KEYS = [ "clear", "secret", "tags" ]
-
-  def validate!
-    if known_keys.any?
-      validate_complex_env!
-    else
-      validate_simple_env!
-    end
-  end
-
-  private
-    def validate_simple_env!
-      validate_hash_of!(config, String)
-    end
-
-    def validate_complex_env!
-      unknown_keys_error unknown_keys if unknown_keys.any?
-
-      with_context("clear") { validate_hash_of!(config["clear"], String) } if config.key?("clear")
-      with_context("secret") { validate_array_of!(config["secret"], String) } if config.key?("secret")
-      validate_tags! if config.key?("tags")
-    end
-
-    def known_keys
-      @known_keys ||= config.keys & SPECIAL_KEYS
-    end
-
-    def unknown_keys
-      @unknown_keys ||= config.keys - SPECIAL_KEYS
-    end
-
-    def validate_tags!
-      if context == "env"
-        with_context("tags") do
-          validate_type! config["tags"], Hash
-
-          config["tags"].each do |tag, value|
-            with_context(tag) do
-              validate_type! value, Hash
-
-              Kamal::Configuration::Validator::Env.new(
-                value,
-                example: example["tags"].values[1],
-                context: context
-              ).validate!
-            end
-          end
-        end
-      else
-        error "tags are only allowed in the root env"
-      end
-    end
-end
--- a/lib/kamal/configuration/validator/proxy.rb
+++ b/lib/kamal/configuration/validator/proxy.rb
@@ -1,11 +0,0 @@
-class Kamal::Configuration::Validator::Proxy < Kamal::Configuration::Validator
-  def validate!
-    unless config.nil?
-      super
-
-      if config["host"].blank? && config["ssl"]
-        error "Must set a host to enable automatic SSL"
-      end
-    end
-  end
-end
--- a/lib/kamal/configuration/validator/registry.rb
+++ b/lib/kamal/configuration/validator/registry.rb
@@ -1,27 +0,0 @@
-class Kamal::Configuration::Validator::Registry < Kamal::Configuration::Validator
-  STRING_OR_ONE_ITEM_ARRAY_KEYS = [ "username", "password" ]
-
-  def validate!
-    validate_against_example! \
-      config.except(*STRING_OR_ONE_ITEM_ARRAY_KEYS),
-      example.except(*STRING_OR_ONE_ITEM_ARRAY_KEYS)
-
-    validate_string_or_one_item_array! "username"
-    validate_string_or_one_item_array! "password"
-  end
-
-  private
-    def validate_string_or_one_item_array!(key)
-      with_context(key) do
-        value = config[key]
-
-        unless config["server"]&.match?("^localhost[:$]")
-          error "is required" unless value.present?
-
-          unless value.is_a?(String) || (value.is_a?(Array) && value.size == 1 && value.first.is_a?(String))
-            error "should be a string or an array with one string (for secret lookup)"
-          end
-        end
-      end
-    end
-end
--- a/lib/kamal/configuration/validator/role.rb
+++ b/lib/kamal/configuration/validator/role.rb
@@ -1,11 +0,0 @@
-class Kamal::Configuration::Validator::Role < Kamal::Configuration::Validator
-  def validate!
-    validate_type! config, Array, Hash
-
-    if config.is_a?(Array)
-      validate_servers! "servers", config
-    else
-      super
-    end
-  end
-end
--- a/lib/kamal/configuration/validator/servers.rb
+++ b/lib/kamal/configuration/validator/servers.rb
@@ -1,7 +0,0 @@
-class Kamal::Configuration::Validator::Servers < Kamal::Configuration::Validator
-  def validate!
-    validate_type! config, Array, Hash
-
-    validate_servers! config if config.is_a?(Array)
-  end
-end
--- a/lib/kamal/env_file.rb
+++ b/lib/kamal/env_file.rb
@@ -15,10 +15,6 @@ class Kamal::EnvFile
    env_file.presence || "\n"
  end

-  def to_io
-    StringIO.new(to_s)
-  end
-
  alias to_str to_s

  private
--- a/Show More
+++ b/Show More