diff --git a/Gruntfile.js b/Gruntfile.js
index 9dea853..1acdec3 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -3,7 +3,7 @@ module.exports = function exports(grunt) {
 
   grunt.loadTasks('tasks');
 
-  grunt.registerTask('default', ['lint', 'copy', 'sass:dist', 'postcss', 'requirejs:default', 'cachebreaker', 'inline', 'htmlmin', 'json-minify', 'clean:release']);
+  grunt.registerTask('default', ['lint', 'copy', 'sass:dist', 'postcss:dist', 'requirejs:default', 'cachebreaker', 'inline', 'htmlmin', 'json-minify', 'clean:release']);
   grunt.registerTask('lint', ['sasslint', 'eslint']);
-  grunt.registerTask('serve', ['lint', 'copy', 'sass:dev', 'postcss', 'requirejs:dev', 'inline:dev', 'htmlmin', 'json-minify', 'browserSync', 'watch']);
+  grunt.registerTask('serve', ['lint', 'copy', 'sass:dev', 'postcss:dev', 'requirejs:dev', 'inline:dev', 'htmlmin', 'json-minify', 'browserSync', 'watch']);
 };
diff --git a/tasks/build.js b/tasks/build.js
index 7c2b2fe..ee13386 100644
--- a/tasks/build.js
+++ b/tasks/build.js
@@ -42,13 +42,6 @@ module.exports = function exports(grunt) {
       }
     },
     sass: {
-      files: [{
-        expand: true,
-        cwd: 'scss/',
-        src: '*.scss',
-        dest: 'build/',
-        ext: '.css'
-      }],
       dev: {
         options: {
           sourceMap: true,
@@ -77,15 +70,27 @@ module.exports = function exports(grunt) {
     },
     postcss: {
       options: {
-        map: false,
         processors: [
           require('autoprefixer')({
             browsers: ['> 1% in DE']
           })
         ]
       },
+      dev: {
+        options: {
+          map: true
+        },
+        dist: {
+          src: 'build/*.css'
+        }
+      },
       dist: {
-        src: 'build/*.css'
+        options: {
+          map: false
+        },
+        dist: {
+          src: 'build/*.css'
+        }
       }
     },
     inline: {
diff --git a/tasks/development.js b/tasks/development.js
index fd5e595..9f87099 100644
--- a/tasks/development.js
+++ b/tasks/development.js
@@ -29,7 +29,7 @@ module.exports = function exports(grunt) {
       },
       sass: {
         files: ['scss/**/*.scss'],
-        tasks: ['sasslint', 'sass', 'postcss']
+        tasks: ['sasslint', 'sass:dev', 'postcss:dev']
       },
       js: {
         files: ['app.js', 'lib/**/*.js'],