diff --git a/jenkins_scripts/branches/master/nightly_actual_build.sh b/jenkins_scripts/nightly_build/master_actual_build.sh
similarity index 100%
rename from jenkins_scripts/branches/master/nightly_actual_build.sh
rename to jenkins_scripts/nightly_build/master_actual_build.sh
diff --git a/jenkins_scripts/branches/master/nightly_post_build.sh b/jenkins_scripts/nightly_build/master_post_build.sh
similarity index 100%
rename from jenkins_scripts/branches/master/nightly_post_build.sh
rename to jenkins_scripts/nightly_build/master_post_build.sh
diff --git a/jenkins_scripts/branches/master/slave_actual_build.sh b/jenkins_scripts/nightly_build/slave_actual_build.sh
similarity index 87%
rename from jenkins_scripts/branches/master/slave_actual_build.sh
rename to jenkins_scripts/nightly_build/slave_actual_build.sh
index 238bbf9..02b684f 100644
--- a/jenkins_scripts/branches/master/slave_actual_build.sh
+++ b/jenkins_scripts/nightly_build/slave_actual_build.sh
@@ -9,7 +9,7 @@ export AWS_CREDENTIAL_PROFILES_FILE=$JENKINS_HOME/credentials
 export AWS_CREDENTIAL_PRIVATE_KEY_FILE=$JENKINS_HOME/dotcms-dev-test-deploy-2017-02-0x5513.pem
 
 
-cd "$WORKSPACE/repo/dotCMS"
+cd "$WORKSPACE/${GIT_BRANCH_NAME}/dotCMS"
 ./gradlew clean --no-daemon --refresh-dependencies
 
 
@@ -34,16 +34,16 @@ echo $AWS_RDS_INSTANCE_ID > aws-rds-instance-id.txt
 
 
 # Uncompress tests results
-cd "$WORKSPACE/repo/dotCMS/build"
+cd "$WORKSPACE/${GIT_BRANCH_NAME}/dotCMS/build"
 unzip build-aws-tests.zip
 
 # Print logs to console
-cat "$WORKSPACE/repo/dotCMS/build/tests/logs/dotcms.log"
+cat "$WORKSPACE/${GIT_BRANCH_NAME}/dotCMS/build/tests/logs/dotcms.log"
 
 # Saving tomcat logs into the build folder
 mkdir -p "$WORKSPACE/logs/${BUILD_NUMBER}"
-mv "$WORKSPACE/repo/dotCMS/build/tests/logs"/* "$WORKSPACE/logs/${BUILD_NUMBER}/"
-rm -r "$WORKSPACE/repo/dotCMS/build/tests/logs/"
+mv "$WORKSPACE/${GIT_BRANCH_NAME}/dotCMS/build/tests/logs"/* "$WORKSPACE/logs/${BUILD_NUMBER}/"
+rm -r "$WORKSPACE/${GIT_BRANCH_NAME}/dotCMS/build/tests/logs/"
 
 #Removes old logs folders, preserving the first 20 (most recent)
 cd "$WORKSPACE/logs/"
diff --git a/jenkins_scripts/branches/master/slave_post_build.sh b/jenkins_scripts/nightly_build/slave_post_build.sh
similarity index 94%
rename from jenkins_scripts/branches/master/slave_post_build.sh
rename to jenkins_scripts/nightly_build/slave_post_build.sh
index f6f898e..888adb6 100644
--- a/jenkins_scripts/branches/master/slave_post_build.sh
+++ b/jenkins_scripts/nightly_build/slave_post_build.sh
@@ -8,12 +8,12 @@ trap 'echo "[$USER@$(hostname) $PWD]\$ $BASH_COMMAND"' DEBUG
 export AWS_CREDENTIAL_PROFILES_FILE=$JENKINS_HOME/credentials
 export AWS_CREDENTIAL_PRIVATE_KEY_FILE=$JENKINS_HOME/dotcms-dev-test-deploy-2017-02-0x5513.pem
 
-export VERSION='master'
+export VERSION='${GIT_BRANCH_NAME}'
 export TIMESTAMP=$(date +"%Y%m%d%H%M%S")
 
 
 # Terminate and delete AWS instance
-cd "$WORKSPACE/repo/dotCMS"
+cd "$WORKSPACE/${GIT_BRANCH_NAME}/dotCMS"
 if [ -f aws-ec2-instance-id.txt ]; then
 	export AWS_EC2_INSTANCE_ID=$(cat aws-ec2-instance-id.txt)
     ./gradlew -b build-aws-tests.gradle terminateInstance -PinstanceId=$AWS_EC2_INSTANCE_ID -Pdatabase=$DOT_CMS_DATABASE_TYPE -Pbranch=${GIT_BRANCH#*/} -Pcommit=$GIT_COMMIT -PkeyFile=$AWS_CREDENTIAL_PRIVATE_KEY_FILE --no-daemon