diff --git a/.github/workflows/buildpackage.yml b/.github/workflows/buildpackage.yml
index 444fff4..0e04461 100644
--- a/.github/workflows/buildpackage.yml
+++ b/.github/workflows/buildpackage.yml
@@ -19,6 +19,8 @@ jobs:
       - uses: actions/checkout@v2.1.0
         with:
           submodules: true
+      - run: |
+          git switch -c master
 
       - name: COMPILE
         uses: uraimo/run-on-arch-action@v2.1.1
@@ -60,6 +62,8 @@ jobs:
       - uses: actions/checkout@v2.1.0
         with:
           submodules: true
+      - run: |
+          git switch -c master
 
       - name: COMPILE
         uses: ./.github/debian_bullseye/
diff --git a/.travis.yml b/.travis.yml
index 7a3c85d..7d5742c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,8 @@ before_install:
 script:
   - DEPS="mk-build-deps -i -t 'apt-get --no-install-recommends --yes'"
   - CLEAN="rm -f superslicer-build-deps_*"
-  - BUILD="gbp buildpackage -uc -us -J1 -j1 --git-submodules" 
+  - GBPOPTS="--git-export-dir=artifacts --git-upstream-tree=SLOPPY"
+  - BUILD="gbp buildpackage -uc -us -J1 -j1 --git-submodules $GBPOPTS"
   - docker run -v $(pwd):/root ao:travis su -l -c "$DEPS && $CLEAN && $BUILD"
 
 deploy:
@@ -31,6 +32,6 @@ deploy:
     tags: true
   overwrite: true
   file_glob: true
-  file: ../*.{deb,xz,gz,dsc,build,buildinfo,changes}
+  file: artifacts/*.{deb,xz,gz,dsc,build,buildinfo,changes}
   prerelease: true
   target_commitish: master