diff --git a/lib/kamal/cli/accessory.rb b/lib/kamal/cli/accessory.rb
index e37e4116..70aa208c 100644
--- a/lib/kamal/cli/accessory.rb
+++ b/lib/kamal/cli/accessory.rb
@@ -18,7 +18,11 @@ class Kamal::Cli::Accessory < Kamal::Cli::Base
             execute *accessory.ensure_env_directory
             upload! accessory.secrets_io, accessory.secrets_path, mode: "0600"
             execute *accessory.run
-            execute *accessory.deploy if accessory.running_proxy?
+
+            if accessory.running_proxy?
+              target = accessory.container_id_for(container_name: accessory.service_name, only_running: true)
+              execute *accessory.deploy(target: target)
+            end
           end
         end
       end
@@ -76,7 +80,10 @@ class Kamal::Cli::Accessory < Kamal::Cli::Base
         on(hosts) do
           execute *KAMAL.auditor.record("Started #{name} accessory"), verbosity: :debug
           execute *accessory.start
-          execute *accessory.deploy if accessory.running_proxy?
+          if accessory.running_proxy?
+            target = container_id_for(container_name: service_name, only_running: true)
+            execute *accessory.deploy(target: target)
+          end
         end
       end
     end
@@ -89,7 +96,11 @@ class Kamal::Cli::Accessory < Kamal::Cli::Base
         on(hosts) do
           execute *KAMAL.auditor.record("Stopped #{name} accessory"), verbosity: :debug
           execute *accessory.stop, raise_on_non_zero_exit: false
-          execute *accessory.remove if accessory.running_proxy?
+
+          if accessory.running_proxy?
+            target = accessory.container_id_for(container_name: accessory.service_name, only_running: true)
+            execute *accessory.remove(target: target)
+          end
         end
       end
     end
diff --git a/lib/kamal/commands/accessory.rb b/lib/kamal/commands/accessory.rb
index 9068ba9b..e002b28d 100644
--- a/lib/kamal/commands/accessory.rb
+++ b/lib/kamal/commands/accessory.rb
@@ -40,14 +40,12 @@ class Kamal::Commands::Accessory < Kamal::Commands::Base
     docker :ps, *service_filter
   end
 
-  def deploy
-    target = container_id_for(container_name: service_name, only_running: true)
-    proxy_exec :deploy, service_name, *accessory_config.proxy.deploy_command_args(target: target) if target
+  def deploy(target:)
+    proxy_exec :deploy, service_name, *accessory_config.proxy.deploy_command_args(target: target)
   end
 
-  def remove
-    target = container_id_for(container_name: service_name, only_running: true)
-    proxy_exec :remove, service_name, *accessory_config.proxy.remove_command_args(target: target) if target
+  def remove(target:)
+    proxy_exec :remove, service_name, *accessory_config.proxy.remove_command_args(target: target)
   end
 
 
diff --git a/test/commands/accessory_test.rb b/test/commands/accessory_test.rb
index 1befd9e6..9909de3a 100644
--- a/test/commands/accessory_test.rb
+++ b/test/commands/accessory_test.rb
@@ -39,7 +39,10 @@ class CommandsAccessoryTest < ActiveSupport::TestCase
         "busybox" => {
           "service" => "custom-busybox",
           "image" => "busybox:latest",
-          "host" => "1.1.1.7"
+          "host" => "1.1.1.7",
+          "proxy" => {
+            "host" => "busybox.example.com"
+          }
         }
       }
     }
@@ -166,6 +169,18 @@ class CommandsAccessoryTest < ActiveSupport::TestCase
       new_command(:mysql).remove_image.join(" ")
   end
 
+  test "deploy" do
+    assert_equal \
+      "docker exec kamal-proxy kamal-proxy deploy custom-busybox --target \"172.1.0.2:80\" --deploy-timeout \"30s\" --drain-timeout \"30s\" --buffer-requests --buffer-responses --log-request-header \"Cache-Control\" --log-request-header \"Last-Modified\" --log-request-header \"User-Agent\"",
+      new_command(:busybox).deploy(target: "172.1.0.2").join(" ")
+  end
+
+  test "remove" do
+    assert_equal \
+      "docker exec kamal-proxy kamal-proxy remove custom-busybox --target \"172.1.0.2:80\"",
+      new_command(:busybox).remove(target: "172.1.0.2").join(" ")
+  end
+
   private
     def new_command(accessory)
       Kamal::Commands::Accessory.new(Kamal::Configuration.new(@config), name: accessory)