diff --git a/hosts/chocolatebar/chocolatebar.nix b/hosts/chocolatebar/chocolatebar.nix
index eb6efd77..a61e4c9d 100644
--- a/hosts/chocolatebar/chocolatebar.nix
+++ b/hosts/chocolatebar/chocolatebar.nix
@@ -37,6 +37,7 @@ in
       owner = psCfg.user.name;
     };
     pub-solar.sway.vnc.enable = true;
+    pub-solar.ci-runner.enable = true;
 
     home-manager.users."${psCfg.user.name}".xdg.configFile = mkIf psCfg.sway.enable {
       "sway/config.d/10-autostart.conf".source = ./.config/sway/config.d/autostart.conf;
diff --git a/modules/ci-runner/default.nix b/modules/ci-runner/default.nix
index 1810e911..7d936c0e 100644
--- a/modules/ci-runner/default.nix
+++ b/modules/ci-runner/default.nix
@@ -6,17 +6,22 @@ let
 in
 {
   options.pub-solar.ci-runner = {
-    enable = mkEnableOption "Starts a :";
+    enable = mkEnableOption "Enables a systemd service that runs drone-ci-runner";
   };
 
   config = mkIf cfg.enable {
-    home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
-      home.packages = [
-        ps-signal-desktop
-        tdesktop
-        element-desktop
-        irssi
-      ];
+    systemd.user.services.ci-runner = {
+      enable = true;
+
+      description = "CI runner for the PubSolarOS repository that can run test VM instances with KVM.";
+
+      serviceConfig = {
+        Type = "oneshot";
+        RemainAfterExit = "yes";
+        Restart = "always";
+      };
+
+      script = ''${pkgs.drone-runner-exec}'';
     };
   };
 }
diff --git a/modules/docker/default.nix b/modules/docker/default.nix
index 92097680..668c4005 100644
--- a/modules/docker/default.nix
+++ b/modules/docker/default.nix
@@ -17,7 +17,6 @@ in
 
     environment.systemPackages = with pkgs; [
       docker-compose
-      docker-compose_2
     ];
   };
 }
diff --git a/overlays/overrides.nix b/overlays/overrides.nix
index a23cff0d..4a85b71f 100644
--- a/overlays/overrides.nix
+++ b/overlays/overrides.nix
@@ -5,7 +5,7 @@ channels: final: prev: {
   inherit (channels.latest)
     cachix
     docker
-    docker-compose_2
+    docker-compose
     dhall
     discord
     element-desktop