diff --git a/docker-compose.yml b/docker-compose.yml
index abc400c5e6..756131215c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,7 +14,7 @@ services:
     stdin_open: true
     build: .
     ports:
-      - 3006:3000
+      - 3000:3000
     volumes:
       - .:/usr/src/app
       - gems:/bundles
diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake
index 3b4823d3ea..cffda24803 100644
--- a/lib/tasks/dev.rake
+++ b/lib/tasks/dev.rake
@@ -3,10 +3,18 @@ namespace :ofn 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 '== Purge & Load sample data'
+        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'