diff --git a/nightly.sh b/nightly.sh
index 3f6053a..9207d2f 100755
--- a/nightly.sh
+++ b/nightly.sh
@@ -5,22 +5,20 @@ export LC_ALL=C
 
 CONFIG="fedora.conf"
 TARGET_DIR="/mnt/koji/compose/rawhide"
-DEBUG_MODE="--debug-mode"
-DEBUG_MODE=""
 #OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR"
 NIGHTLY="--nightly"
-SKIP_PHASES="--skip-phase=productimg --skip-phase=createiso --skip-phase=buildinstall "
-SKIP_PHASES=" "
+SKIP_PHASES="--skip-phase=productimg"
 
 # uncomment and edit for resuming a failed compose
 #COMPOSE_ID="Fedora-23-20150530.n.0"
 
 
-CMD="pungi-koji $DEBUG_MODE --config=$CONFIG $OLD_COMPOSES_DIR $NIGHTLY"
+CMD="pungi-koji --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY $SKIP_PHASES"
+
 if [ -z "$COMPOSE_ID" ]; then
     CMD="$CMD --target-dir=$TARGET_DIR"
 else
-    CMD="$CMD --compose-dir=$TARGET_DIR/$COMPOSE_ID"
+    CMD="$CMD --debug-mode --compose-dir=$TARGET_DIR/$COMPOSE_ID"
 fi
 
-time $CMD "$SKIP_PHASES" "$@"
+time $CMD "$@"