diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cb7ae218d..34f00a114 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -81,15 +81,17 @@ jobs:
           jar xf $DOCKER_BUILD_DIR/artifact/suoritusrekisteri.jar META-INF/native
           mv META-INF/native $DOCKER_BUILD_DIR/native_libs
           cp -vr suoritusrekisteri/src/main/resources/* $DOCKER_BUILD_DIR/config/
+          export BASE_IMAGE="baseimage-fatjar-openjdk11:master"
+          ./ci-tools/common/pull-image.sh
+          ./ci-tools/github-build/build-fatjar.sh suoritusrekisteri
+          ./ci-tools/github-build/upload-image.sh suoritusrekisteri
           
           ./ci-tools/common/clean-docker-build-dir.sh
           mv ovara-suoritusrekisteri/target/ovara-suoritusrekisteri*jar-with-dependencies.jar $DOCKER_BUILD_DIR/artifact/ovara-suoritusrekisteri.jar 
           jar xf $DOCKER_BUILD_DIR/artifact/ovara-suoritusrekisteri.jar META-INF/native
           mv META-INF/native $DOCKER_BUILD_DIR/native_libs
           cp -vr ovara-suoritusrekisteri/src/main/resources/* $DOCKER_BUILD_DIR/config/
-          
           export BASE_IMAGE="baseimage-fatjar-openjdk11:master"
-          ./ci-tools/common/pull-image.sh
-          ./ci-tools/github-build/build-fatjar.sh suoritusrekisteri
-          ./ci-tools/github-build/upload-image.sh suoritusrekisteri
+          ./ci-tools/common/pull-image.sh          
+          ./ci-tools/github-build/build-fatjar.sh ovara-suoritusrekisteri
           ./ci-tools/github-build/upload-image.sh ovara-suoritusrekisteri