diff --git a/Dockerfile b/Dockerfile
index 68828e3..e3cfea0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,10 +31,11 @@ RUN rpm -Uvh --nodeps https://mullvad.net/da/download/app/rpm/latest
 # Add rule to SELinux allowing modules to be loaded into custom kernel
 RUN setsebool -P domain_kernel_load_modules on
 
-COPY etc/environment /etc/environment
-COPY etc/systemd/zram-generator.conf /etc/systemd/zram-generator.conf
+COPY etc /etc
 COPY usr /usr
 
+RUN systemctl enable waydroid-choose-intel-gpu.service
+
 RUN cd /usr/bin && wget https://raw.githubusercontent.com/CachyOS/CachyOS-Settings/refs/heads/master/usr/bin/kerver && chmod +x kerver
 
 RUN rm -rf /tmp/* /var/* && mkdir -p /var/tmp && chmod -R 1777 /var/tmp && \
diff --git a/etc/systemd/system/waydroid-choose-intel-gpu.service b/etc/systemd/system/waydroid-choose-intel-gpu.service
new file mode 100644
index 0000000..5839f4b
--- /dev/null
+++ b/etc/systemd/system/waydroid-choose-intel-gpu.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Waydroid Intel GPU Selection Service
+After=multi-user.target
+Wants=multi-user.target
+
+[Service]
+Type=oneshot
+ExecStart=waydroid-choose-intel-gpu.sh
+RemainAfterExit=yes
+StandardOutput=journal
+StandardError=journal
+User=root
+
+[Install]
+WantedBy=multi-user.target