diff --git a/Containerfile b/Containerfile
index 4f0b930..7f9278e 100644
--- a/Containerfile
+++ b/Containerfile
@@ -1,14 +1,11 @@
 ARG SWAYVNC_VERSION=latest
-ARG GECKODRIVER_VERSION=0.31.0
 FROM ghcr.io/bbusse/swayvnc:${SWAYVNC_VERSION}
 LABEL maintainer="Björn Busse <bj.rn@baerlin.eu>"
 LABEL org.opencontainers.image.source https://github.com/bbusse/swayvnc-firefox
 
-ARG GECKODRIVER_VERSION
-
 ENV ARCH="x86_64" \
     USER="firefox-user" \
-    APK_ADD="libc-dev libffi-dev libxkbcommon-dev gcc git python3 python3-dev py3-pip py3-wheel firefox" \
+    APK_ADD="libc-dev libffi-dev libxkbcommon-dev gcc geckodriver@testing git python3 python3-dev py3-pip py3-wheel firefox" \
     APK_DEL=""
 
 USER root
@@ -16,6 +13,7 @@ USER root
 # Add application user and application
 # Cleanup: Remove files and users
 RUN addgroup -S $USER && adduser -S $USER -G $USER \
+    && echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
     # https://gitlab.alpinelinux.org/alpine/aports/-/issues/11768
     && sed -i -e 's/https/http/' /etc/apk/repositories \
     # Add packages
@@ -27,21 +25,15 @@ RUN addgroup -S $USER && adduser -S $USER -G $USER \
       /usr/includes/* \
       /var/cache/apk/* \
 
-    # Get geckodriver
-    && wget https://github.com/mozilla/geckodriver/releases/download/v${GECKODRIVER_VERSION}/geckodriver-v${GECKODRIVER_VERSION}-linux64.tar.gz \
-    && tar -xzf geckodriver-v${GECKODRIVER_VERSION}-linux64.tar.gz -C /usr/bin \
-    && rm geckodriver-v${GECKODRIVER_VERSION}-linux64.tar.gz \
-    && geckodriver --version \
-
     # Add latest webdriver-util script for firefox automation
     && wget -P /usr/local/bin https://raw.githubusercontent.com/bbusse/webdriver-util/main/webdriver_util.py \
     && chmod +x /usr/local/bin/webdriver_util.py \
     && wget -O /tmp/requirements_webdriver.txt https://raw.githubusercontent.com/bbusse/webdriver-util/main/requirements.txt \
 
-    # Add stream-controller for stream handling
-    && wget -P /usr/local/bin https://raw.githubusercontent.com/bbusse/stream-controller/main/controller.py \
+    # Add iss-display-controller for view handling
+    && wget -P /usr/local/bin https://raw.githubusercontent.com/OpsBoost/iss-display-controller/dev/controller.py \
     && chmod +x /usr/local/bin/controller.py \
-    && wget -O /tmp/requirements_controller.txt https://raw.githubusercontent.com/bbusse/stream-controller/main/requirements.txt \
+    && wget -O /tmp/requirements_controller.txt https://raw.githubusercontent.com/OpsBoost/iss-display-controller/dev/requirements.txt \
 
     # Run controller.py
     && echo "exec controller.py --stream-source=vnc-browser --debug=$DEBUG" >> /etc/sway/config.d/firefox