diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 7435ee6d9a..a28bb4f99d 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -1349,6 +1349,16 @@ DietPi-Software will decrypt and use it for software installs. You can change it
 		aSOFTWARE_ONLINEDOC_URL[$software_id]='p=29377#p29377'
 		# - Bullseye
 		aSOFTWARE_AVAIL_G_DISTRO[$software_id,6]=0
+		#------------------
+		software_id=134
+
+		aSOFTWARE_NAME[$software_id]='Docker Compose'
+		aSOFTWARE_DESC[$software_id]='Tool to defining and run multi-container Docker applications'
+		aSOFTWARE_TYPE[$software_id]=0
+		aSOFTWARE_CATEGORY_INDEX[$software_id]=8
+		aSOFTWARE_ONLINEDOC_URL[$software_id]='p=xxx#pxxx'
+		# - Bullseye: https://download.docker.com/linux/debian/dists/
+		aSOFTWARE_AVAIL_G_DISTRO[$software_id,6]=0
 
 		# Remote Access
 		#--------------------------------------------------------------------------------
@@ -2240,8 +2250,11 @@ DietPi-Software will decrypt and use it for software installs. You can change it
 
 		# Docker
 		# - Portainer (185)
+		# - Docker Compose (134)
 		software_id=162
-		if ((${aSOFTWARE_INSTALL_STATE[185]} == 1 && ${aSOFTWARE_INSTALL_STATE[$software_id]} < 1 ))
+		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} < 1 )) &&
+		   (( ${aSOFTWARE_INSTALL_STATE[185]} == 1 ||
+		      ${aSOFTWARE_INSTALL_STATE[134]} == 1 ))
 		then
 			aSOFTWARE_INSTALL_STATE[$software_id]=1
 			G_DIETPI-NOTIFY 2 "${aSOFTWARE_NAME[$software_id]} will be installed"
@@ -2383,13 +2396,15 @@ DietPi-Software will decrypt and use it for software installs. You can change it
 		# - HTPC Manager (155)
 		# - Google AIY (169)
 		# - Bazarr (180)
+		# - Docker Compose (134)
 		software_id=130
 		if (( ( ${aSOFTWARE_INSTALL_STATE[118]} == 1 && $G_DISTRO > 4 ) ||
 			${aSOFTWARE_INSTALL_STATE[139]} == 1 ||
 		      ( ${aSOFTWARE_INSTALL_STATE[153]} == 1 && $G_DISTRO > 4 ) ||
 			${aSOFTWARE_INSTALL_STATE[155]} == 1 ||
 			${aSOFTWARE_INSTALL_STATE[169]} == 1 ||
-			${aSOFTWARE_INSTALL_STATE[180]} == 1 )); then
+			${aSOFTWARE_INSTALL_STATE[180]} == 1 ||
+			${aSOFTWARE_INSTALL_STATE[134]} == 1 )); then
 
 			aSOFTWARE_INSTALL_STATE[$software_id]=1
 			G_DIETPI-NOTIFY 2 "${aSOFTWARE_NAME[$software_id]} will be installed"
@@ -5777,7 +5792,7 @@ Package: wireguard wireguard-dkms wireguard-tools\nPin: release n=bullseye\nPin-
 					INSTALL_URL_ADDRESS=$(curl -sf "$INSTALL_URL_ADDRESS" | mawk -F\" '/browser_download_url.*linux\.tar\.gz/{print $4;exit}')
 					local fallback_url='https://github.com/Radarr/Radarr/releases/download/v3.0.1.4259/Radarr.master.3.0.1.4259.linux.tar.gz'
 
-				# ARMv/
+				# ARMv7
 				elif (( $G_HW_ARCH == 2 ))
 				then
 					INSTALL_URL_ADDRESS=$(curl -sf "$INSTALL_URL_ADDRESS" | mawk -F\" '/browser_download_url.*linux-core-arm\.tar\.gz/{print $4;exit}')
@@ -6126,6 +6141,18 @@ If you want to update ${aSOFTWARE_NAME[$software_id]}, please use its internal u
 			G_EXEC_NOFAIL=1 G_EXEC rm DockerInstall.sh
 
 		fi
+		
+		software_id=134 # Docker Compose
+		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then
+
+			Banner_Installing
+
+			# Python build dependencies for aarch64
+			(( $G_HW_ARCH == 3 )) && G_AGI make gcc
+
+			G_EXEC_OUTPUT=1 G_EXEC pip3 install docker-compose
+
+		fi
 
 		software_id=161 # FuguHub
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then
@@ -7023,6 +7050,11 @@ exec sudo -u $ha_user dash -c '$ha_pyenv_activation; exec pip3 install -U homeas
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then
 
 			Banner_Installing
+
+			# Create piwheels config file for ARMv6 and ARMv7
+			[[ $G_HW_ARCH != [12] || -f '/etc/pip.conf' ]] || G_EXEC eval "echo -e '[global]\nextra-index-url=https://www.piwheels.org/simple/' > /etc/pip.conf"
+
+			# Perform pip3 installation
 			INSTALL_URL_ADDRESS='https://bootstrap.pypa.io/get-pip.py'
 			G_CHECK_URL "$INSTALL_URL_ADDRESS"
 			G_AGI python3-dev
@@ -15198,14 +15230,25 @@ _EOF_
 
 		fi
 
-		software_id=164
+		software_id=134 # Docker Compose
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then
 
 			Banner_Uninstalling
-			# Remove Service file
-			[[ -f '/etc/systemd/system/nukkit.service' ]] && rm /etc/systemd/system/nukkit.service
+			G_EXEC_NOEXIT=1 G_EXEC_OUTPUT=1 G_EXEC pip3 uninstall -y docker-compose
 
-			# Remove nukkit java file/folder
+		fi
+
+		software_id=164 # Nukkit
+		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then
+
+			Banner_Uninstalling
+			if [[ -f '/etc/systemd/system/nukkit.service' ]]; then
+
+				systemctl disable --now nukkit
+				rm -R /etc/systemd/system/nukkit.service*
+
+			fi
+			[[ -d '/etc/systemd/system/nukkit.service.d' ]] && rm -R /etc/systemd/system/nukkit.service.d
 			[[ -e '/usr/local/bin/nukkit' ]] && rm -R /usr/local/bin/nukkit
 
 		fi
@@ -15700,6 +15743,7 @@ _EOF_
 			Banner_Uninstalling
 			pip3 uninstall -y pip
 			G_AGP python3-pip # Pre-v6.32
+			[[ -f '/etc/pip.conf' ]] && rm /etc/pip.conf
 
 		fi