diff --git a/Dockerfile b/Dockerfile
index da3994f..a38f30a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,16 @@
 FROM archlinux/base:latest
 
+COPY installation-scripts /tmp/installation-scripts
+RUN  /tmp/installation-scripts/00-pacman-mirror.sh
+
 RUN pacman --sync \
            --refresh \
            --noconfirm \
-           --sysupgrade go gcc make git which zip
+           --sysupgrade go gcc make git rpm-builder which zip
 
 ENV PATH="/root/.cargo/bin:/root/go/bin:${PATH}"
 
-COPY installation-scripts /tmp/installation-scripts
-RUN chmod +x /tmp/installation-scripts/* && \
-    for f in $(ls /tmp/installation-scripts); do /tmp/installation-scripts/$f; done && \
+RUN for f in {01-rustup.sh,02-github-release.sh,03-go-bindata.sh}; do /tmp/installation-scripts/$f; done && \
     rm --recursive --force /tmp/installation-scripts
 
 WORKDIR /workspace
\ No newline at end of file
diff --git a/installation-scripts/00-pacman-mirror.sh b/installation-scripts/00-pacman-mirror.sh
new file mode 100755
index 0000000..a38d91d
--- /dev/null
+++ b/installation-scripts/00-pacman-mirror.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# Initialize pacman-key ring
+pacman-key --init
+
+# Add GPG Key
+pacman-key --recv-keys 9B146D11A9ED6CA7E279EB1A852BCC170D81A982
+pacman-key --lsign 9B146D11A9ED6CA7E279EB1A852BCC170D81A982
+
+# Add additional pacman mirrors
+cat >> /etc/pacman.conf << 'EOF'
+
+[cs_any]
+Server = https://arch.cryptic.systems/any/
+
+[cs_x86_64]
+Server = https://arch.cryptic.systems/x86_64/
+EOF
diff --git a/installation-scripts/04-github-release.sh b/installation-scripts/02-github-release.sh
similarity index 100%
rename from installation-scripts/04-github-release.sh
rename to installation-scripts/02-github-release.sh
diff --git a/installation-scripts/02-rpm-builder.sh b/installation-scripts/02-rpm-builder.sh
deleted file mode 100755
index 1d54600..0000000
--- a/installation-scripts/02-rpm-builder.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-set -e
-
-VERSION=v0.3.1
-TMP_DIR=$(mktemp -d)
-
-git clone --branch ${VERSION} https://github.com/Richterrettich/rpm-builder.git ${TMP_DIR} &&
-  make -C ${TMP_DIR} build_linux &&
-  cp ${TMP_DIR}/target/x86_64-unknown-linux-musl/release/rpm-builder /usr/local/bin/rpm-builder