diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..3be021d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.runner
+token.txt
diff --git a/gitea-runner/act_runner b/gitea-runner/act_runner
new file mode 100755
index 0000000..9c2429b
Binary files /dev/null and b/gitea-runner/act_runner differ
diff --git a/gitea-runner/config.yaml b/gitea-runner/config.yaml
index 5a3c0c0..d047374 100644
--- a/gitea-runner/config.yaml
+++ b/gitea-runner/config.yaml
@@ -8,7 +8,6 @@ runner:
   labels:
     - gitea-runner-hestia
     - ubuntu-latest:docker://ubuntu:latest
-    - ubuntu-latest:host
 
 cache:
   enabled: false
diff --git a/gitea-runner/gitea-runner.service b/gitea-runner/gitea-runner.service
new file mode 100644
index 0000000..f710867
--- /dev/null
+++ b/gitea-runner/gitea-runner.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Gitea Actions Runner
+After=network.target
+
+[Service]
+Type=simple
+User=iamferreirajp
+WorkingDirectory=/home/iamferreirajp/homelab/gitea-runner
+ExecStart=/home/iamferreirajp/homelab/gitea-runner/act_runner daemon
+Restart=always
+RestartSec=5
+
+[Install]
+WantedBy=multi-user.target
diff --git a/gitea-runner/register.sh b/gitea-runner/register.sh
index 5ca1047..7b011cb 100755
--- a/gitea-runner/register.sh
+++ b/gitea-runner/register.sh
@@ -9,7 +9,7 @@
 set -e
 
 GITEA_URL="${INSTANCE_URL:-https://gitea.hackerfortress.cc}"
-TOKEN="eBtqNTibRTIrZxlcqopYJUeJJj1mhaCJxIaEOhcU"
+TOKEN="${RUNNER_TOKEN}"
 
 if [ -z "$TOKEN" ]; then
     echo "❌ RUNNER_TOKEN not set"
@@ -19,41 +19,16 @@ fi
 
 echo "📡 Registering runner with Gitea at ${GITEA_URL}..."
 
-# Create initial config for registration
-cat > config.yaml << EOF
-log:
-  level: info
-  formatting: text
-
-runner:
-  capacity: 2
-  name: gitea-runner-hestia
-  labels:
-    - gitea-runner-hestia
-    - ubuntu-latest:docker://ubuntu:latest
-    - ubuntu-latest:host
-
-cache:
-  enabled: false
-
-docker:
-  host: unix:///var/run/docker.sock
-  network: ""
-  privileged: false
-EOF
-
-# Run registration using the runner itself
-docker compose run --rm \
-    -e GITEA_INSTANCE_URL="${GITEA_URL}" \
-    -e GITEA_RUNNER_TOKEN="${TOKEN}" \
-    act_runner \
-    act_runner register \
+# Register and get the runner config
+docker compose run --rm act_runner \
+    act_runner generate-config \
     --instance "${GITEA_URL}" \
     --token "${TOKEN}" \
-    --name "gitea-runner-hestia" \
-    --labels "gitea-runner-hestia"
+    --name "gitea-runner-dockerino" \
+    > config.yaml
 
 echo "✅ Runner registered successfully!"
 echo ""
-echo "Now start with:"
-echo "  docker compose up -d"
+echo "Next steps:"
+echo "1. Review config.yaml"
+echo "2. Run: docker compose up -d"