diff --git a/.ci/script.sh b/.ci/script.sh
index 15e7f8cf..0aa56d50 100755
--- a/.ci/script.sh
+++ b/.ci/script.sh
@@ -6,7 +6,21 @@ if [ "$FLATPAK" ]; then
 	mkdir -p build-flatpak
 	cd build-flatpak
 
-	flatpak-builder --ccache --repo=repo --subject="Build of Nheko ${VERSION} `date`" app ../io.github.NhekoReborn.Nheko.json
+	flatpak-builder --ccache --repo=repo --subject="Build of Nheko ${VERSION} `date`" app ../io.github.NhekoReborn.Nheko.json &
+
+	# to prevent flatpak builder from timing out on arm, run it in the background and print something every minute for up to 30 minutes.
+	minutes=0
+	limit=30
+	while kill -0 $! >/dev/null 2>&1; do
+		if [ $minutes == $limit ]; then
+			break;
+		fi
+
+		minutes=$((minutes+1))
+
+		sleep 60
+	done
+
 	flatpak build-bundle repo nheko-${VERSION}-${ARCH}.flatpak io.github.NhekoReborn.Nheko master
 
 	mkdir ../artifacts
diff --git a/.travis.yml b/.travis.yml
index 1dc2feeb..eec32290 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -134,7 +134,7 @@ install:
     - export PATH=/usr/local/bin:${PATH}
 
 script:
-    - travis_wait ./.ci/script.sh
+    - ./.ci/script.sh
     - sed -i -e "s/VERSION_NAME_VALUE/${VERSION}/g" ./.ci/bintray-release.json || true
     - cp ./.ci/bintray-release.json .
 deploy: