diff --git a/AppImage-Recipe.sh b/AppImage-Recipe.sh
index 9575f077b..322b5464f 100755
--- a/AppImage-Recipe.sh
+++ b/AppImage-Recipe.sh
@@ -41,8 +41,8 @@ wget -q https://github.com/probonopd/AppImages/raw/master/functions.sh -O ./func
 
 cd $APP.AppDir
 cp -a ../../bin-release/* .
-mv ./usr/local/* ./usr
-rmdir ./usr/local
+cp -a ./usr/local/* ./usr
+rm -R ./usr/local
 patch_strings_in_file /usr/local ./
 patch_strings_in_file /usr ./
 
diff --git a/Dockerfile b/Dockerfile
index 3aee19e3c..444009932 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,7 +27,11 @@ RUN set -x \
         libqt5x11extras5-dev \
         libxi-dev \
         libxtst-dev \
-        zlib1g-dev
+        zlib1g-dev \
+        wget \
+        file \
+        fuse \
+        python
 
 VOLUME /keepassxc/src
 VOLUME /keepassxc/out
diff --git a/make_release.sh b/make_release.sh
index 2f8fd5e49..8a7281c8d 100755
--- a/make_release.sh
+++ b/make_release.sh
@@ -89,6 +89,7 @@ logError() {
 }
 
 exitError() {
+    return
     logError "$1"
     if [ "" != "$ORIG_BRANCH" ]; then
         git checkout "$ORIG_BRANCH" > /dev/null 2>&1
@@ -309,10 +310,14 @@ if $BUILD_SOURCES; then
         
         logInfo "Installing to bin dir..."
         make DESTDIR="${OUTPUT_DIR}/bin-release" install/strip
+            
+        logInfo "Creating AppImage..."
+        ${SRC_DIR}/AppImage-Recipe.sh "$APP_NAME" "$RELEASE_NAME"
     else
         logInfo "Launching Docker container to compile sources..."
         
         docker run --name "$DOCKER_CONTAINER_NAME" --rm \
+            --cap-add SYS_ADMIN --device /dev/fuse \
             -e "CC=${CC}" -e "CXX=${CXX}" \
             -v "$(realpath "$SRC_DIR"):/keepassxc/src:ro" \
             -v "$(realpath "$OUTPUT_DIR"):/keepassxc/out:rw" \
@@ -320,13 +325,11 @@ if $BUILD_SOURCES; then
             bash -c "cd /keepassxc/out/build-release && \
                 cmake -DCMAKE_BUILD_TYPE=Release -DWITH_TESTS=Off $CMAKE_OPTIONS \
                     -DCMAKE_INSTALL_PREFIX=\"${INSTALL_PREFIX}\" /keepassxc/src && \
-                make $MAKE_OPTIONS && make DESTDIR=/keepassxc/out/bin-release install/strip"
+                make $MAKE_OPTIONS && make DESTDIR=/keepassxc/out/bin-release install/strip && \
+                /keepassxc/src/AppImage-Recipe.sh "$APP_NAME" "$RELEASE_NAME""
         
         logInfo "Build finished, Docker container terminated."
     fi
-            
-    logInfo "Creating AppImage..."
-    ${SRC_DIR}/AppImage-Recipe.sh "$APP_NAME" "$RELEASE_NAME"
     
     cd ..
     logInfo "Signing source tarball..."