diff --git a/de.kaizencode.tchaikovsky/pom.xml b/de.kaizencode.tchaikovsky/pom.xml
index 3c6e55e..3183a1d 100644
--- a/de.kaizencode.tchaikovsky/pom.xml
+++ b/de.kaizencode.tchaikovsky/pom.xml
@@ -44,15 +44,15 @@
             <configuration>
               <target>
                 <mkdir dir="target/classes/lib/arm/linux" />
-                <get src="https://dl.bintray.com/j-n-k/openhab-3rdparty-contrib/arm/linux/liballjoyn_java.so" dest="target/classes/lib/arm/linux/liballjoyn_java.so" />
+                <get src="https://openhab.jfrog.io/artifactory/files/alljoyn/arm/linux/liballjoyn_java.so" dest="target/classes/lib/arm/linux/liballjoyn_java.so" />
                 <mkdir dir="target/classes/lib/x86/linux" />
-                <get src="https://dl.bintray.com/j-n-k/openhab-3rdparty-contrib/x86/linux/liballjoyn_java.so" dest="target/classes/lib/x86/linux/liballjoyn_java.so" />
+                <get src="https://openhab.jfrog.io/artifactory/files/alljoyn/x86/linux/liballjoyn_java.so" dest="target/classes/lib/x86/linux/liballjoyn_java.so" />
                 <mkdir dir="target/classes/lib/x86-64/linux" />
-                <get src="https://dl.bintray.com/j-n-k/openhab-3rdparty-contrib/x86-64/linux/liballjoyn_java.so" dest="target/classes/lib/x86-64/linux/liballjoyn_java.so" />
+                <get src="https://openhab.jfrog.io/artifactory/files/alljoyn/x86-64/linux/liballjoyn_java.so" dest="target/classes/lib/x86-64/linux/liballjoyn_java.so" />
                 <mkdir dir="target/classes/lib/x86/win" />
-                <get src="https://dl.bintray.com/j-n-k/openhab-3rdparty-contrib/x86/win/alljoyn_java.dll" dest="target/classes/lib/x86/win/alljoyn_java.dll" />
+                <get src="https://openhab.jfrog.io/artifactory/files/alljoyn/x86/win/alljoyn_java.dll" dest="target/classes/lib/x86/win/alljoyn_java.dll" />
                 <mkdir dir="target/classes/lib/x86-64/win" />
-                <get src="https://dl.bintray.com/j-n-k/openhab-3rdparty-contrib/x86-64/win/alljoyn_java.dll" dest="target/classes/lib/x86-64/win/alljoyn_java.dll" />
+                <get src="https://openhab.jfrog.io/artifactory/files/alljoyn/x86-64/win/alljoyn_java.dll" dest="target/classes/lib/x86-64/win/alljoyn_java.dll" />
               </target>
             </configuration>
           </execution>
diff --git a/io.moquette.moquette-broker/NOTICE b/io.moquette.moquette-broker/NOTICE
deleted file mode 100644
index fd324aa..0000000
--- a/io.moquette.moquette-broker/NOTICE
+++ /dev/null
@@ -1,20 +0,0 @@
-This content is produced and maintained by the openHAB project.
-
-* Project home: https://www.openhab.org
-
-== Declared Project Licenses
-
-This program and the accompanying materials are made available under the terms
-of the Eclipse Public License 2.0 which is available at
-https://www.eclipse.org/legal/epl-2.0/.
-
-== Source Code
-
-https://github.com/openhab/openhab-osgiify
-
-== Third-party Content
-
-moquette-broker
-* License: Apache 2.0 license
-* Project: https://github.com/moquette-io/moquette
-* Source:  https://github.com/moquette-io/moquette
diff --git a/io.moquette.moquette-broker/noSources.profile b/io.moquette.moquette-broker/noSources.profile
deleted file mode 100644
index e69de29..0000000
diff --git a/io.moquette.moquette-broker/osgi.bnd b/io.moquette.moquette-broker/osgi.bnd
deleted file mode 100644
index 158c951..0000000
--- a/io.moquette.moquette-broker/osgi.bnd
+++ /dev/null
@@ -1,17 +0,0 @@
-Bundle-Description: OSGi-ified version of ${project.name}
-Bundle-Name: ${project.name}
-Bundle-License: Apache 2.0 License
-Bundle-Version: ${project.version}
-Import-Package: \
-  com.bugsnag.*;resolution:="optional", \
-  com.codahale.metrics.*;resolution:="optional", \
-  com.librato.metrics.reporter.*;resolution:="optional", \
-  com.zaxxer.hikari.*;resolution:="optional", \
-  io.netty.channel.epoll.*;resolution:="optional", \
-  io.netty.handler.codec.http.*;resolution:="optional", \
-  *
-Export-Package: \
-  !NOTICE, \
-  *;version=${project.version}
--includeresource: \
-  NOTICE
diff --git a/io.moquette.moquette-broker/pom.xml b/io.moquette.moquette-broker/pom.xml
deleted file mode 100644
index b1a9ca1..0000000
--- a/io.moquette.moquette-broker/pom.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.openhab.osgiify</groupId>
-    <artifactId>org.openhab.reactor.osgiify</artifactId>
-    <version>1.0.0</version>
-  </parent>
-
-  <artifactId>io.moquette.moquette-broker</artifactId>
-  <version>0.12.1</version>
-
-  <name>Moquette Broker</name>
-
-  <properties>
-    <origin.groupId>io.moquette</origin.groupId>
-    <origin.artifactId>moquette-broker</origin.artifactId>
-  </properties>
-
-</project>
diff --git a/org.java-websocket.java-websocket/NOTICE b/org.java-websocket.java-websocket/NOTICE
deleted file mode 100644
index 130ea35..0000000
--- a/org.java-websocket.java-websocket/NOTICE
+++ /dev/null
@@ -1,21 +0,0 @@
-This content is produced and maintained by the openHAB project.
-
-* Project home: https://www.openhab.org
-
-== Declared Project Licenses
-
-This program and the accompanying materials are made available under the terms
-of the Eclipse Public License 2.0 which is available at
-https://www.eclipse.org/legal/epl-2.0/.
-
-== Source Code
-
-https://github.com/openhab/openhab-osgiify
-
-== Third-party Content
-
-Java-WebSocket
-* License: MIT License
-* Project: https://tootallnate.github.io/Java-WebSocket
-* Source:  https://github.com/TooTallNate/Java-WebSocket
-
diff --git a/org.java-websocket.java-websocket/noSources.profile b/org.java-websocket.java-websocket/noSources.profile
deleted file mode 100644
index e69de29..0000000
diff --git a/org.java-websocket.java-websocket/osgi.bnd b/org.java-websocket.java-websocket/osgi.bnd
deleted file mode 100644
index 988ac78..0000000
--- a/org.java-websocket.java-websocket/osgi.bnd
+++ /dev/null
@@ -1,12 +0,0 @@
-Bundle-Description: OSGi-ified version of ${project.name}
-Bundle-Name: ${project.name}
-Bundle-License: MIT License
-Bundle-Version: ${project.version}
-Import-Package: \
-  *
-Export-Package: \
-  !NOTICE, \
-  *;version=${project.version}
--includeresource: \
-  NOTICE
-
diff --git a/org.java-websocket.java-websocket/pom.xml b/org.java-websocket.java-websocket/pom.xml
deleted file mode 100644
index ffd254e..0000000
--- a/org.java-websocket.java-websocket/pom.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.openhab.osgiify</groupId>
-    <artifactId>org.openhab.reactor.osgiify</artifactId>
-    <version>1.0.0</version>
-  </parent>
-
-  <artifactId>org.java-websocket.java-websocket</artifactId>
-  <version>1.3.2</version>
-
-  <name>Java Websocket Client</name>
-
-  <properties>
-    <origin.groupId>org.java-websocket</origin.groupId>
-    <origin.artifactId>java-websocket</origin.artifactId>
-  </properties>
-
-</project>
diff --git a/pom.xml b/pom.xml
index 3d0e838..268e296 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,6 @@
     <module>de.zazaz.iot.bosch.indego.bosch-indego-controller-lib</module>
     <module>fr.bmartel.http-endec</module>
     <module>fr.bmartel.jspeedtest</module>
-    <module>io.moquette.moquette-broker</module>
     <module>io.socket.engine.io-client</module>
     <module>io.socket.socket.io-client</module>
     <module>intel-iot-devkit.tinyb</module>
@@ -65,7 +64,6 @@
     <module>net.vrallev.ecc.ecc-25519-java</module>
     <module>net.wimpi.jamod</module>
     <module>org.cups4j.cups4j</module>
-    <module>org.java-websocket.java-websocket</module>
     <module>org.json.json</module>
     <module>org.pcap4j.pcap4j-core</module>
     <module>org.pcap4j.pcap4j-packetfactory-static</module>