diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 0.3.8 - 2025-07-18
+
+### Fixed
+
+- Interrupt signal handling is now more robust
+
 ## 0.3.7 - 2024-02-12
 
 ### Fixed
diff --git a/hercules-ci-cli.cabal b/hercules-ci-cli.cabal
--- a/hercules-ci-cli.cabal
+++ b/hercules-ci-cli.cabal
@@ -1,7 +1,7 @@
 cabal-version: 1.12
 
 name:           hercules-ci-cli
-version:        0.3.7
+version:        0.3.8
 synopsis:       The hci command for working with Hercules CI
 homepage:       https://docs.hercules-ci.com
 bug-reports:    https://github.com/hercules-ci/hercules-ci-agent/issues
diff --git a/src/Hercules/CLI/Client.hs b/src/Hercules/CLI/Client.hs
--- a/src/Hercules/CLI/Client.hs
+++ b/src/Hercules/CLI/Client.hs
@@ -41,7 +41,7 @@
 import Hercules.API.Accounts (AccountsAPI)
 import Hercules.API.Projects (ProjectsAPI)
 import Hercules.API.Repos (ReposAPI)
-import Hercules.API.State (ContentDisposition, ContentLength, RawBytes, StateAPI)
+import Hercules.API.State (StateAPI)
 import Hercules.Error
 import qualified Network.HTTP.Client as HTTP
 import qualified Network.HTTP.Client.TLS
diff --git a/src/Hercules/CLI/Main.hs b/src/Hercules/CLI/Main.hs
--- a/src/Hercules/CLI/Main.hs
+++ b/src/Hercules/CLI/Main.hs
@@ -16,7 +16,6 @@
 import qualified Hercules.CLI.State as State
 import qualified Hercules.CNix
 import qualified Hercules.CNix.Exception
-import qualified Hercules.CNix.Util
 import Hercules.CNix.Verbosity (setShowTrace)
 import qualified Language.C.Inline.Cpp.Exception as C
 import qualified Options.Applicative as Optparse
@@ -39,7 +38,6 @@
 initNix :: IO ()
 initNix = do
   Hercules.CNix.init
-  Hercules.CNix.Util.installDefaultSigINTHandler
 
 addNix :: (Functor f) => f (IO a) -> f (IO a)
 addNix = fmap (initNix *>)