diff --git a/arion-compose.nix b/arion-compose.nix
index d170f5d..4b1b5f7 100644
--- a/arion-compose.nix
+++ b/arion-compose.nix
@@ -61,7 +61,7 @@ in
       volumes = [
         "${toString ./.}/data/cardano-node/ipc:/ipc"
       ];
-      restart = "always";
+      restart = "on-failure";
     };
 
     ogmios.service = {
@@ -80,7 +80,7 @@ in
         "${toString ./.}/data/cardano-node/ipc:/ipc"
         "${cardano-configurations}/network/${network.name}:/config"
       ];
-      restart = "always";
+      restart = "on-failure";
     };
 
     ogmios-datum-cache.service = {
@@ -107,7 +107,7 @@ in
       };
       ports = [ "9999:9999" ];
       useHostStore = true;
-      restart = "always";
+      restart = "on-failure";
     };
 
     cardano-node.service = {
@@ -139,7 +139,7 @@ in
         start_period = "15m";
         retries = 3;
       };
-      restart = "always";
+      restart = "on-failure";
     };
 
     postgresql-db.service = {
@@ -159,7 +159,7 @@ in
       };
       volumes =
         [ "${toString ./.}/data/postgres-data:/var/lib/postgresql/data" ];
-      restart = "always";
+      restart = "on-failure";
     };
 
     nft-marketplace-server.service = {
@@ -189,7 +189,7 @@ in
         retries = 3;
       };
       useHostStore = true;
-      restart = "always";
+      restart = "on-failure";
       volumes = [ "${toString ./.}/config/tmp:/tmp" ];
     };
 
diff --git a/nft-marketplace b/nft-marketplace
index e203e38..d84fc7a 160000
--- a/nft-marketplace
+++ b/nft-marketplace
@@ -1 +1 @@
-Subproject commit e203e38175642f445b42a2733e88da1c613db725
+Subproject commit d84fc7afee71eb77344fa6da678cab0aa9e7a164
diff --git a/seabug-contracts b/seabug-contracts
index d1f7969..f8f4b65 160000
--- a/seabug-contracts
+++ b/seabug-contracts
@@ -1 +1 @@
-Subproject commit d1f796956acf6c8a32a93f5d8dd20ee073be3b58
+Subproject commit f8f4b651d8adc5776ed48cbe990f7ab0377d6d43