diff --git a/.github/workflows/test-build-docker-image.yml b/.github/workflows/test-build-docker-image.yml
index 955c6d361b..1a7ebfeca4 100644
--- a/.github/workflows/test-build-docker-image.yml
+++ b/.github/workflows/test-build-docker-image.yml
@@ -128,8 +128,8 @@ jobs:
 
   buildServer:
     defaults:
-        run:
-            working-directory: app/server
+      run:
+        working-directory: app/server
     runs-on: ubuntu-latest
     # Only run this workflow for internally triggered events
     if: |
@@ -157,7 +157,6 @@ jobs:
         with:
           fetch-depth: 0
 
-
       # Setup Java
       - name: Set up JDK 1.11
         uses: actions/setup-java@v1
@@ -508,7 +507,7 @@ jobs:
 
     # Run this job irrespective of tests failing, if this is the release branch; or only if the tests pass, if this is the master branch.
     #if: (success() && github.ref == 'refs/heads/master') || github.ref == 'refs/heads/release'
-    if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/release'
+    if: always() && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/release')
 
     steps:
       # Checkout the code