diff --git a/derivation.nix b/derivation.nix
index 2e603b7..e46e097 100644
--- a/derivation.nix
+++ b/derivation.nix
@@ -19,22 +19,22 @@ let
   };
 in
 {
-  pkgs.writeShellApplication {
-  name = "ddix-ixp-deploy";
+  ddix-ixp-deploy = pkgs.writeShellApplication {
+    name = "ddix-ixp-deploy";
 
-  runtimeInputs = with pkgs; [
-    arouteserver
-    bgpq4
-    openssh
-  ];
+    runtimeInputs = with pkgs; [
+      arouteserver
+      bgpq4
+      openssh
+    ];
 
-  text = ''
-    export PYTHONPATH="${python3}/${python3.sitePackages}"
-    cd ${ddix-ansible-ixp}/plays
-    exec ${pkgs.util-linux}/bin/flock /tmp/ddix-ansible-ixp.lock -c "${pkgs.ansible}/bin/ansible-playbook deploy.yml ''$*" 
-  '';
+    text = ''
+      export PYTHONPATH="${python3}/${python3.sitePackages}"
+      cd ${ddix-ansible-ixp}/plays
+      exec ${pkgs.util-linux}/bin/flock /tmp/ddix-ansible-ixp.lock -c "${pkgs.ansible}/bin/ansible-playbook deploy.yml ''$*" 
+    '';
   };
-  pkgs.writeShellApplication {
+  ddix-ixp-commit = pkgs.writeShellApplication {
     name = "ddix-ixp-commit";
 
     runtimeInputs = with pkgs; [
diff --git a/flake.nix b/flake.nix
index 8bd1f7d..57d0713 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,21 +13,20 @@
     flake-utils.lib.eachDefaultSystem
       (system:
         let
-          pkgs = (import nixpkgs) {
-            inherit system;
+          pkgs = (import nixpkgs) { inherit system; };
+          derivation = pkgs.callPackage ./derivation.nix {
+            arouteserver = arouteserver.packages."${system}".arouteserver;
           };
         in
         {
-          packages = rec {
-            ddix-ansible-ixp = pkgs.callPackage ./derivation.nix {
-              arouteserver = arouteserver.packages."${system}".arouteserver;
-            };
-            default = ddix-ansible-ixp;
+          packages = {
+            inherit (derivation) ddix-ixp-deploy ddix-ixp-commit;
           };
         }
       ) // {
       overlays.default = _: prev: {
-        ddix-ansible-ixp = self.packages."${prev.system}".default;
+        ddix-ixp-deploy = self.packages."${prev.system}".ddix-ixp-deploy;
+        ddix-ixp-commit = self.packages."${prev.system}".ddix-ixp-commit;
       };
     };
 }