diff --git a/container/debian/cuttlefish-podcvd.cuttlefish-podcvd.service b/container/debian/cuttlefish-podcvd.cuttlefish-podcvd.service
new file mode 100644
index 00000000000..c9a50d6c61d
--- /dev/null
+++ b/container/debian/cuttlefish-podcvd.cuttlefish-podcvd.service
@@ -0,0 +1,21 @@
+[Unit]
+SourcePath=/etc/init.d/cuttlefish-podcvd
+Description=Setup initial environment to use podcvd
+After=network-online.target
+After=remote-fs.target
+Wants=network-online.target
+
+[Service]
+Type=forking
+Restart=no
+TimeoutSec=5min
+IgnoreSIGPIPE=no
+KillMode=process
+GuessMainPID=no
+RemainAfterExit=yes
+SuccessExitStatus=5 6
+ExecStart=/etc/init.d/cuttlefish-podcvd start
+ExecStop=/etc/init.d/cuttlefish-podcvd stop
+
+[Install]
+WantedBy=multi-user.target
diff --git a/container/debian/rules b/container/debian/rules
index 57393648b21..4afdfde4a26 100755
--- a/container/debian/rules
+++ b/container/debian/rules
@@ -36,6 +36,8 @@ override_dh_installinit:
 .PHONY: override_dh_installsystemd
 override_dh_installsystemd:
 	dh_installsystemd --name=podcvd-acl-restore
+	dh_installsystemd --name=cuttlefish-podcvd
+	dh_installsystemd
 
 .PHONY: override_dh_auto_clean
 override_dh_auto_clean: