diff --git a/debian-software b/debian-software
index 51063df..38db305 100755
--- a/debian-software
+++ b/debian-software
@@ -26,7 +26,6 @@
 # install_transmission
 # install_transmission_seed_armbian_torrents
 # install_hassio
-# install_openhab2
 # install_openhab
 # install_syncthing
 # install_plex_media_server
@@ -119,15 +118,10 @@ function check_status
 	alive_port "Home assistant smarthome suite" "8123"
 	LIST+=( "Hassio" "$DESCRIPTION" "$HASS_STATUS" )
 
-        # OpenHab 2
-	OPENHAB2_STATUS="$([[ -f /etc/default/openhab2 ]] && echo "on" || echo "off" )"
-	DESCRIPTION="Openhab smarthome suite"
-	LIST+=( "OpenHAB2" "$DESCRIPTION" "$OPENHAB2_STATUS" )
-
 	# OpenHab
 	OPENHAB_STATUS="$([[ -f /etc/default/openhab ]] && echo "on" || echo "off" )"
 	DESCRIPTION="Openhab smarthome suite"
-	LIST+=( "OpenHAB3" "$DESCRIPTION" "$OPENHAB_STATUS" )
+	LIST+=( "OpenHAB" "$DESCRIPTION" "$OPENHAB_STATUS" )
 
 	# VPN
 	if [[ "$(dpkg --print-architecture)" == "armhf" || "$(dpkg --print-architecture)" == "amd64" ]]; then
@@ -622,7 +616,7 @@ install_tvheadend ()
 #
 if [[ "$family" == "Ubuntu" ]]; then
 	apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 26F4EF8440618B66 >/dev/null 2>&1
-	add-apt-repository -y ppa:mamarley/tvheadend-git-stable >/dev/null 2>&1	
+	add-apt-repository -y add-apt-repository ppa:mamarley/tvheadend-git >/dev/null 2>&1
 	debconf-apt-progress -- apt-get -y install libssl-doc libssl1.1 zlib1g-dev tvheadend xmltv-util
 else
 	if [ ! -f /etc/apt/sources.list.d/tvheadend.list ]; then
@@ -794,69 +788,6 @@ fi
 
 
 
-install_openhab2 ()
-{
-#
-# Install Openhab2 smart home suite openhab.org
-#
-
-# Install ZuluJDK
-#
-# test below
-#
-# sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0xB1998361219BD9C9
-# sudo apt-add-repository 'deb http://repos.azulsystems.com/ubuntu stable main'
-# apt install zulu-embedded-8
-
-
-local jdkArch=$(dpkg --print-architecture)
-
-case $jdkArch in
-
-	armhf)
-		URL="https://cdn.azul.com/zulu-embedded/bin/zulu8.40.0.178-ca-jdk1.8.0_222-linux_aarch32hf.tar.gz"
-		;;
-	arm64)
-		URL="https://cdn.azul.com/zulu-embedded/bin/zulu8.40.0.178-ca-jdk1.8.0_222-linux_aarch64.tar.gz"
-		;;
-	amd64)
-		URL="https://cdn.azul.com/zulu/bin/zulu8.42.0.21-ca-jdk8.0.232-linux_x64.tar.gz"
-		;;
-	*)
-		URL="https://cdn.azul.com/zulu/bin/zulu8.42.0.21-ca-jdk8.0.232-linux_i686.tar.gz"
-
-esac
-
-fancy_wget "$URL" "-O ${TEMP_DIR}/zulu8.tar.gz"
-mkdir -p /opt/jdk
-tar -xpzf ${TEMP_DIR}/zulu8.tar.gz -C /opt/jdk
-jdkBin=$(find /opt/jdk/*/bin ... -print -quit)
-jdkLib=$(find /opt/jdk/*/lib ... -print -quit)
-update-alternatives --remove-all java >/dev/null 2>&1
-update-alternatives --remove-all javac >/dev/null 2>&1
-update-alternatives --install /usr/bin/java java "$jdkBin"/java 1083000 >/dev/null 2>&1
-update-alternatives --install /usr/bin/javac javac "$jdkBin"/javac 1083000 >/dev/null 2>&1
-echo "$jdkLib"/"$jdkArch" > /etc/ld.so.conf.d/java.conf
-echo "$jdkLib"/"$jdkArch"/jli >> /etc/ld.so.conf.d/java.conf
-ldconfig >/dev/null 2>&1
-wget -qO - 'https://bintray.com/user/downloadSubjectPublicKey?username=openhab' | apt-key add - >/dev/null 2>&1
-echo 'deb https://dl.bintray.com/openhab/apt-repo2 stable main' | tee /etc/apt/sources.list.d/openhab2.list >/dev/null 2>&1
-debconf-apt-progress -- apt-get update
-debconf-apt-progress -- apt-get install -y openhab2
-systemctl daemon-reload >/dev/null 2>&1
-systemctl enable openhab2.service >/dev/null 2>&1
-systemctl start openhab2.service >/dev/null 2>&1
-# addons seems broken
-# apt-get install -y openhab2-addons
-sed -i 's|EXTRA_JAVA_OPTS=""|EXTRA_JAVA_OPTS="-Dgnu.io.rxtx.SerialPorts=/dev/ttyUSB0:/dev/ttyS0:/dev/ttyS2:/dev/ttyACM0:/dev/ttyAMA0"|' /etc/default/openhab2
-service openhab2 restart >/dev/null 2>&1
-dialog --backtitle "$BACKTITLE" --title "Please wait" --msgbox \
-"\nIt can take several minutes before OpenHAB UI becomes available! " 7 68
-}
-
-
-
-
 install_openhab ()
 {
 #
@@ -893,8 +824,8 @@ update-alternatives --install /usr/bin/javac javac "$jdkBin"/javac 1083000 >/dev
 echo "$jdkLib"/"$jdkArch" > /etc/ld.so.conf.d/java.conf
 echo "$jdkLib"/"$jdkArch"/jli >> /etc/ld.so.conf.d/java.conf
 ldconfig >/dev/null 2>&1
-wget -qO - 'https://bintray.com/user/downloadSubjectPublicKey?username=openhab' | apt-key add - >/dev/null 2>&1
-echo 'deb https://dl.bintray.com/openhab/apt-repo2 stable main' | sudo tee /etc/apt/sources.list.d/openhab2.list >/dev/null 2>&1
+wget -qO - 'https://openhab.jfrog.io/artifactory/api/gpg/key/public' | apt-key add - >/dev/null 2>&1
+echo 'deb https://openhab.jfrog.io/artifactory/openhab-linuxpkg stable main' | sudo tee /etc/apt/sources.list.d/openhab.list >/dev/null 2>&1
 
 debconf-apt-progress -- apt-get update
 debconf-apt-progress -- apt-get install -y openhab