diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a2c703f..bf7940d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -30,12 +30,32 @@ jobs:
         uses: actions/checkout@v2
       - name: Build
         run: GOARCH=arm GOARM=6 GOOS=linux go build
-      - name: Upload binary
+
+      - name: Package code
+        run: |
+          mkdir light-controller_${{ github.ref_name }}_armv6l
+          mkdir -p light-controller_${{ github.ref_name }}_armv6l/usr/local/bin
+          mkdir -p light-controller_${{ github.ref_name }}_armv6l/etc/systemd/system
+          cp light-controller light-controller_${{ github.ref_name }}_armv6l/usr/local/bin/
+          cp light-controller.service light-controller_${{ github.ref_name }}_armv6l/etc/systemd/system/
+
+      - name: Package deb
+        id: package-deb
+        uses: cha-king/build-deb-action@v2.4.2
+        with:
+          package: light-controller
+          package_root: light-controller_${{ github.ref_name }}_armv6l
+          maintainer: Charlie King
+          version: ${{ github.ref_name }}
+          arch: armv6l
+          desc: Simple MQTT light controller
+
+      - name: Upload deb package
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ needs.create-release.outputs.upload_url }}
-          asset_path: ./light-controller
-          asset_name: light-controller
+          asset_path: ./${{ steps.package-deb.outputs.file_name }}
+          asset_name: ${{ steps.package-deb.outputs.file_name }}
           asset_content_type: application/octet-stream
diff --git a/light-controller.service b/light-controller.service
new file mode 100644
index 0000000..f880bcc
--- /dev/null
+++ b/light-controller.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Simple MQTT light controller
+Wants=network-online.target
+After=network-online.target
+
+[Service]
+Type=simple
+ExecStart=/usr/local/bin/light-controller
+
+[Install]
+WantedBy=multi-user.target