diff --git a/tools-hardened/run-systemd.sh b/tools-hardened/run-systemd.sh
old mode 100644
new mode 100755
index 94c57d17..1160d429
--- a/tools-hardened/run-systemd.sh
+++ b/tools-hardened/run-systemd.sh
@@ -13,11 +13,12 @@ prepare_confs() {
     local pstage=stage${p}
 
     local parch="${arch}"
-      [[ "${arch}" == "i686" ]] && parch="x86"
+    [[ "${arch}" == "i686" ]] && parch="x86"
 
     cat stage-all.conf.template | \
       sed -e "s:\(^version_stamp.*$\):\1-${mydate}:" \
-        -e "s:STAGE:${cstage}:g" \
+        -e "s:CSTAGE:${cstage}:g" \
+        -e "s:PSTAGE:${pstage}:g" \
         -e "s:SARCH:${arch}:g" \
         -e "s:PARCH:${parch}:g" \
         >  stage${s}-${arch}-systemd.conf
diff --git a/tools-hardened/stage-all.conf.template b/tools-hardened/stage-all.conf.template
index 942ddc75..5e4cb39f 100644
--- a/tools-hardened/stage-all.conf.template
+++ b/tools-hardened/stage-all.conf.template
@@ -1,7 +1,7 @@
 subarch: SARCH
-target: STAGE
+target: CSTAGE
 version_stamp: systemd
 rel_type: systemd/SARCH
 profile: default/linux/PARCH/13.0/systemd
 snapshot: current
-source_subpath: systemd/SARCH/STAGE-SARCH-systemd
+source_subpath: systemd/SARCH/PSTAGE-SARCH-systemd