diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,10 @@
 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.6.1 - 2024-01-23
+
+Maintenance release.
+
 ## 0.3.6 - 2023-03-07
 
 ### 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.6
+version:        0.3.6.1
 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
@@ -105,7 +105,7 @@
     , hercules-ci-cli
   default-language: Haskell2010
 
-test-suite hercules-ci-cli-test
+test-suite hercules-ci-cli-unit-tests
   type: exitcode-stdio-1.0
   main-is: Main.hs
   other-modules:
diff --git a/src/Hercules/CLI/Options.hs b/src/Hercules/CLI/Options.hs
--- a/src/Hercules/CLI/Options.hs
+++ b/src/Hercules/CLI/Options.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE BlockArguments #-}
+{-# LANGUAGE CPP #-}
 
 module Hercules.CLI.Options where
 
@@ -6,6 +7,9 @@
 import qualified Data.Text as T
 import Options.Applicative hiding (helper)
 import qualified Options.Applicative as Optparse
+#if MIN_VERSION_hercules_ci_optparse_applicative(0, 18, 0)
+import Options.Applicative.Extra as Optparse hiding (helper)
+#endif
 import Protolude
 
 -- | Custom execParser that provides help text when input is incomplete.