diff --git a/.forgejo/workflows/runner-image.yml b/.forgejo/workflows/runner-image.yml
deleted file mode 100644
index 19ba8ae..0000000
--- a/.forgejo/workflows/runner-image.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-name: Test action
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
-
-env:
-  registry: git.amarth.cloud
-  owner: chris
-  image: default
-  tag: latest
-
-jobs:
-  hello:
-    name: Print hello world
-    runs-on: default
-    steps:
-      - name: Checkout
-        run: |
-          git clone ${{ forge.server_url }}/${{ forge.repository }}.git .
-
-      - name: Prepare podman
-        run: |
-          # configure container policy to accept insecure registry
-          nix-env -iA nixpkgs.podman nixpkgs.kvmtool
-
-          # configure container policy to accept insecure registry
-          mkdir -p ~/.config/containers
-          echo '{ "default": [ {"type":"insecureAcceptAnything"} ] }' > ~/.config/containers/policy.json
-
-      - name: Log into registry
-        run: |
-          podman login --username "${{ forge.actor }}" --password "${{ forge.token }}" ${{ env.registry }}
-
-      - name: Create image
-        run: |
-          nix-build runners/default.nix
-          podman load < result
-
-      - name: Push image
-        run: >-
-          podman push
-          --creds="${{ forge.actor }}:${{ forge.token }}"
-          localhost/default:latest
-          ${{ env.registry }}/${{ env.owner }}/${{ env.image }}:${{ env.tag }}
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 87a3018..3cb44c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,8 @@
+# ---> Nix
+# Ignore build outputs from performing a nix-build or `nix build` command
 result
