diff --git a/arion-compose.nix b/arion-compose.nix
index 70930ef..b565f46 100644
--- a/arion-compose.nix
+++ b/arion-compose.nix
@@ -1,9 +1,7 @@
 { pkgs, ... }:
 let
-  nft-marketplace-server =
-    (pkgs.callPackage (import nft-marketplace-server/release.nix)
-      { }).nft-marketplace-server;
-  ogmios-datum-cache = (import ogmios-datum-cache/default.nix).packages.x86_64-linux.ogmios-datum-cache;
+  nft-marketplace-server = (import nft-marketplace-server/default.nix).packages.x86_64-linux."nft-marketplace-server:exe:nft-marketplace-server";
+  ogmios-datum-cache = (import ogmios-datum-cache/default.nix).packages.x86_64-linux."ogmios-datum-cache";
   # FIXME: CTL version also pinned in seabug-contract. We need only one source of truth
   cardano-transaction-lib-server = (import
     cardano-transaction-lib/default.nix).packages.x86_64-linux."ctl-server:exe:ctl-server";
diff --git a/flake.lock b/flake.lock
index cccca8e..d15cfa9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -293,17 +293,17 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1651091005,
-        "narHash": "sha256-duSHhhqQjJ9YKBaC0FGpVM2+735cl8v1/6KOXVvOYeY=",
-        "owner": "t4ccer",
+        "lastModified": 1652893939,
+        "narHash": "sha256-hBZHQzkAYImw7Kr4BZmsLJFUeTzU7nR4v7irmRUqyBo=",
+        "owner": "hercules-ci",
         "repo": "arion",
-        "rev": "69b9109dea2b4d48f35c614456463bd0234e2e80",
+        "rev": "bd3e2fe4e372d0b5f965f25f27c5eb7c1a618c4a",
         "type": "github"
       },
       "original": {
-        "owner": "t4ccer",
+        "owner": "hercules-ci",
         "repo": "arion",
-        "rev": "69b9109dea2b4d48f35c614456463bd0234e2e80",
+        "rev": "bd3e2fe4e372d0b5f965f25f27c5eb7c1a618c4a",
         "type": "github"
       }
     },
diff --git a/flake.nix b/flake.nix
index c50eb19..12b7ac5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,7 +6,7 @@
     flake-utils = { url = "github:numtide/flake-utils"; };
     # https://github.com/hercules-ci/arion/pull/153
     arion = {
-      url = "github:t4ccer/arion/69b9109dea2b4d48f35c614456463bd0234e2e80";
+      url = "github:hercules-ci/arion/bd3e2fe4e372d0b5f965f25f27c5eb7c1a618c4a";
     };
   };
   outputs = { self, nixpkgs, cardano-node, flake-utils, arion }:
diff --git a/nft-marketplace-server b/nft-marketplace-server
index c512366..7169b63 160000
--- a/nft-marketplace-server
+++ b/nft-marketplace-server
@@ -1 +1 @@
-Subproject commit c5123661a2b220b2454f558a6ea59043dde692be
+Subproject commit 7169b63c80982b1730fef8a8b82b2108772fa3fa