diff --git a/build.lint.xml b/build.lint.xml
index 1ca7cfd..371c86a 100644
--- a/build.lint.xml
+++ b/build.lint.xml
@@ -11,62 +11,62 @@
             depends="lint-twig,lint-yml"
             description="Performs static analysis" />
 
-            <!-- This executes the PHP internal linter (php -l) -->
+    <!-- This executes the PHP internal linter (php -l) -->
     <target name="lint-php"
             unless="lint-php.done"
             description="Perform syntax check of sourcecode files">
-    <apply executable="php" taskname="lint" failonerror="true">
-        <arg value="-l" />
+        <apply executable="php" taskname="lint" failonerror="true">
+            <arg value="-l" />
 
-        <fileset dir="${basedir}/src" errorOnMissingDir = "false">
-            <include name="**/*.php" />
-        </fileset>
+            <fileset dir="${basedir}/src" errorOnMissingDir = "false">
+                <include name="**/*.php" />
+            </fileset>
 
-        <fileset dir="${basedir}/tests" errorOnMissingDir = "false">
-            <include name="**/*.php" />
-        </fileset>
+            <fileset dir="${basedir}/tests" errorOnMissingDir = "false">
+                <include name="**/*.php" />
+            </fileset>
 
-        <fileset dir="${basedir}/app" errorOnMissingDir = "false">
-            <include name="**/*.php" />
-        </fileset>
+            <fileset dir="${basedir}/app" errorOnMissingDir = "false">
+                <include name="**/*.php" />
+            </fileset>
 
-    </apply>
+        </apply>
 
-    <property name="lint-php.done" value="true"/>
+        <property name="lint-php.done" value="true"/>
     </target>
 
-            <!-- Executes the symfony provided twig linter -->
+    <!-- Executes the symfony provided twig linter -->
     <target name="lint-twig"
             unless="lint-twig.done"
             description="Perform syntax check of twig files"
             depends="-check-symfony-console"
             if="symfony-console.exists">
-    <apply executable="${symfony-console}" taskname="lint-twig" failonerror="true">
-        <arg value="lint:twig" />
-        <dirset dir = "${basedir}">
-            <include name="app" />
-            <include name="src" />
-        </dirset>
-    </apply>
+        <apply executable="${symfony4-console}" taskname="lint-twig" failonerror="true">
+            <arg value="lint:twig" />
+            <dirset dir = "${basedir}">
+                <include name="app" />
+                <include name="src" />
+            </dirset>
+        </apply>
 
-    <property name="lint-twig.done" value="true"/>
+        <property name="lint-twig.done" value="true"/>
     </target>
 
-            <!-- Executes the symfony provided yaml linter -->
+    <!-- Executes the symfony provided yaml linter -->
     <target name="lint-yml"
             unless="lint-yml.done"
             description="Perform syntax check of yml files"
             depends="-check-symfony-console"
             if="symfony-console.exists">
-    <apply executable="${symfony-console}" taskname="lint-yml" failonerror="true">
-        <arg value="lint:yaml" />
-        <dirset dir = "${basedir}">
-            <include name="app" />
-            <include name="src" />
-        </dirset>
-    </apply>
+        <apply executable="${symfony4-console}" taskname="lint-yml" failonerror="true">
+            <arg value="lint:yaml" />
+            <dirset dir = "${basedir}">
+                <include name="app" />
+                <include name="src" />
+            </dirset>
+        </apply>
 
-    <property name="lint-yml.done" value="true"/>
+        <property name="lint-yml.done" value="true"/>
     </target>
 
 </project>
\ No newline at end of file
diff --git a/build.phpunit.xml b/build.phpunit.xml
index 8d7e878..e7d0d89 100644
--- a/build.phpunit.xml
+++ b/build.phpunit.xml
@@ -3,7 +3,7 @@
 
     <!-- We define the paths to the executables here, for easier
      modification -->
-    <property name="phpunit" value="${basedir}/vendor/bin/phpunit"/>
+    <property name="phpunit" value="${basedir}/vendor/bin/simple-phpunit"/>
 
     <!-- Check if composer is available -->
     <target name="check-phpunit">
diff --git a/build.symfony.xml b/build.symfony.xml
index c8cb462..adf9ff1 100644
--- a/build.symfony.xml
+++ b/build.symfony.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="randock.symfony">
-    <import file="./build.symfony3.xml" />
     <import file="./build.symfony4.xml"  />
 
-    <target name="symfony-prepare" depends="symfony3-prepare,symfony4-prepare" />
+    <target name="symfony-prepare" depends="symfony4-prepare" />
 
     <target name="symfony-change-owner"
-     depends="symfony3-change-owner,symfony4-change-owner" />
+            depends="symfony4-change-owner" />
 
 </project>
