diff --git a/ci.sh b/ci.sh
index 516deaf2e..6604548c6 100755
--- a/ci.sh
+++ b/ci.sh
@@ -4,9 +4,9 @@ echo "**************************************************************************
 echo "*                                  ruby 1.8.7-p249 build                                        *" &&
 echo "*************************************************************************************************" &&
 echo "" &&
-rm Gemfile.lock &&
+rm -f Gemfile.lock &&
 source /usr/local/rvm/scripts/rvm &&
-rvm use ruby-1.8.7-p249 &&
+rvm use ruby-1.8.7-p249@diaspora &&
 bundle install &&
 bundle exec rake cruise &&
 echo "" &&
@@ -14,8 +14,8 @@ echo "**************************************************************************
 echo "*                                   ruby 1.9.2-p0 build                                         *" &&
 echo "*************************************************************************************************" &&
 echo "" &&
-rm Gemfile.lock &&
+rm -f Gemfile.lock &&
 source /usr/local/rvm/scripts/rvm &&
-rvm use ruby-1.9.2-p0 &&
+rvm use ruby-1.9.2-p0@diaspora &&
 bundle install &&
 bundle exec rake cruise
diff --git a/cruise_config.rb b/cruise_config.rb
index b6a53d3cb..a5efcd3d7 100644
--- a/cruise_config.rb
+++ b/cruise_config.rb
@@ -1,5 +1,5 @@
 require 'fileutils'
 
 Project.configure do |project|
-  project.build_command = 'ci.sh'
+  project.build_command = './ci.sh'
 end