diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index eabc16b4d9..52469bf456 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -1105,18 +1105,18 @@ DietPi-Software will decrypt and use it for software installs. You can change it
 		aSOFTWARE_TYPE[$software_id]=0
 
 		#------------------
- 		software_id=161
 
- 		aSOFTWARE_WHIP_NAME[$software_id]='FuguHub'
- 		aSOFTWARE_WHIP_DESC[$software_id]='Lightweight WebDAV cloud (eg: dropbox) with a CMS'
- 		aSOFTWARE_CATEGORY_INDEX[$software_id]=4
+		software_id=161
+		aSOFTWARE_WHIP_NAME[$software_id]='FuguHub'
+		aSOFTWARE_WHIP_DESC[$software_id]='Lightweight WebDAV cloud (eg: dropbox) with a CMS'
+		aSOFTWARE_CATEGORY_INDEX[$software_id]=4
 		aSOFTWARE_TYPE[$software_id]=0
 
-		 # - ARMv8
- 		 aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,3]=0
+		# - ARMv8
+		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,3]=0
 
-		 #------------------
-		 software_id=165
+		#------------------
+		software_id=165
 
 		aSOFTWARE_WHIP_NAME[$software_id]='Gitea'
 		aSOFTWARE_WHIP_DESC[$software_id]='Git with a cup of tea'
@@ -6121,7 +6121,7 @@ Pin-Priority: -1' > /etc/apt/preferences.d/dietpi-docker_fix
 			# armv7
 			elif (( $G_HW_ARCH == 2 )); then
 
-				INSTALL_URL_ADDRESS+='linux-arm-7'
+				INSTALL_URL_ADDRESS+='linux-arm-6' # Workaround since ARMv7 binaries are missing/fail on v1.8.X: https://github.com/MichaIng/DietPi/issues/2959
 
 			# armv8
 			elif (( $G_HW_ARCH == 3 )); then