diff --git a/.github/workflows/lockdown.yml b/.github/workflows/lockdown.yml
index 8aecfe2ee..4243614d4 100644
--- a/.github/workflows/lockdown.yml
+++ b/.github/workflows/lockdown.yml
@@ -16,7 +16,7 @@ jobs:
         with:
           pr-comment: 'Hi! Thank you for your contribution.
 
-          This repo is only a mirror and unfortunately we can''t accept PRs made here. Please re-submit your changes to [our Gitea instance](https://kolaente.dev/vikunja/api/pulls).
+          This repo is only a mirror and unfortunately we can''t accept PRs made here. Please re-submit your changes to [our Gitea instance](https://kolaente.dev/vikunja/vikunja/pulls).
 
           Also check out the [contribution guidelines](https://vikunja.io/docs/development/#pull-requests).
 
diff --git a/README.md b/README.md
index d48b721f3..dad4ade91 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
 <img src="https://vikunja.io/images/vikunja-logo.svg" alt="" style="display: block;width: 50%;margin: 0 auto;" width="50%"/>
 
-[![Build Status](https://drone.kolaente.de/api/badges/vikunja/api/status.svg)](https://drone.kolaente.de/vikunja/api)
+[![Build Status](https://drone.kolaente.de/api/badges/vikunja/vikunjaa/status.svg)](https://drone.kolaente.de/vikunja/vikunja)
 [![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](LICENSE)
 [![Download](https://img.shields.io/badge/download-v0.22.1-brightgreen.svg)](https://dl.vikunja.io)
-[![Docker Pulls](https://img.shields.io/docker/pulls/vikunja/api.svg)](https://hub.docker.com/r/vikunja/api/)
+[![Docker Pulls](https://img.shields.io/docker/pulls/vikunja/vikunja.svg)](https://hub.docker.com/r/vikunja/vikunja/)
 [![Swagger Docs](https://img.shields.io/badge/swagger-docs-brightgreen.svg)](https://try.vikunja.io/api/v1/docs)
-[![Go Report Card](https://goreportcard.com/badge/kolaente.dev/vikunja/api)](https://goreportcard.com/report/kolaente.dev/vikunja/api)
+[![Go Report Card](https://goreportcard.com/badge/kolaente.dev/vikunja/vikunja)](https://goreportcard.com/report/kolaente.dev/vikunja/vikunja)
 
 # Vikunja API
 
diff --git a/config.yml.sample b/config.yml.sample
index e155e5da2..5b5597668 100644
--- a/config.yml.sample
+++ b/config.yml.sample
@@ -296,7 +296,7 @@ auth:
   # auth service accordingly if you're using the default vikunja frontend.
   # The frontend will automatically provide the api with the redirect url, composed from the current url where it's hosted.
   # If you want to use the desktop client with openid, make sure to allow redirects to `127.0.0.1`.
-  # Take a look at the [default config file](https://kolaente.dev/vikunja/api/src/branch/main/config.yml.sample) for more information about how to configure openid authentication.
+  # Take a look at the [default config file](https://kolaente.dev/vikunja/vikunja/src/branch/main/config.yml.sample) for more information about how to configure openid authentication.
   openid:
     # Enable or disable OpenID Connect authentication
     enabled: false
@@ -343,7 +343,7 @@ defaultsettings:
   default_project_id: 0
   # Start of the week for the user. `0` is sunday, `1` is monday and so on.
   week_start: 0
-  # The language of the user interface. Must be an ISO 639-1 language code followed by an ISO 3166-1 alpha-2 country code. Check https://kolaente.dev/vikunja/frontend/src/branch/main/src/i18n/lang for a list of possible languages. Will default to the browser language the user uses when signing up.
+  # The language of the user interface. Must be an ISO 639-1 language code followed by an ISO 3166-1 alpha-2 country code. Check https://kolaente.dev/vikunja/vikunja/frontend/src/branch/main/src/i18n/lang for a list of possible languages. Will default to the browser language the user uses when signing up.
   language: <unset>
   # The time zone of each individual user. This will affect when users get reminders and overdue task emails.
   timezone: <time zone set at service.timezone>
diff --git a/docs/content/doc/development/test.md b/docs/content/doc/development/test.md
index 247033283..936014129 100644
--- a/docs/content/doc/development/test.md
+++ b/docs/content/doc/development/test.md
@@ -91,7 +91,7 @@ fixtures other than db fixtures (like files).
 ## Frontend tests
 
 The frontend has end to end tests with Cypress that use a Vikunja instance and drive a browser against it.
-Check out the docs [in the frontend repo](https://kolaente.dev/vikunja/frontend/src/branch/main/cypress/README.md) about how they work and how to get them running.
+Check out the docs [in the frontend repo](https://kolaente.dev/vikunja/vikunja/src/branch/main/frontend/cypress/README.md) about how they work and how to get them running.
 
 ### Unit Tests
 
diff --git a/docs/content/doc/setup/config.md b/docs/content/doc/setup/config.md
index dc71c8a88..1ad728c00 100644
--- a/docs/content/doc/setup/config.md
+++ b/docs/content/doc/setup/config.md
@@ -32,7 +32,7 @@ first:
 Vikunja supports using `toml`, `yaml`, `hcl`, `ini`, `json`, envfile, env variables and Java Properties files.
 We recommend yaml or toml, but you're free to use whatever you want.
 
-Vikunja provides a default [`config.yml`](https://kolaente.dev/vikunja/api/src/branch/main/config.yml.sample) file which you can use as a starting point.
+Vikunja provides a default [`config.yml`](https://kolaente.dev/vikunja/vikunja/src/branch/main/config.yml.sample) file which you can use as a starting point.
 
 # Config file locations
 
@@ -1161,7 +1161,7 @@ If the email is not public in those cases, authenticating will fail.
 **Note 2:** The frontend expects to be redirected after authentication by the third party
 to <frontend-url>/auth/openid/<auth key>. Please make sure to configure the redirect url with your third party
 auth service accordingly if you're using the default vikunja frontend.
-Take a look at the [default config file](https://kolaente.dev/vikunja/api/src/branch/main/config.yml.sample) for more information about how to configure openid authentication.
+Take a look at the [default config file](https://kolaente.dev/vikunja/vikunja/src/branch/main/config.yml.sample) for more information about how to configure openid authentication.
 
 Default: `<empty>`
 
@@ -1320,7 +1320,7 @@ Environment path: `VIKUNJA_DEFAULTSETTINGS_WEEK_START`
 
 ### language
 
-The language of the user interface. Must be an ISO 639-1 language code followed by an ISO 3166-1 alpha-2 country code. Check https://kolaente.dev/vikunja/frontend/src/branch/main/src/i18n/lang for a list of possible languages. Will default to the browser language the user uses when signing up.
+The language of the user interface. Must be an ISO 639-1 language code followed by an ISO 3166-1 alpha-2 country code. Check https://kolaente.dev/vikunja/vikunja/src/branch/main/frontend/src/i18n/lang for a list of possible languages. Will default to the browser language the user uses when signing up.
 
 Default: `<unset>`
 
diff --git a/docs/content/doc/setup/openid-examples.md b/docs/content/doc/setup/openid-examples.md
index 78a45e57e..3f7d37ca6 100644
--- a/docs/content/doc/setup/openid-examples.md
+++ b/docs/content/doc/setup/openid-examples.md
@@ -11,7 +11,7 @@ menu:
 # OpenID example configurations
 
 On this page you will find examples about how to set up Vikunja with a third-party OpenID provider.
-To add another example, please [edit this document](https://kolaente.dev/vikunja/api/src/branch/main/docs/content/doc/setup/openid-examples.md) and send a PR.
+To add another example, please [edit this document](https://kolaente.dev/vikunja/vikunja/src/branch/main/docs/content/doc/setup/openid-examples.md) and send a PR.
 
 {{< table_of_contents >}}
 
diff --git a/docs/content/doc/usage/caldav.md b/docs/content/doc/usage/caldav.md
index b8b8da35f..ba39561af 100644
--- a/docs/content/doc/usage/caldav.md
+++ b/docs/content/doc/usage/caldav.md
@@ -76,7 +76,7 @@ Vikunja **currently does not** support these properties:
 ### Not working
 
 * [Thunderbird (68)](https://www.thunderbird.net/)
-* iOS CalDAV Sync (See [#753](https://kolaente.dev/vikunja/api/issues/753))
+* iOS CalDAV Sync (See [#753](https://kolaente.dev/vikunja/vikunja/issues/753))
 
 ## Dev logs
 
diff --git a/docs/content/doc/usage/webhooks.md b/docs/content/doc/usage/webhooks.md
index 9f2bc0eb9..ea9bc2b43 100644
--- a/docs/content/doc/usage/webhooks.md
+++ b/docs/content/doc/usage/webhooks.md
@@ -22,7 +22,7 @@ Check out [the api docs](https://try.vikunja.io/api/v1/docs#tag/webhooks) for in
 
 ## Available events and their payload
 
-All events registered as webhook events in [the event listeners definition](https://kolaente.dev/vikunja/api/src/branch/main/pkg/models/listeners.go#L69) can be used as webhook target.
+All events registered as webhook events in [the event listeners definition](https://kolaente.dev/vikunja/vikunja/src/branch/main/pkg/models/listeners.go#L69) can be used as webhook target.
 
 A webhook payload will look similar to this:
 
diff --git a/frontend/README.md b/frontend/README.md
index 63aa0639e..e1465552b 100644
--- a/frontend/README.md
+++ b/frontend/README.md
@@ -2,7 +2,7 @@
 
 > The todo app to organize your life.
 
-[![Build Status](https://drone.kolaente.de/api/badges/vikunja/frontend/status.svg)](https://drone.kolaente.de/vikunja/frontend)
+[![Build Status](https://drone.kolaente.de/api/badges/vikunja/vikunja/status.svg)](https://drone.kolaente.de/vikunja/vikunja)
 [![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](LICENSE)
 [![Download](https://img.shields.io/badge/download-v0.22.1-brightgreen.svg)](https://dl.vikunja.io)
 [![Translation](https://badges.crowdin.net/vikunja/localized.svg)](https://crowdin.com/project/vikunja)
@@ -17,7 +17,7 @@ If you find any security-related issues you don't want to disclose publicly, ple
 
 ## Docker
 
-There is a [docker image available](https://hub.docker.com/r/vikunja/api) with support for http/2 and aggressive caching enabled.
+There is a [docker image available](https://hub.docker.com/r/vikunja/vikunja) with support for http/2 and aggressive caching enabled.
 In order to build it from sources run the command below. (Docker >= v19.03)
 
 ```shell
diff --git a/frontend/package.json b/frontend/package.json
index 21cb98b6a..ef780d883 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -6,10 +6,10 @@
   "license": "AGPL-3.0-or-later",
   "repository": {
     "type": "git",
-    "url": "https://kolaente.dev/vikunja/frontend"
+    "url": "https://kolaente.dev/vikunja/vikunja"
   },
   "bugs": {
-    "url": "https://kolaente.dev/vikunja/frontend/issues"
+    "url": "https://kolaente.dev/vikunja/vikunja/issues"
   },
   "homepage": "https://vikunja.io/",
   "funding": "https://opencollective.com/vikunja",
diff --git a/frontend/scripts/deploy-preview-netlify.mjs b/frontend/scripts/deploy-preview-netlify.mjs
index f35df2776..61b0bda05 100644
--- a/frontend/scripts/deploy-preview-netlify.mjs
+++ b/frontend/scripts/deploy-preview-netlify.mjs
@@ -15,7 +15,7 @@ const siteId = process.env.NETLIFY_SITE_ID
 const branchSlug = createSlug(process.env.DRONE_SOURCE_BRANCH)
 const prNumber = process.env.DRONE_PULL_REQUEST
 
-const prIssueCommentsUrl = `https://kolaente.dev/api/v1/repos/vikunja/frontend/issues/${prNumber}/comments`
+const prIssueCommentsUrl = `https://kolaente.dev/api/v1/repos/vikunja/vikunja/issues/${prNumber}/comments`
 const alias = `${prNumber}-${branchSlug}`.substring(0,37)
 const fullPreviewUrl = `https://${alias}--vikunja-frontend-preview.netlify.app`
 
diff --git a/pkg/routes/routes.go b/pkg/routes/routes.go
index e9133c8e1..3c450473b 100644
--- a/pkg/routes/routes.go
+++ b/pkg/routes/routes.go
@@ -218,7 +218,7 @@ func registerAPIRoutes(a *echo.Group) {
 
 	// Echo does not unescape url path params by default. To make sure values bound as :param in urls are passed
 	// properly to handlers, we use this middleware to unescape them.
-	// See https://kolaente.dev/vikunja/api/issues/1224
+	// See https://kolaente.dev/vikunja/vikunja/issues/1224
 	// See https://github.com/labstack/echo/issues/766
 	a.Use(func(next echo.HandlerFunc) echo.HandlerFunc {
 		return func(c echo.Context) error {