diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index d46768de..96f8ce84 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -7,8 +7,7 @@ ARCH="amd64"
 
 SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
 
-SETS="multilib nomultilib hardened_multilib hardened_nomultilib"
-#SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib"
+SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib"
 
 SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec"
 SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
@@ -59,24 +58,20 @@ pre_build() {
 post_build() {
 	pushd ${BUILD_SRCDIR_BASE}/default
 	if [ -f stage3-amd64-${DATESTAMP}.tar.bz2 -o -f stage3-amd64-nomultilib-${DATESTAMP}.tar.bz2 ]; then
-#		mkdir ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
-#		cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
-		cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/
+		mkdir ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+		cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
 		if [ -f *${DATESTAMP}*.iso ]; then
-#			cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
-			cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/
+			cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
 		fi
 	fi
 	popd
 
 	pushd ${BUILD_SRCDIR_BASE}/hardened
 	if [ -f stage3-amd64-hardened-${DATESTAMP}.tar.bz2 -o -f stage3-amd64-hardened+nomultilib-${DATESTAMP}.tar.bz2 ]; then
-#		mkdir ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
-#		cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
-		cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/
+		mkdir ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+		cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
 		if [ -f *${DATESTAMP}*.iso ]; then
-#			cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
-			cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/
+			cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
 		fi
 	fi
 }
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 18364bed..4ab50382 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -57,24 +57,20 @@ pre_build() {
 post_build() {
 	pushd ${BUILD_SRCDIR_BASE}/default
 	if [ -f stage3-i486-*${DATESTAMP}*.bz2 -o -f stage3-i686-*${DATESTAMP}*.bz2 ]; then
-#		mkdir ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
-#		cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
-		cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/
+		mkdir ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+		cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
 		if [ -f *${DATESTAMP}*.iso* ]; then
-#			cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
-			cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/
+			cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
 		fi
 	fi
 	popd
 
 	pushd ${BUILD_SRCDIR_BASE}/hardened
 	if [ -f stage3-i686-*${DATESTAMP}*.bz2 ]; then
-#		mkdir ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
-#		cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
-		cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/
+		mkdir ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+		cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
 		if [ -f *${DATESTAMP}*.iso ]; then
-#			cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
-			cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/
+			cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
 		fi
 	fi
 }