diff --git a/.gitlab-ci-scripts/upload.sh b/.gitlab-ci-scripts/upload.sh
index 5134fc90c5837bc20a43e52d364ca63c5fe37d92..45ecda41347220be74d96d45e453448b4fd75b14 100755
--- a/.gitlab-ci-scripts/upload.sh
+++ b/.gitlab-ci-scripts/upload.sh
@@ -1,3 +1,7 @@
+
+#REPO_TARGET="$(if echo $CI_COMMIT_TAG | grep -q '-'; then echo '/'; else echo '/prerel'; fi)"
+REPO_TARGET="/prerel"
+
 # ssh-key-script
 [ -e /tmp/ssh-private-keys/${REPO_USER} ] && {
   eval $(ssh-agent -s)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5a330124c4376c70af62a4b7900c11ba2f486c73..0fdd5b40aba932ebdff7caaf8f0f4c9e79b2ec50 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -68,7 +68,6 @@ prerelease:
     GIT_DEPTH: 0
     REPO_HOST: repo.data.kit.edu
     REPO_USER: cicd
-    REPO_TARGET: /prerel
   script:
     - .gitlab-ci-scripts/goreleaser.sh
     - .gitlab-ci-scripts/upload.sh
diff --git a/.goreleaser-release.yml b/.goreleaser-release.yml
index a2b1c0ccbd82c032ec450fe25cd11be56634f708..61e18305ab39bb25f837127680dc5842ac16a56c 100644
--- a/.goreleaser-release.yml
+++ b/.goreleaser-release.yml
@@ -11,8 +11,8 @@ builds:
       - CGO_ENABLED=0
     goos:
       - linux
-    gcflags:
-      - all=-trimpath={{.Env.GOPATH}}
+    flags:
+      - -trimpath
     mod_timestamp: '{{ .CommitTimestamp }}'
   - id: setup
     main: ./cmd/mytoken-server/mytoken-setup
@@ -21,8 +21,8 @@ builds:
       - CGO_ENABLED=0
     goos:
       - linux
-    gcflags:
-      - all=-trimpath={{.Env.GOPATH}}
+    flags:
+      - -trimpath
     mod_timestamp: '{{ .CommitTimestamp }}'
   - id: migratedb
     main: ./cmd/mytoken-server/mytoken-migratedb
@@ -31,8 +31,8 @@ builds:
       - CGO_ENABLED=0
     goos:
       - linux
-    gcflags:
-      - all=-trimpath={{.Env.GOPATH}}
+    flags:
+      - -trimpath
     mod_timestamp: '{{ .CommitTimestamp }}'
 archives:
   - replacements:
@@ -50,7 +50,7 @@ nfpms:
     file_name_template: "{{ .PackageName }}_{{ .Version }}_{{ .Arch }}"
     builds:
       - server
-    homepage: https://mytoken-doc.data.kit.edu/server/intro
+    homepage: https://mytoken-docs.data.kit.edu/server
     maintainer: Gabriel Zachmann <gabriel.zachmann@kit.edu>
     description: Mytoken is a central web service with the goal to easily obtain OpenID Connect access tokens across devices.
     license: MIT
@@ -80,7 +80,7 @@ nfpms:
     file_name_template: "{{ .PackageName }}_{{ .Version }}_{{ .Arch }}"
     builds:
       - setup
-    homepage: https://mytoken-doc.data.kit.edu/server/intro
+    homepage: https://mytoken-docs.data.kit.edu/server
     maintainer: Gabriel Zachmann <gabriel.zachmann@kit.edu>
     description: A setup utility for the mytoken-server
     license: MIT
@@ -102,7 +102,7 @@ nfpms:
     file_name_template: "{{ .PackageName }}_{{ .Version }}_{{ .Arch }}"
     builds:
       - migratedb
-    homepage: https://mytoken-doc.data.kit.edu/server/intro
+    homepage: https://mytoken-docs.data.kit.edu/server
     maintainer: Gabriel Zachmann <gabriel.zachmann@kit.edu>
     description: A tool for migrating the database between versions
     license: MIT
@@ -173,7 +173,11 @@ checksum:
 snapshot:
   name_template: "{{ .Tag }}-next"
 release:
+  prerelease: auto
   draft: true
+  github:
+    owner: oidc-mytoken
+    name: server
   name_template: "{{.ProjectName}} {{.Version}}"
 changelog:
   sort: asc