diff --git a/data/core/feature_arguments.sh b/data/core/feature_arguments.sh
index 65b46233..b74f8b78 100755
--- a/data/core/feature_arguments.sh
+++ b/data/core/feature_arguments.sh
@@ -82,6 +82,7 @@ gcc_arguments=("gcc")
 geany_arguments=("geany")
 geogebra_arguments=("geogebra" "geogebra_classic_6" "geogebra_6")
 gh_arguments=("gh" "gh_cli")
+ghrunner_arguments=("gh_runner")
 ghostwriter_arguments=("ghostwriter")
 gimp_arguments=("gimp")
 git_arguments=("git")
diff --git a/data/core/feature_keynames.txt b/data/core/feature_keynames.txt
index 957f148c..0f0ba60e 100755
--- a/data/core/feature_keynames.txt
+++ b/data/core/feature_keynames.txt
@@ -80,6 +80,7 @@ gcc
 geany
 geogebra
 gh
+ghrunner
 ghostwriter
 gimp
 git
diff --git a/data/features/ghrunner/ghrunner.dat.sh b/data/features/ghrunner/ghrunner.dat.sh
new file mode 100755
index 00000000..7385973d
--- /dev/null
+++ b/data/features/ghrunner/ghrunner.dat.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+ghrunner_name="GitHub self-hosted runner"
+ghrunner_description="Program that configures a machine to run GitHub actions workflows"
+ghrunner_version="linux-x64-2.314.1"
+ghrunner_tags=("customServer")
+ghrunner_systemcategories=("Office" "Qt" "TextEditor" "WordProcessor")
+
+ghrunner_downloadKeys=("bundle")
+ghrunner_bundle_doNotInherit="yes"
+ghrunner_bundle_downloadPath="${BIN_FOLDER}/ghrunner/"
+ghrunner_bundle_URL="https://github.com/actions/runner/releases/download/v2.314.1/actions-runner-linux-x64-2.314.1.tar.gz"
+ghrunner_binariesinstalledpaths=("config.sh;gh-config" "run.sh;gh-run")
+ghrunner_bashfunctions=("ghrunner.sh")
diff --git a/data/features/ghrunner/ghrunner.md b/data/features/ghrunner/ghrunner.md
new file mode 100755
index 00000000..72423db9
--- /dev/null
+++ b/data/features/ghrunner/ghrunner.md
@@ -0,0 +1,3 @@
+Application to install a github self-hosted runner.
+
+Needs configuration after installation.
\ No newline at end of file
diff --git a/data/features/ghrunner/ghrunner.sh b/data/features/ghrunner/ghrunner.sh
new file mode 100644
index 00000000..7844a652
--- /dev/null
+++ b/data/features/ghrunner/ghrunner.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+gh-config()
+{
+  if [ $# != 4 ]; then
+    echo "ERROR: gh-config expects 4 arguments: --url GITHUB_REPO_URL --token SECRET_TOKEN"
+    exit 1
+  fi
+
+  gh-config "$@"
+}
+
+gh-run()
+{
+  nohup gh-run &>/dev/null &
+}