diff --git a/.docker/intelmq-full/Dockerfile b/.docker/intelmq-full/Dockerfile
index 0ba5a94..849cf26 100644
--- a/.docker/intelmq-full/Dockerfile
+++ b/.docker/intelmq-full/Dockerfile
@@ -55,7 +55,7 @@ RUN useradd -d /opt/intelmq -U -s /bin/bash intelmq \
     && sudo chown -R intelmq:intelmq /opt/intelmq_persistence
 
 ### Install IntelMQ
-RUN pip3 install hug url-normalize geolib imbox jinja2 pyasn textx tld time-machine otxv2 \
+RUN pip3 install url-normalize geolib imbox jinja2 pyasn textx tld time-machine otxv2 \
     && pip3 install --force pymisp[fileobjects,openioc,virustotal]
 
 RUN cd /opt/intelmq \
@@ -66,7 +66,7 @@ RUN cd /opt/intelmq \
 
 ### Install IntelMQ-API
 RUN cd /opt/intelmq-api \
-    && python3 setup.py install
+    && pip3 install .
 
 ADD entrypoint.sh /opt/entrypoint.sh
 RUN chmod +x /opt/entrypoint.sh \
diff --git a/build.sh b/build.sh
index b9eb3d3..81e6711 100755
--- a/build.sh
+++ b/build.sh
@@ -12,7 +12,7 @@ echo Api       : $git_ref_api
 echo Build_date: $build_date
 
 # build static html
-cd ./intelmq-manager && python3 setup.py build && cd ..
+cd ./intelmq-manager && python3 -m pip install . && intelmq-manager-build && cd ..
 
 docker build --build-arg BUILD_DATE=$build_date \
     --build-arg VCS_REF="IntelMQ-Manager=$git_ref_manager" \
diff --git a/entrypoint.sh b/entrypoint.sh
index 1652e84..caa66f1 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -16,5 +16,5 @@ then
     export INTELMQ_TEST_EXOTIC=1
     nosetests3 /opt/intelmq/intelmq/tests
 else
-    cd /opt/intelmq-api && hug -m intelmq_api.serve -p8080
+    cd /opt/intelmq-api && uvicorn intelmq_api.main:app -p8080
 fi
diff --git a/intelmq b/intelmq
index 38c6e97..3a32cbe 160000
--- a/intelmq
+++ b/intelmq
@@ -1 +1 @@
-Subproject commit 38c6e971f9fd0d5fdbb89a4589e1b1167097a4a1
+Subproject commit 3a32cbe062e0d0499e18730339250a9f774f22ff
diff --git a/intelmq-api b/intelmq-api
index 87e82ff..6d4f34a 160000
--- a/intelmq-api
+++ b/intelmq-api
@@ -1 +1 @@
-Subproject commit 87e82ff3b0eec404804dd2a83d87a7b16d2b1d6b
+Subproject commit 6d4f34a37a63c195baf728bcaef53b7a643122cf
diff --git a/intelmq-manager b/intelmq-manager
index 6649d99..1367ea8 160000
--- a/intelmq-manager
+++ b/intelmq-manager
@@ -1 +1 @@
-Subproject commit 6649d99a757dac8fbf28192e453e25fb4e0b0056
+Subproject commit 1367ea86ba43cd4bbcfe6479f01cbe897e6a3698