diff --git a/.deploy/docker/.env.docker b/.deploy/docker/.env.docker
index 3da4a48d0a..dffeabdae8 100644
--- a/.deploy/docker/.env.docker
+++ b/.deploy/docker/.env.docker
@@ -1,6 +1,6 @@
 # You can leave this on "local". If you change it to production most console commands will ask for extra confirmation.
 # Never set it to "testing".
-APP_ENV=${FF_APP_ENV}
+APP_ENV=${APP_ENV}
 
 # Set to true if you want to see debug information in error screens.
 APP_DEBUG=${APP_DEBUG}
@@ -11,7 +11,7 @@ SITE_OWNER=${SITE_OWNER}
 # The encryption key for your database and sessions. Keep this very secure.
 # If you generate a new one all existing data must be considered LOST.
 # Change it to a string of exactly 32 chars or use command `php artisan key:generate` to generate it
-APP_KEY=${FF_APP_KEY}
+APP_KEY=${APP_KEY}
 
 # Change this value to your preferred time zone.
 # Example: Europe/Amsterdam
@@ -38,12 +38,12 @@ APP_LOG_LEVEL=${APP_LOG_LEVEL}
 
 # Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
 # For other database types, please see the FAQ: http://firefly-iii.readthedocs.io/en/latest/support/faq.html
-DB_CONNECTION=${FF_DB_CONNECTION}
-DB_HOST=${FF_DB_HOST}
-DB_PORT=${FF_DB_PORT}
-DB_DATABASE=${FF_DB_NAME}
-DB_USERNAME=${FF_DB_USER}
-DB_PASSWORD="${FF_DB_PASSWORD}"
+DB_CONNECTION=${DB_CONNECTION}
+DB_HOST=${DB_HOST}
+DB_PORT=${DB_PORT}
+DB_DATABASE=${DB_NAME}
+DB_USERNAME=${DB_USER}
+DB_PASSWORD="${DB_PASSWORD}"
 
 # PostgreSQL supports SSL. You can configure it here.
 PGSQL_SSL=${PGSQL_SSL}
diff --git a/.deploy/kubernetes/firefly.yaml b/.deploy/kubernetes/firefly.yaml
index b2e3d2c912..1dc6309e84 100644
--- a/.deploy/kubernetes/firefly.yaml
+++ b/.deploy/kubernetes/firefly.yaml
@@ -44,17 +44,17 @@ spec:
       - image: firefly-local
         name: firefly-local
         env:
-        - name: FF_APP_ENV
+        - name: APP_ENV
           value: "local"
-        - name: FF_APP_KEY
+        - name: APP_KEY
           value: "S0m3R@nd0mString0f32Ch@rsEx@ct1y"
-        - name: FF_DB_HOST
+        - name: DB_HOST
           value: "172.17.0.9" 
-        - name: FF_DB_NAME
+        - name: DB_NAME
           value: "firefly_db"
-        - name: FF_DB_USER
+        - name: DB_USER
           value: "firefly_db"
-        - name: FF_DB_PASSWORD
+        - name: DB_PASSWORD
           value: "password" 
         volumeMounts:
         - mountPath: "/var/www/firefly-iii/storage/export"
diff --git a/docker-compose.yml b/docker-compose.yml
index 3e0311928b..30bb1023b3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,13 +5,13 @@ networks:
 services: 
   firefly_iii_app: 
     environment: 
-      - FF_DB_HOST=firefly_iii_db
-      - FF_DB_NAME=firefly
-      - FF_DB_USER=firefly
-      - FF_DB_PASSWORD=firefly
-      - FF_APP_KEY=S0m3R@nd0mStr1ngOf32Ch@rsEx@ctly
-      - FF_APP_ENV=local
-      - FF_DB_CONNECTION=pgsql
+      - DB_HOST=firefly_iii_db
+      - DB_NAME=firefly
+      - DB_USER=firefly
+      - DB_PASSWORD=firefly
+      - APP_KEY=S0m3R@nd0mStr1ngOf32Ch@rsEx@ctly
+      - APP_ENV=local
+      - DB_CONNECTION=pgsql
       - TZ=Europe/Amsterdam
       - APP_LOG_LEVEL=debug
     image: jc5x/firefly-iii
diff --git a/phpunit.coverage.xml b/phpunit.coverage.xml
index a0300eba95..60bc506b70 100644
--- a/phpunit.coverage.xml
+++ b/phpunit.coverage.xml
@@ -27,7 +27,7 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnFailure="false">
+         stopOnFailure="true">
     <listeners>
         <listener class="JohnKary\PHPUnit\Listener\SpeedTrapListener" />
     </listeners>
diff --git a/phpunit.xml b/phpunit.xml
index 2a6b8da0cf..736d18a486 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -27,7 +27,7 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnFailure="false">
+         stopOnFailure="true">
     <listeners>
         <listener class="JohnKary\PHPUnit\Listener\SpeedTrapListener" />
     </listeners>