diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 5df82a3a..3c2ed6f9 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -1,7 +1,11 @@
 # This is the config file for the catalyst-auto script. It should be pretty
 # self-explanatory.
 
-SPECS_DIR=/release/svn-releng/trunk/releases/weekly/specs/amd64
+BASE_DIR="/release"
+SVN_DIR="${BASE_DIR}/svn-releng"
+ARCH="amd64"
+
+SPECS_DIR=${SVN_DIR}/trunk/releases/weekly/specs/${ARCH}
 
 SETS="multilib hardened_multilib hardened_nomultilib"
 
@@ -12,16 +16,16 @@ SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/
 
 SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec"
 
-KCONFIG_DIR=/release/svn-releng/trunk/releases/weekly/kconfig/amd64
+KCONFIG_DIR=${SVN_DIR}/trunk/releases/weekly/kconfig/${ARCH}
 
 EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
 EMAIL_FROM=catalyst@poseidon.amd64.dev.gentoo.org
-EMAIL_SUBJECT_PREPEND="[amd64-auto]"
+EMAIL_SUBJECT_PREPEND="[${ARCH}-auto]"
 
-CATALYST_CONFIG=/etc/catalyst/amd64-auto.conf
+CATALYST_CONFIG=/etc/catalyst/${ARCH}-auto.conf
 
-BUILD_SRCDIR_BASE=/release/buildroot/amd64-dev/builds/
-BUILD_DESTDIR_BASE=/home/buildsync/builds/amd64/
+BUILD_SRCDIR_BASE=${BASE_DIR}/buildroot/${ARCH}-dev/builds/
+BUILD_DESTDIR_BASE=/home/buildsync/builds/${ARCH}/
 
 give_latest_from_dates() {
   sed 's,-20,~20,g' | \
@@ -34,7 +38,7 @@ give_latest_from_dates() {
 }
 
 pre_build() {
-  svn up /release/svn-releng/
+  svn up ${SVN_DIR}
   # Symlink the latest stages3 to build from
   for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
     cd $d
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 4c791ed3..5166e3ec 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -1,7 +1,11 @@
 # This is the config file for the catalyst-auto script. It should be pretty
 # self-explanatory.
 
-SPECS_DIR=/release/svn-releng/trunk/releases/weekly/specs/x86
+BASE_DIR="/release"
+SVN_DIR="${BASE_DIR}/svn-releng"
+ARCH="x86"
+
+SPECS_DIR=${SVN_DIR}/trunk/releases/weekly/specs/${ARCH}
 
 SETS="i486 i686 hardened"
 
@@ -12,16 +16,16 @@ SET_i686_SPECS="i686/stage1.spec i686/stage2.spec i686/stage3.spec"
 
 SET_hardened_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
 
-KCONFIG_DIR=/release/svn-releng/trunk/releases/weekly/kconfig/x86
+KCONFIG_DIR=${SVN_DIR}/trunk/releases/weekly/kconfig/${ARCH}
 
 EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
 EMAIL_FROM=catalyst@poseidon.amd64.dev.gentoo.org
-EMAIL_SUBJECT_PREPEND="[x86-auto]"
+EMAIL_SUBJECT_PREPEND="[${ARCH}-auto]"
 
-CATALYST_CONFIG=/etc/catalyst/x86-auto.conf
+CATALYST_CONFIG=/etc/catalyst/${ARCH}-auto.conf
 
-BUILD_SRCDIR_BASE=/release/buildroot/x86-dev/builds/
-BUILD_DESTDIR_BASE=/home/buildsync/builds/x86/
+BUILD_SRCDIR_BASE=${BASE_DIR}/buildroot/${ARCH}-dev/builds/
+BUILD_DESTDIR_BASE=/home/buildsync/builds/${ARCH}/
 
 give_latest_from_dates() {
   sed 's,-20,~20,g' | \
@@ -34,7 +38,7 @@ give_latest_from_dates() {
 }
 
 pre_build() {
-  svn up /release/svn-releng/
+  svn up ${SVN_DIR}
   # Symlink the latest stages3 to build from
   for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
     cd $d
@@ -57,4 +61,5 @@ post_build() {
     cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/
   fi
 }
+
 # vim:ft=sh: