diff --git a/README.md b/README.md
index 916f812d6a..2181ca6ba7 100644
--- a/README.md
+++ b/README.md
@@ -119,9 +119,9 @@ For most cases, you'll need AngularJS as well.  This is bundled in `js/angular/`
 - Almost all of the logic for releasing Ionic is done on the Travis server
 - To push a new release:
   1. Update package.json version to new version
-  2. Update package.json codename to new codename
-  3. Generate changelog with `gulp changelog` and make sure it is OK
-  4. Commit these and push to master
+  2. Generate changelog with `gulp changelog` 
+  3. Go through the changelog, and fix any mistakes or clarify any unclear commit messages
+  4. Commit package.json and CHANGELOG.md and push to master
 - Travis will detect that this commit changed the version in package.json and push out all necessary for this new release (tags, release files, site config, ...)
 
 ## LICENSE
diff --git a/config/CODENAMES b/config/CODENAMES
new file mode 100644
index 0000000000..6826eb55d4
--- /dev/null
+++ b/config/CODENAMES
@@ -0,0 +1,4 @@
+antimony-antelope
+argon-argolis
+arsenic-angelfish
+astatine-ant
diff --git a/scripts/travis/ci.sh b/scripts/travis/ci.sh
index 509a802a10..d364a5910b 100755
--- a/scripts/travis/ci.sh
+++ b/scripts/travis/ci.sh
@@ -49,7 +49,6 @@ function run {
   mkdir -p tmp
   git show $TRAVIS_COMMIT~1:package.json > tmp/package.old.json
   OLD_VERSION=$(readJsonProp "tmp/package.old.json" "version")
-  OLD_CODENAME=$(readJsonProp "tmp/package.old.json" "codename")
   VERSION=$(readJsonProp "package.json" "version")
   CODENAME=$(readJsonProp "package.json" "codename")
 
diff --git a/scripts/travis/release-new-version.sh b/scripts/travis/release-new-version.sh
index 444729fb00..b91df82de5 100755
--- a/scripts/travis/release-new-version.sh
+++ b/scripts/travis/release-new-version.sh
@@ -5,7 +5,6 @@ echo "# Pushing release to $RELEASE_REMOTE #"
 echo "##############################"
 
 ARG_DEFS=(
-  "--codename=(.*)"
   "--version=(.*)"
 )
 
@@ -29,11 +28,16 @@ function run {
 
   cd $IONIC_DIR
 
-  CODENAME=$(readJsonProp "package.json" "codename")
+  # Get first codename in list
+  CODENAME=$(cat config/CODENAMES | head -n 1)
+
+  # Remove first line of codenames, it's used now
+  sed -i '' 1d config/CODENAMES
 
   replaceJsonProp "bower.json" "version" "$VERSION"
   replaceJsonProp "component.json" "version" "$VERSION"
 
+  replaceJsonProp "package.json" "codename" "$CODENAME"
   replaceJsonProp "bower.json" "codename" "$CODENAME"
   replaceJsonProp "component.json" "codename" "$CODENAME"