diff --git a/js/apps/system/_admin/aardvark/APP/GruntFile.js b/js/apps/system/_admin/aardvark/APP/GruntFile.js
index 0eb330d91c..56a74ad2e3 100644
--- a/js/apps/system/_admin/aardvark/APP/GruntFile.js
+++ b/js/apps/system/_admin/aardvark/APP/GruntFile.js
@@ -322,19 +322,17 @@
         }
       },
 
-      semistandard: {
+      eslint: {
         options: {
-          format: false
+          configFile: '../../../../../.eslintrc'
         },
-        app: {
-          src: [
-            'frontend/js/views/*.js',
-            'frontend/js/arango/*.js',
-            'frontend/js/models/*.js',
-            'frontend/js/collections/*.js',
-            'frontend/js/routers/*.js'
-          ]
-        }
+        target: [
+          'frontend/js/views/*.js',
+          'frontend/js/arango/*.js',
+          'frontend/js/models/*.js',
+          'frontend/js/collections/*.js',
+          'frontend/js/routers/*.js'
+        ]
       },
 
       uglify: {
@@ -402,7 +400,6 @@
       }
     });
 
-    grunt.loadNpmTasks('grunt-semistandard');
     grunt.loadNpmTasks("grunt-sass");
     grunt.loadNpmTasks("grunt-contrib-imagemin");
     grunt.loadNpmTasks('grunt-contrib-cssmin');
@@ -416,6 +413,7 @@
     grunt.loadNpmTasks('grunt-text-replace');
 
     grunt.registerTask('default', [
+      'eslint',
       'sass:dev',
       'replace',
       'concat',
@@ -439,7 +437,7 @@
 
     grunt.registerTask('deploy', [
       'sass:dev',
-      'semistandard',
+      'eslint',
       'replace',
       'imagemin',
       'concat',
diff --git a/js/apps/system/_admin/aardvark/APP/package.json b/js/apps/system/_admin/aardvark/APP/package.json
index a667a78b46..59757d4b85 100644
--- a/js/apps/system/_admin/aardvark/APP/package.json
+++ b/js/apps/system/_admin/aardvark/APP/package.json
@@ -8,6 +8,10 @@
     "grunt": "grunt"
   },
   "devDependencies": {
+    "eslint-config-semistandard": "^7.0.0",
+    "eslint-config-standard": "^6.2.1",
+    "eslint-plugin-promise": "^3.3.2",
+    "eslint-plugin-standard": "^2.0.1",
     "grunt": "*",
     "grunt-babel": "*",
     "grunt-concat-in-order": "*",
@@ -21,10 +25,10 @@
     "grunt-contrib-sass": "*",
     "grunt-contrib-uglify": "*",
     "grunt-contrib-watch": "*",
+    "grunt-eslint": "^19.0.0",
     "grunt-karma": "*",
     "grunt-processhtml": "*",
     "grunt-sass": "*",
-    "grunt-semistandard": "^1.0.6",
     "grunt-text-replace": "*",
     "jasmine-core": "*",
     "karma": "*",