diff --git a/flake.nix b/flake.nix
index f787686..dff4ad4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -121,6 +121,8 @@
               };
             };
         in {
+          setup-script = setupScript "# extra_setup";
+          finalize-script = finalizeScript "true # push_command";
           image = mkImage [
             (setupScript ''
               echo "No caching configured, to enable caching use the respective container image tag"
diff --git a/flakeModule.nix b/flakeModule.nix
index 4145a21..57b300f 100644
--- a/flakeModule.nix
+++ b/flakeModule.nix
@@ -162,11 +162,10 @@
               (prependToBeforeScript [
                   "source setup_nix_ci ${key}"
                 ]
-                job)
-              // (prependToAfterScript [
-                  "finalize_nix_ci"
-                ]
-                job)
+                (prependToAfterScript [
+                    "finalize_nix_ci"
+                  ]
+                  job))
               // lib.optionalAttrs job.nix {
                 image = job.image;
               }