diff --git a/bsc/apps/nbody/default.nix b/bsc/apps/nbody/default.nix
new file mode 100644
index 0000000..4c8130d
--- /dev/null
+++ b/bsc/apps/nbody/default.nix
@@ -0,0 +1,29 @@
+{
+  stdenv
+, nanos6
+, mpi
+, tampi
+}:
+
+stdenv.mkDerivation rec {
+  name = "nbody";
+
+  src = builtins.fetchGit {
+    url = "ssh://git@bscpm02.bsc.es/benchmarks/ompss-2/nbody-conflict-kevin.git";
+    #rev = "a8372abf9fc7cbc2db0778de80512ad4af244c29";
+    ref = "master";
+  };
+
+  dontStrip = true;
+
+  buildInputs = [
+    nanos6
+    mpi
+    tampi
+  ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp nbody_* $out/bin/
+  '';
+}
diff --git a/default.nix b/default.nix
index d7a4aab..3b6bbc1 100644
--- a/default.nix
+++ b/default.nix
@@ -73,6 +73,13 @@ let
       inherit mpi tampi;
     };
 
+    # Apps for Garlic
+    nbody = callPackage ./bsc/apps/nbody/default.nix {
+      stdenv = pkgs.gcc9Stdenv;
+      inherit mpi tampi;
+      nanos6 = nanos6-git;
+    };
+
     # Patched nix for deep cluster
     inherit (callPackage ./bsc/nix/default.nix {
         storeDir = "/nix/store";