diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..1dc0658
Binary files /dev/null and b/.DS_Store differ
diff --git a/Formula/appveyor-build-agent.rb b/Formula/appveyor-build-agent.rb
index 628893b..f86e67f 100644
--- a/Formula/appveyor-build-agent.rb
+++ b/Formula/appveyor-build-agent.rb
@@ -28,41 +28,16 @@ def caveats
   end
 
 
-  plist_options :startup => true
-
-  def plist
-    <<~EOS
-      <?xml version="1.0" encoding="UTF-8"?>
-      <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-      <plist version="1.0">
-        <dict>
-          <key>KeepAlive</key>
-          <false/>
-          <key>Label</key>
-          <string>#{plist_name}</string>
-          <key>Program</key>
-          <string>#{prefix}/appveyor-build-agent</string>
-          <key>ProgramArguments</key>
-          <array>
-          </array>
-          <key>EnvironmentVariables</key>
-          <dict>
-            <key>PATH</key>
-            <string>/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin</string>
-          </dict>
-          <key>RunAtLoad</key>
-          <true/>
-          <key>WorkingDirectory</key>
-          <string>#{prefix}</string>
-          <key>StandardErrorPath</key>
-          <string>#{prefix}/build-agent.stderr.log</string>
-          <key>StandardOutPath</key>
-          <string>#{prefix}/build-agent.stdout.log</string>
-        </dict>
-      </plist>
-    EOS
+  service do
+    run "#{opt_prefix}/appveyor-build-agent"
+    keep_alive successful_exit: true
+    environment_variables PATH: "/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
+    working_dir "#{var}/appveyor/build-agent/"
+    log_path "#{var}/build-agent.stdout.log"
+    error_log_path "#{var}/build-agent.stderr.log"
+    run_at_load true
   end
-
+  
   test do
     # `test do` will create, run in and delete a temporary directory.
     #
diff --git a/Formula/appveyor-host-agent.rb b/Formula/appveyor-host-agent.rb
index 998da68..6fadd55 100644
--- a/Formula/appveyor-host-agent.rb
+++ b/Formula/appveyor-host-agent.rb
@@ -50,34 +50,13 @@ def caveats
   end
 
 
-  plist_options :startup => false
-
-  def plist
-    <<~EOS
-      <?xml version="1.0" encoding="UTF-8"?>
-      <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-      <plist version="1.0">
-        <dict>
-          <key>KeepAlive</key>
-          <false/>
-          <key>Label</key>
-          <string>#{plist_name}</string>
-          <key>Program</key>
-          <string>#{prefix}/appveyor-host-agent</string>
-          <key>ProgramArguments</key>
-          <array>
-          </array>
-          <key>RunAtLoad</key>
-          <true/>
-          <key>WorkingDirectory</key>
-          <string>#{var}/appveyor/host-agent/</string>
-          <key>StandardErrorPath</key>
-          <string>#{var}/appveyor/host-agent/host-agent.stderr.log</string>
-          <key>StandardOutPath</key>
-          <string>#{var}/appveyor/host-agent/host-agent.stdout.log</string>
-        </dict>
-      </plist>
-    EOS
+  service do
+    run "#{opt_prefix}/appveyor-host-agent"
+    keep_alive successful_exit: true
+    log_path "#{var}/appveyor/host-agent/host-agent.stdout.log"
+    error_log_path "#{var}/appveyor/host-agent/host-agent.stderr.log"
+    working_dir "#{var}/appveyor/host-agent/"
+    run_at_load false
   end
 
   test do