diff --git a/db/migrate/20210611101330_remove_waiting_time_from_runners.rb b/db/migrate/20210611101330_remove_waiting_time_from_runners.rb
new file mode 100644
index 00000000..5a81c62e
--- /dev/null
+++ b/db/migrate/20210611101330_remove_waiting_time_from_runners.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RemoveWaitingTimeFromRunners < ActiveRecord::Migration[6.1]
+  def change
+    remove_column :runners, :waiting_time
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index beefc5b1..2772b0ca 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2021_06_02_071834) do
+ActiveRecord::Schema.define(version: 2021_06_11_101330) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_trgm"
@@ -112,7 +112,7 @@ ActiveRecord::Schema.define(version: 2021_06_02_071834) do
     t.integer "file_type_id"
     t.integer "memory_limit"
     t.boolean "network_enabled"
-    t.integer "cpu_limit"
+    t.integer "cpu_limit", default: 20
   end
 
   create_table "exercise_collection_items", id: :serial, force: :cascade do |t|
@@ -345,7 +345,6 @@ ActiveRecord::Schema.define(version: 2021_06_02_071834) do
     t.bigint "execution_environment_id"
     t.string "user_type"
     t.bigint "user_id"
-    t.float "waiting_time"
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
     t.index ["execution_environment_id"], name: "index_runners_on_execution_environment_id"
diff --git a/spec/factories/runner.rb b/spec/factories/runner.rb
index 636a8055..28c6ffd9 100644
--- a/spec/factories/runner.rb
+++ b/spec/factories/runner.rb
@@ -3,9 +3,8 @@
 # This factory does not request the runner management as the id is already provided.
 FactoryBot.define do
   factory :runner do
-    sequence(:runner_id) {|n| "test-runner-id-#{n}" }
+    runner_id { SecureRandom.uuid }
     association :execution_environment, factory: :ruby
     association :user, factory: :external_user
-    waiting_time { 1.0 }
   end
 end