diff --git a/manifest.json b/manifest.json
index 7c3f5d0..2d0a2ce 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Manage passwords and other sensitive informations",
         "fr": "Gérez les mots de passe et autres informations sensibles"
     },
-    "version": "1.26.0~ynh1",
+    "version": "1.26.0~ynh2",
     "url": "https://github.com/dani-garcia/vaultwarden",
     "upstream": {
         "license": "GPL-3.0-or-later",
diff --git a/scripts/install b/scripts/install
index 1e26415..42a998c 100644
--- a/scripts/install
+++ b/scripts/install
@@ -93,7 +93,12 @@ ynh_script_progression --message="Setting up source files..."
 
 ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 # Download, check integrity, uncompress and patch the source from app.src
-ynh_docker_image_extract --dest_dir="$final_path/build/" --image_spec="$pkg_image:$(ynh_app_upstream_version)"
+docker_arg=""
+if [ $YNH_ARCH == "armhf" ] 
+then
+	docker_arg="--os_arch_variant=\"linux/arm/v7\""
+fi
+ynh_docker_image_extract --dest_dir="$final_path/build/" --image_spec="$pkg_image:$(ynh_app_upstream_version)" $docker_arg
 mkdir -p "$final_path/live/"
 
 chmod 750 "$final_path"
diff --git a/scripts/upgrade b/scripts/upgrade
index e719e01..c738f82 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -143,7 +143,12 @@ then
 	ynh_script_progression --message="Upgrading source files..."
 
 	# Download, check integrity, uncompress the source of vaultwarden from app.src to his build directory
-	ynh_docker_image_extract --dest_dir="$final_path/build/" --image_spec="$pkg_image:$(ynh_app_upstream_version)"
+	docker_arg=""
+	if [ $YNH_ARCH == "armhf" ] 
+	then
+		docker_arg="--os_arch_variant=\"linux/arm/v7\""
+	fi
+	ynh_docker_image_extract --dest_dir="$final_path/build/" --image_spec="$pkg_image:$(ynh_app_upstream_version)" $docker_arg
 	mkdir -p "$final_path/live/"
 fi
 
diff --git a/scripts/ynh_docker_image_extract b/scripts/ynh_docker_image_extract
index 4c19d13..602ae94 100644
--- a/scripts/ynh_docker_image_extract
+++ b/scripts/ynh_docker_image_extract
@@ -37,6 +37,10 @@ ynh_docker_image_extract() {
 	local os_arch_variant
 	# Manage arguments with getopts
 	ynh_handle_getopts_args "$@"
+	if [ $YNH_ARCH == "armhf" ] 
+	then
+		YNH_ARCH="arm/v7"
+	fi
 	os_arch_variant="${os_arch_variant:-"linux/$YNH_ARCH"}"
 
 	# Extract source into the app dir