diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8229fdb2d..02618a2e7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,6 +10,10 @@ stages:
   - test
   - deploy
 
+# For some reason, GitLab CI prunes the contents of the submodules so we need to restore them.
+before_script:
+  - git submodule foreach git checkout .
+
 # Stage: prepare
 ##############################################################################
 
@@ -60,6 +64,9 @@ packages:
     - dnf -y --refresh install libwebsockets-devel libxil-devel
   script:
     - make dist
+    - make rpm-libwebsockets
+    - make rpm-libxil
+    - rpm -i build/release/packaging/rpm/RPMS/x86_64/*.rpm
     - make rpm-villas-node
   only:
     - tags
diff --git a/packaging/Makefile.inc b/packaging/Makefile.inc
index b9d010965..e2fb681c6 100644
--- a/packaging/Makefile.inc
+++ b/packaging/Makefile.inc
@@ -25,7 +25,7 @@ TAROPTS = --exclude-ignore-recursive=.distignore --transform='s|^\.|villas-node-
 TAR_VILLAS = $(BUILDDIR)/packaging/villas-node-$(VERSION_NUM)-1.$(GIT_BRANCH)_$(subst -,_,$(VARIANT)).$(shell date +%Y%m%d)git$(GIT_REV).tar.gz
 
 DEPLOY_USER ?= root
-DEPLOY_HOST ?= 188.166.166.227
+DEPLOY_HOST ?= villas.fein-aachen.org
 DEPLOY_PATH ?= /var/www/villas/node
 
 DOCKER_REGISTRY ?= docker.io