\ No newline at end of file
diff --git a/build.symfony3.xml b/build.symfony3.xml
deleted file mode 100644
index 7a35191..0000000
--- a/build.symfony3.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="randock.symfony3">
-
-    <!-- symfony console location -->
-    <property name="symfony3-console" value="bin/console"/>
-    <property name="symfony3-kernel" value="app/AppKernel.php" />
-
-    <!-- Check if symfony is available -->
-    <target name="symfony3-check">
-        <available file="${symfony3-kernel}" property="symfony3.available" />
-    </target>
-
-    <target name="symfony3-prepare"
-            depends="symfony3-check"
-            if = "symfony3.available"
-             >
-        <antcall target = "symfony3-schema:update" />
-        <antcall target = "symfony3-assetic:dump" />
-        <antcall target = "symfony3-change-owner" />
-    </target>
-
-    <target name="symfony3-assetic:dump">
-        <exec executable="${symfony3-console}">
-            <arg value="assetic:dump" />
-            <arg value="--quiet" />
-        </exec>
-    </target>
-
-    <target name="symfony3-schema:update">
-        <exec executable="${symfony3-console}">
-            <arg value="doctrine:schema:update" />
-            <arg value="--force" />
-        </exec>
-    </target>
-
-    <target name="symfony3-change-owner"
-    depends="symfony3-check"
-    if="symfony3.available">
-        <exec executable="chmod">
-            <arg value = "-R" />
-            <arg value = "0777" />
-            <arg value = "var" />
-        </exec>
-    </target>
-</project>
\ No newline at end of file
diff --git a/build.symfony4.xml b/build.symfony4.xml
index 0a1d595..060a290 100644
--- a/build.symfony4.xml
+++ b/build.symfony4.xml
@@ -4,12 +4,17 @@
     <!-- symfony console location -->
     <property name="symfony4-console" value="bin/console" />
     <property name="yarn" value="/usr/bin/yarn" />
+    <property environment="env"/>
 
     <!-- Check if symfony is available -->
     <target name="symfony4-check">
-        <available file="${yarn}" property="symfony4.available" />
+        <available file="${symfony4-console}" property="symfony4.available" />
     </target>
 
+    <!-- Check if yarn is available -->
+    <target name="yarn-check">
+        <available file="${yarn}" property="yarn.available" />
+    </target>
     <target name="symfony4-prepare"
             depends="symfony4-check"
             if="symfony4.available">
@@ -17,12 +22,58 @@
         <antcall target= "symfony4-webpack:build" />
         <antcall target= "symfony4-change-owner" />
     </target>
+
     <target name="symfony4-webpack:build">
+        <antcall target="symfony4-webpack:build:prod-with-check"/>
+        <antcall target="symfony4-webpack:build:dev-with-check"/>
+        <antcall target="symfony4-webpack:build:test-with-check"/>
+    </target>
+
+    <target name="symfony4-webpack:build:prod-with-check" depends="symfony-environment-check" if="symfony.prod">
+        <antcall target="symfony4-webpack:build:prod"/>
+    </target>
+    <target name="symfony4-webpack:build:dev-with-check" depends="symfony-environment-check" if="symfony.dev">
+        <antcall target="symfony4-webpack:build:dev"/>
+    </target>
+    <target name="symfony4-webpack:build:test-with-check" depends="symfony-environment-check" if="symfony.test">
+        <antcall target="symfony4-webpack:build:dev"/>
+    </target>
+
+    <target name="symfony-environment-check">
+        <condition property="symfony.prod">
+            <equals arg1="${env.APP_ENV}" arg2="prod"/>
+        </condition>
+        <condition property="symfony.dev">
+            <equals arg1="${env.APP_ENV}" arg2="dev"/>
+        </condition>
+        <condition property="symfony.test">
+            <equals arg1="${env.APP_ENV}" arg2="test"/>
+        </condition>
+    </target>
+
+    <target name="symfony4-webpack:build:prod"
+            depends="yarn-check"
+            if="yarn.available">
+        <exec executable="${yarn}">
+            <arg value="install" />
+        </exec>
         <exec executable="${yarn}">
             <arg value="build" />
         </exec>
     </target>
 
+    <target name="symfony4-webpack:build:dev"
+            depends="yarn-check"
+            if="yarn.available">
+        <exec executable="${yarn}">
+            <arg value="install" />
+        </exec>
+        <exec executable="${yarn}">
+            <arg value="encore" />
+            <arg value="dev" />
+        </exec>
+    </target>
+
     <target name="symfony4-schema:update">
         <exec executable="${symfony4-console}">
             <arg value="doctrine:schema:update" />
@@ -33,10 +84,10 @@
     <target name="symfony4-change-owner"
             depends="symfony4-check"
             if="symfony4.available">
-    <exec executable="chmod">
+        <exec executable="chmod">
             <arg value = "-R" />
             <arg value = "0777" />
             <arg value = "var" />
         </exec>
     </target>
-</project>
\ No newline at end of file
+</project>
diff --git a/build.xdebug.xml b/build.xdebug.xml
index 89c57dc..3cfc5fd 100644
--- a/build.xdebug.xml
+++ b/build.xdebug.xml
@@ -4,7 +4,7 @@
     <!-- Disable xdebug for faster execution of some tasks-->
     <target name = "xdebug-disable">
         <exec executable="rm">
-            <arg value = "/etc/php/7.1/cli/conf.d/20-xdebug.ini" />
+            <arg value = "/etc/php/${php_version}/cli/conf.d/20-xdebug.ini" />
             <arg value = "--force" />
         </exec>
     </target>
@@ -14,8 +14,8 @@
         <antcall target = "xdebug-disable" />
         <exec executable="ln">
             <arg value = "-s" />
-            <arg value = "/etc/php/7.1/mods-available/xdebug.ini" />
-            <arg value = "/etc/php/7.1/cli/conf.d/20-xdebug.ini" />
+            <arg value = "/etc/php/${php_version}/mods-available/xdebug.ini" />
+            <arg value = "/etc/php/${php_version}/cli/conf.d/20-xdebug.ini" />
         </exec>
     </target>
 </project>
\ No newline at end of file