diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b222d347..44ded5095 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Revision history for cardano-db-sync
 
+- Fixes an issue where stopping the docker container results in non graceful shutdown
+
 ## 13.6.0.4
 - Fixes an issue from ledger where DRep delegations could be removed under some conditions
 - Fix an issue with migration from 13.5.x when consumed_tx_out config is enabled
diff --git a/nix/docker.nix b/nix/docker.nix
index fe20d79a9..f9aa78d55 100644
--- a/nix/docker.nix
+++ b/nix/docker.nix
@@ -24,7 +24,10 @@ let
 
   baseImage = dockerTools.buildImage {
     name = "cardano-db-sync-base-env";
-    config.Env = [ "NIX_SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt" ];
+    config = {
+      Env = [ "NIX_SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt" ];
+      StopSignal = "SIGINT";
+    };
 
     copyToRoot = buildEnv {
       name = "base-image-env";
@@ -93,7 +96,7 @@ let
         db-sync = pkgs.writeScriptBin "cardano-db-sync-${service.cluster}" ''
           #!${runtimeShell}
           set -euo pipefail
-          ${service.script} $@
+          exec ${service.script} $@
         '' // {
           passthru = { inherit service; };
         };