diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dc999fc5bc07778847bf5f37d76956bff6c32a26..22c017e9503ada0ab1323421da7c942983c3e4d2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,46 +2,31 @@ image: starcarr/libnx:latest
 
 variables:
   PACKAGE_FOLDER: "o2em"
-  LIBRARY_NAME: "o2em_libretro_switch.a"
-  NRO_NAME: "o2em.nro"
-  APP_TITLE: "O2EM libnx"
-
-cache:
-  key: ${CI_COMMIT_REF_SLUG}
-  paths:
-  - $PACKAGE_FOLDER
 
 stages:
-  - build
   - package
 
-build:
-  stage: build
-  script:
-    - rm -rf $PACKAGE_FOLDER
-    - mkdir $PACKAGE_FOLDER
-    - cp assets/overlay.cfg $PACKAGE_FOLDER/overlay.cfg
-    - cp assets/overlay.png $PACKAGE_FOLDER/overlay.png
-    - make platform=switch -j20
-    - git clone -b master https://git.m4xw.net/Switch/RetroArch/RetroArch.git --depth=1
-    - cp $LIBRARY_NAME RetroArch/libretro_switch.a 
-    - cp assets/icon.jpg RetroArch/icon.jpg
-    - cd RetroArch/ 
-    - mkdir romfs
-    - APP_TITLE="$APP_TITLE" make -f Makefile.switch -j20
-    - cp retroarch_switch.nro ../$PACKAGE_FOLDER/$NRO_NAME
-    - cp retroarch.cfg ../$PACKAGE_FOLDER/retroarch.cfg
-
 package:
   stage: package
+  image: starcarr/libnx:latest
   script:
-    - echo 'creating zip'
-  when: on_success
+    - sh build.sh $PACKAGE_FOLDER master
   artifacts:
     name: $PACKAGE_FOLDER
     paths:
     - $PACKAGE_FOLDER
   only:
-  - master
-
+    - master
 
+nightly:
+  stage: package
+  image: starcarr/libnx:nightly
+  script:
+    - sh build.sh $PACKAGE_FOLDER develop
+  artifacts:
+    name: $PACKAGE_FOLDER
+    expire_in: 24 hours
+    paths:
+    - $PACKAGE_FOLDER
+  except:
+    - master
diff --git a/build.sh b/build.sh
new file mode 100644
index 0000000000000000000000000000000000000000..8c8ee3f921ecc2ce6879a94650b9d078963bef56
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+PACKAGE_FOLDER=$1
+BRANCH=$2
+LIBRARY_NAME="o2em_libretro_switch.a"
+NRO_NAME="o2em.nro"
+APP_TITLE="O2EM libnx"
+
+mkdir $PACKAGE_FOLDER
+cp assets/overlay.cfg $PACKAGE_FOLDER/overlay.cfg
+cp assets/overlay.png $PACKAGE_FOLDER/overlay.png
+make platform=switch -j10
+git clone -b $BRANCH https://git.m4xw.net/Switch/RetroArch/RetroArch.git --depth=1
+cp $LIBRARY_NAME RetroArch/libretro_switch.a
+cp assets/icon.jpg RetroArch/icon.jpg
+cd RetroArch/
+mkdir romfs
+APP_TITLE="$APP_TITLE" make -f Makefile.switch -j10
+cp retroarch_switch.nro ../$PACKAGE_FOLDER/$NRO_NAME