diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dee67c486a123da6e94de72aad4273668de748d6..85fcc436a2d7ba8cb47f7a40e455aace5ff1ea5b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,20 +9,20 @@ services:
 before_script:
   - apk add --no-cache curl
   - docker info
-  - docker login -u $USER -p $PASSWD
+  - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
 
 stable:
   stage: publish
   script:
-    - docker build -t $USER/lakka:latest .
-    - docker push $USER/lakka:latest
+    - docker build -t git.m4xw.net:4567/switch/lakka/lakka-docker-image:latest .
+    - docker push git.m4xw.net:4567/switch/lakka/lakka-docker-image:latest
   only:
     - master
 
 nightly:
   stage: publish
   script:
-    - docker build -t $USER/lakka:nightly .
-    - docker push $USER/lakka:nightly
+    - docker build -t git.m4xw.net:4567/switch/lakka/lakka-docker-image:nightly .
+    - docker push git.m4xw.net:4567/switch/lakka/lakka-docker-image:nightly
   only:
     - develop
diff --git a/Dockerfile b/Dockerfile
index b3d0e3e1a402cd18c41cbbaccc01420116b80792..983a829dfa9ebc3be0245e89222a382a000229de 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -53,6 +53,9 @@ RUN apt-get upgrade -y \
 		gcc-arm-linux-gnueabi \
 		gcc-aarch64-linux-gnu \
 		libasound2 \
+		xxd \
+		meson \
+		ninja-build \
 	&& rm -rf /var/lib/apt/lists/*
 
 RUN echo "developer:developer" | chpasswd && adduser developer sudo
@@ -60,6 +63,7 @@ RUN echo "developer:developer" | chpasswd && adduser developer sudo
 ENV HOME=/developer
 ENV DISTRO=Lakka
 ENV PROJECT=Switch
+ENV DEVICE=L4T
 ENV ARCH=aarch64
 
 USER root