diff --git a/ansible-role/defaults/main.yml b/ansible-role/defaults/main.yml
index 7ca01fee9..4b0b3ef86 100644
--- a/ansible-role/defaults/main.yml
+++ b/ansible-role/defaults/main.yml
@@ -2,4 +2,3 @@
 # Specifies the filesystem path or URL of a Debian package that installs
 # TinyPilot.
 tinypilot_debian_package_path: null
-tinypilot_enable_debug_logging: no
diff --git a/ansible-role/handlers/main.yml b/ansible-role/handlers/main.yml
deleted file mode 100644
index 4d3c4a526..000000000
--- a/ansible-role/handlers/main.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-- name: reload TinyPilot systemd config
-  systemd:
-    name: tinypilot
-    daemon_reload: yes
-
-- name: restart TinyPilot service
-  service:
-    name: tinypilot
-    state: restarted
diff --git a/ansible-role/tasks/main.yml b/ansible-role/tasks/main.yml
index fe709b20e..cc08ac4dc 100644
--- a/ansible-role/tasks/main.yml
+++ b/ansible-role/tasks/main.yml
@@ -7,21 +7,3 @@
 - name: install TinyPilot Debian package
   apt:
     deb: "{{ tinypilot_debian_package_path }}"
-  notify:
-    - restart TinyPilot service
-
-- name: install TinyPilot as a service
-  template:
-    src: tinypilot.systemd.j2
-    dest: /lib/systemd/system/tinypilot.service
-    owner: root
-    group: root
-    mode: "0644"
-  notify:
-    - reload TinyPilot systemd config
-    - restart TinyPilot service
-
-- name: enable systemd TinyPilot service file
-  systemd:
-    name: tinypilot
-    enabled: yes
diff --git a/ansible-role/vars/main.yml b/ansible-role/vars/main.yml
index fa9da05b4..ee2f1857e 100644
--- a/ansible-role/vars/main.yml
+++ b/ansible-role/vars/main.yml
@@ -1,13 +1,4 @@
 ---
-# TinyPilot's get-tinypilot.sh script (which it uses for installation and
-# updates) relies on the tinypilot user being named "tinypilot" so changing this
-# value will break updates.
-tinypilot_user: tinypilot
-tinypilot_group: tinypilot
-
-tinypilot_dir: /opt/tinypilot
-tinypilot_privileged_dir: /opt/tinypilot-privileged
-
 # uStreamer variables are placed here, instead of in `defaults/main.yml`,
 # in order to elevate their variable precedence. These variables will now
 # override the default variables in the uStreamer role.
diff --git a/debian-pkg/debian/rules b/debian-pkg/debian/rules
index cb69017f4..cd2185a63 100755
--- a/debian-pkg/debian/rules
+++ b/debian-pkg/debian/rules
@@ -13,6 +13,7 @@ export DEB_BUILD_OPTIONS=noddebs
 	dh $@ --with python-virtualenv
 
 override_dh_installsystemd:
+	dh_installsystemd --name=tinypilot
 	dh_installsystemd --name=tinypilot-updater --no-start --no-enable
 	dh_installsystemd --name=usb-gadget --no-start
 
diff --git a/ansible-role/templates/tinypilot.systemd.j2 b/debian-pkg/debian/tinypilot.service
similarity index 59%
rename from ansible-role/templates/tinypilot.systemd.j2
rename to debian-pkg/debian/tinypilot.service
index 829c70d9a..a38a19da7 100644
--- a/ansible-role/templates/tinypilot.systemd.j2
+++ b/debian-pkg/debian/tinypilot.service
@@ -6,13 +6,10 @@ StartLimitIntervalSec=0
 
 [Service]
 Type=simple
-User={{ tinypilot_user }}
-WorkingDirectory={{ tinypilot_dir }}
-ExecStart={{ tinypilot_dir }}/venv/bin/python app/main.py
+User=tinypilot
+WorkingDirectory=/opt/tinypilot
+ExecStart=/opt/tinypilot/venv/bin/python app/main.py
 Environment=APP_SETTINGS_FILE=/home/tinypilot/app_settings.cfg
-{% if tinypilot_enable_debug_logging %}
-Environment=DEBUG=1
-{% endif %}
 Restart=always
 
 [Install]