diff --git a/Dockerfile b/Dockerfile
index a77bb0928c..56d390e2f0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -47,6 +47,11 @@ COPY . $FIREFLY_PATH
 RUN chown -R www-data:www-data /var/www && chmod -R 775 $FIREFLY_PATH/storage
 
 RUN composer install --prefer-dist --no-dev --no-scripts
+RUN composer dump-autoload
+RUN php artisan firefly:upgrade-database
+RUN php artisan firefly:verify
+RUN php artisan firefly:instructions install
+RUN php artisan optimize
 
 EXPOSE 80
 
diff --git a/app/Models/TransactionCurrency.php b/app/Models/TransactionCurrency.php
index 4cbc278fa5..fbc20d71a5 100644
--- a/app/Models/TransactionCurrency.php
+++ b/app/Models/TransactionCurrency.php
@@ -25,7 +25,7 @@ use Watson\Validating\ValidatingTrait;
  */
 class TransactionCurrency extends Model
 {
-    use SoftDeletes, ValidatingTrait;
+    use SoftDeletes;
 
     /**
      * The attributes that should be casted to native types.
@@ -41,13 +41,6 @@ class TransactionCurrency extends Model
         ];
     protected $dates    = ['created_at', 'updated_at', 'deleted_at', 'date'];
     protected $fillable = ['name', 'code', 'symbol', 'decimal_places'];
-    protected $rules
-                        = [
-            'name'           => 'required|between:1,48',
-            'code'           => 'required|between:3,3',
-            'symbol'         => 'required|between:1,8',
-            'decimal_places' => 'required|min:0|max:12|numeric',
-        ];
 
     /**
      * @param TransactionCurrency $currency