-*.qcow2
+result-*
+
+# Ignore automatically generated direnv output
+.direnv
+
diff --git a/modules/nixos/services/development/forgejo/default.nix b/modules/nixos/services/development/forgejo/default.nix
index f143b12..46e0995 100644
--- a/modules/nixos/services/development/forgejo/default.nix
+++ b/modules/nixos/services/development/forgejo/default.nix
@@ -142,6 +142,7 @@ in
           labels = [
             "default:docker://nixos/nix:latest"
             "ubuntu:docker://ubuntu:24-bookworm"
+            "nix:docker://git.amarth.cloud/amarth/runners/default:latest"
           ];
           settings = {
             log.level = "info";
diff --git a/modules/nixos/services/development/forgejo/temp b/modules/nixos/services/development/forgejo/temp
deleted file mode 100644
index 33a7313..0000000
--- a/modules/nixos/services/development/forgejo/temp
+++ /dev/null
@@ -1,80 +0,0 @@
-Error: mounting new container: 
-    mounting build container "a1c1da9d2422b5d6571a79559039f60ba8771e4a05b9b2f8cae814a8f64bb8e3": 
-        creating overlay mount to /var/lib/containers/storage/overlay/4f2debd33eeab2b4e01fb9e5df7c7057041d57cee97634d14b9ccf512e34ec7c/merged, 
-        mount_data="
-            lowerdir=/var/lib/containers/storage/overlay/l/XSOABRIRTTFZPQI37OU77T3XP6
-                :/var/lib/containers/storage/overlay/l/F3M2D6K25OPTUC4ID73P2NIJ3A
-                :/var/lib/containers/storage/overlay/l/Q53OUMURARX52AYNVQGFGNVUMQ
-                :/var/lib/containers/storage/overlay/l/NHNXRY3S7TPPYSGNG6BFA7756K
-                :/var/lib/containers/storage/overlay/l/XWANZP5SNP5QFXQ7RPR2SN3GND
-                :/var/lib/containers/storage/overlay/l/QUS3NWAGIVW5KOT7EBHCH2THSP
-                :/var/lib/containers/storage/overlay/l/P24JFYKBFJWRZF4QCI65JNYDSH
-                :/var/lib/containers/storage/overlay/l/5U53LA6AULMQOF5JAVLNDQMETC
-                :/var/lib/containers/storage/overlay/l/SWCKHLKQYKOUWBHWGJ5VPBJ7RH
-                :/var/lib/containers/storage/overlay/l/KLPPEZB6CRL3I6R6LBCJWMKWPC
-                :/var/lib/containers/storage/overlay/l/RAI54LOZXCFNWNF54D5YLSZJZO
-                :/var/lib/containers/storage/overlay/l/NLXXIPBMH7EAMNSOZBGBYXWGV5
-                :/var/lib/containers/storage/overlay/l/HP5E2J4HRMO6XYJANMEB4KT7F5
-                :/var/lib/containers/storage/overlay/l/JZ3QIR7Y7HTWYCCZRNFZCMQSHH
-                :/var/lib/containers/storage/overlay/l/IYGILU3HMTXZLIKNELEPBOZXWS
-                :/var/lib/containers/storage/overlay/l/K52NCFVUIEMQALGI4CTKSORFQ6
-                :/var/lib/containers/storage/overlay/l/DM5R63KXPSUHMGXMXGHV2Z7L6O
-                :/var/lib/containers/storage/overlay/l/3BJ5A4CHITM36J3WL7DUJN7HI5
-                :/var/lib/containers/storage/overlay/l/3KY56KPCGUTAOCABRQOPB5E7KI
-                :/var/lib/containers/storage/overlay/l/4ISDZ7Y23WWZAZ6TISWAVXAKTA
-                :/var/lib/containers/storage/overlay/l/7WFY6347EYETD2DSHOWWGORMY7
-                :/var/lib/containers/storage/overlay/l/RBDQUQQAQ4M3DNDP7JQDSTFPDC
-                :/var/lib/containers/storage/overlay/l/CZPS35AEHSSOCX2SETGG5RWAWK
-                :/var/lib/containers/storage/overlay/l/VTV4IYIPIMV7HUVW3YUCEZGVIF
-                :/var/lib/containers/storage/overlay/l/LOGNN4O7UYRJDINC3EU6MCK2JQ
-                :/var/lib/containers/storage/overlay/l/XCTPWOKP4A3NITB5YJEGDOYP53
-                :/var/lib/containers/storage/overlay/l/57WPQF43V53AQIH5AJAFS2ZJLN
-                :/var/lib/containers/storage/overlay/l/BURD55A3XF6AHWWN5NFYVKHLFR
-                :/var/lib/containers/storage/overlay/l/SJBWDEB4R6KHHUWYVWHVFXZUML
-                :/var/lib/containers/storage/overlay/l/EFH5DWZ6VD7XHRBJI3MSGCSL5C
-                :/var/lib/containers/storage/overlay/l/LNJD656RHN73JQIOG5QP72XH6D
-                :/var/lib/containers/storage/overlay/l/BYKGR5QA32CNM3PNW7OJZGL7PI
-                :/var/lib/containers/storage/overlay/l/KEBZ34OPOPZSF56MMUIYJC62VQ
-                :/var/lib/containers/storage/overlay/l/AXUJ2DTXCFUNLLHVBNZT7HOOHV
-                :/var/lib/containers/storage/overlay/l/W2GQPDXQWNE4PJ2FK242CNBP3G
-                :/var/lib/containers/storage/overlay/l/HSHTMFX2BNZ6MN3YKZNP5GACK3
-                :/var/lib/containers/storage/overlay/l/5EV6E33HXQTMDYA55D2KVDQN6O
-                :/var/lib/containers/storage/overlay/l/5YXUGLZ3U5V2GABHAGMOQQLZYD
-                :/var/lib/containers/storage/overlay/l/WNM6BFUABXRYMF3QXGOWIMSFGS
-                :/var/lib/containers/storage/overlay/l/EM6L4BR3WMU427KN3WHNXLPXLK
-                :/var/lib/containers/storage/overlay/l/WKG62FRJYJHG4PIYLUWPOIGIFR
-                :/var/lib/containers/storage/overlay/l/EIT5DRSEKJFGSXHNDISGIBHEET
-                :/var/lib/containers/storage/overlay/l/PW2HEYGQKHNXSSQFCTQ3RTW3RU
-                :/var/lib/containers/storage/overlay/l/LYCJF4GBFFSP5MCC6TGBDGWXLY
-                :/var/lib/containers/storage/overlay/l/3YXKKFLTDRPWC6Y3VW3A5HCHPC
-                :/var/lib/containers/storage/overlay/l/RJTCZEVFZ4GZ4WT36ZHWVQPHBE
-                :/var/lib/containers/storage/overlay/l/AT3GLGCW22SPL4FDEMUHM7SEC3
-                :/var/lib/containers/storage/overlay/l/VPT2VRWXG6F5UOROWNVZJUYIXS
-                :/var/lib/containers/storage/overlay/l/IHIXWAURUCUAYZEWBQU6N37UL5
-                :/var/lib/containers/storage/overlay/l/IGMNOUI3RRH3KFAOSHZUJJAYA6
-                :/var/lib/containers/storage/overlay/l/KQTWTENKAQ7WIMPQO5HY4SQKSL
-                :/var/lib/containers/storage/overlay/l/7GQIS3UWTUQESKJI6NQ5A63FMB
-                :/var/lib/containers/storage/overlay/l/MXGQVTYACLV4M7PRZRGGXNOLCY
-                :/var/lib/containers/storage/overlay/l/6T6MXUMJ74EIDYDFZJU6642WDR
-                :/var/lib/containers/storage/overlay/l/QG53GGUJAUZLLCRGHLDVNBIG5M
-                :/var/lib/containers/storage/overlay/l/CWKPW6SM2HIEROK4XOFGURSEYZ
-                :/var/lib/containers/storage/overlay/l/EFAHS5T2ZS5ZVCY4WGZ4WW45WC
-                :/var/lib/containers/storage/overlay/l/CRT42BUU43KSCBUDTOB55WVML2
-                :/var/lib/containers/storage/overlay/l/KA53IG4NUWMJM5GBFUKDSUP7WM
-                :/var/lib/containers/storage/overlay/l/DELTO3DZAGCCUKFOKYU5POUVO5
-                :/var/lib/containers/storage/overlay/l/KM7KLUMSMCIUGMOUZHCCJVNY3S
-                :/var/lib/containers/storage/overlay/l/IAXMV7ZFALQU4XFQFLLXXUKBX7
-                :/var/lib/containers/storage/overlay/l/6VVTPVXHDYPHOT42CWJXOL6SMB
-                :/var/lib/containers/storage/overlay/l/OHO5IA7AJ2EOGAFUPT3MPJMZSY
-                :/var/lib/containers/storage/overlay/l/Q3ZXKGFN6Q2APXQKRXMNE6YR4M
-                :/var/lib/containers/storage/overlay/l/FSGYM4J5NR6AY3LUWZ2WTBQG3N
-                :/var/lib/containers/storage/overlay/l/M44HLHAQGLWFYVTS4J55CDEDLY
-                :/var/lib/containers/storage/overlay/l/36CIGRUHNNFDCBWSEN3KXUQAZR
-                :/var/lib/containers/storage/overlay/l/5QE5JTSJB23BDSXCGYPXTTJUSS
-                :/var/lib/containers/storage/overlay/l/DREIPLSBGAK4XBL57M3NJAT5XA,
-            upperdir=/var/lib/containers/storage/overlay/4f2debd33eeab2b4e01fb9e5df7c7057041d57cee97634d14b9ccf512e34ec7c/diff,
-            workdir=/var/lib/containers/storage/overlay/4f2debd33eeab2b4e01fb9e5df7c7057041d57cee97634d14b9ccf512e34ec7c/work,
-            volatile": using mount program /nix/store/mr0jx11v1z2sfjlndisw7v3jrk57x7l3-fuse-overlayfs-1.14/bin/fuse-overlayfs: unknown argument ignored: lazytime
-
-fuse: device not found, try 'modprobe fuse' first
-fuse-overlayfs: cannot mount: No such file or directory
\ No newline at end of file
diff --git a/runners/default.nix b/runners/default.nix
deleted file mode 100644
index 9493d52..0000000
--- a/runners/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  pkgs ? import <nixpkgs> {},
-  pkgs_linux ? import <nixpkgs> { system = "x86_64-linux"; },
-}:
-
-with pkgs;
-dockerTools.buildImage {
-  name = "default";
-  tag = "latest";
-
-  copyToRoot = buildEnv {
-    name = "image-root";
-    pathsToLink = [ "/bin" ];
-    paths = with pkgs_linux; [
-      coreutils
-      u-root-cmds
-      bash
-      nix
-      nodejs
-      podman
-    ];
-  };
-
-  config = {
-    User = "runner";
-    Cmd = [ "${lib.getExe bashInteractive}" ];
-  };
-}
\ No newline at end of file