diff --git a/docker-compose.yml b/docker-compose.yml
index 344aa376e8..32c7e52a63 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -28,8 +28,7 @@ services:
     command: >
       bash -c "(bundle check || bundle install) &&
                wait-for-it -t 30 db:5432 &&
-               bundle exec rake db:create &&
-               bundle exec rake ofn:dev:setup &&
+               bundle exec rake db:setup db:test:prepare ofn:sample_data || true &&
                rm -f tmp/pids/server.pid &&
                bundle exec rails s -p 3000 -b '0.0.0.0'"
 
diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake
index 7d8e088239..4677a1786c 100644
--- a/lib/tasks/dev.rake
+++ b/lib/tasks/dev.rake
@@ -1,26 +1,5 @@
 namespace :ofn do
   namespace :dev do
-    desc 'Setup dev environment'
-    task setup: :environment do
-      p '== Entering setup'
-      # NOTE: Could be helpful to drop and create again the db here
-      # Rake::Task['db:drop'].invoke
-      # Rake::Task['db:create'].invoke
-
-      unless Spree::User.table_exists? && Spree::User.count
-        p '== Load data schema'
-        Rake::Task['db:schema:load'].invoke
-
-        # TODO: Integrate the tasks loading data
-        # Issue to reach stdin while creating Admin account
-        # Rake::Task['db:seed'].invoke
-        # Rake::Task['ofn:sample_data'].invoke
-      end
-
-      p '== Migrate'
-      Rake::Task['db:migrate'].invoke
-    end
-
     desc 'load sample data'
     task load_sample_data: :environment do
       require_relative '../../spec/factories'