diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d67a50560c92e815b5b779dd651f3b1dbb4f4250..689d32f438326dbb00197367f8e1c42c78f8b2d7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,6 @@ include:
     - local: "/ci/general.yml"
     - local: "/ci/test.yml"
     - local: "/ci/build_dist.yml"
-    - local: "/ci/build_docker.yml"
     - local: "/ci/pages.yml"
     - local: "/ci/deploy_pypi.yml"
     - local: "/ci/deploy.yml"
diff --git a/.gitmodules b/.gitmodules
index a7fa3c3c15f5415169a0f2b0ce67876831caf5f7..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,20 +0,0 @@
-[submodule "apps/official/AlekSIS-App-Chronos"]
-	path = apps/official/AlekSIS-App-Chronos
-	url = https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos
-	ignore = untracked
-[submodule "apps/official/AlekSIS-App-DashboardFeeds"]
-	path = apps/official/AlekSIS-App-DashboardFeeds
-	url = https://edugit.org/AlekSIS/Official/AlekSIS-App-DashboardFeeds
-	ignore = untracked
-[submodule "apps/official/AlekSIS-App-LDAP"]
-	path = apps/official/AlekSIS-App-LDAP
-	url = https://edugit.org/AlekSIS/official/AlekSIS-App-LDAP
-	ignore = untracked
-[submodule "apps/official/AlekSIS-App-Untis"]
-	path = apps/official/AlekSIS-App-Untis
-	url = https://edugit.org/AlekSIS/official/AlekSIS-App-Untis
-	ignore = untracked
-[submodule "apps/official/AlekSIS-App-Hjelp"]
-	path = apps/official/AlekSIS-App-Hjelp
-	url = https://edugit.org/AlekSIS/official/AlekSIS-App-Hjelp
-	ignore = untracked
diff --git a/apps/official/AlekSIS-App-Chronos b/apps/official/AlekSIS-App-Chronos
deleted file mode 160000
index 0be06de63d5f56eab6f9c1e814a82c69c318ffd1..0000000000000000000000000000000000000000
--- a/apps/official/AlekSIS-App-Chronos
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0be06de63d5f56eab6f9c1e814a82c69c318ffd1
diff --git a/apps/official/AlekSIS-App-DashboardFeeds b/apps/official/AlekSIS-App-DashboardFeeds
deleted file mode 160000
index 1cf18722553a016b8a9165de556bb00329f10173..0000000000000000000000000000000000000000
--- a/apps/official/AlekSIS-App-DashboardFeeds
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1cf18722553a016b8a9165de556bb00329f10173
diff --git a/apps/official/AlekSIS-App-Hjelp b/apps/official/AlekSIS-App-Hjelp
deleted file mode 160000
index 0898d261d95df2079767cf58a316d4804a2e230e..0000000000000000000000000000000000000000
--- a/apps/official/AlekSIS-App-Hjelp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0898d261d95df2079767cf58a316d4804a2e230e
diff --git a/apps/official/AlekSIS-App-LDAP b/apps/official/AlekSIS-App-LDAP
deleted file mode 160000
index 412631fb73abf30c931c3f1951def102720e3f51..0000000000000000000000000000000000000000
--- a/apps/official/AlekSIS-App-LDAP
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 412631fb73abf30c931c3f1951def102720e3f51
diff --git a/apps/official/AlekSIS-App-Untis b/apps/official/AlekSIS-App-Untis
deleted file mode 160000
index 2f22b31c19a0bd7f479eac7f11d0943f8e297bae..0000000000000000000000000000000000000000
--- a/apps/official/AlekSIS-App-Untis
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2f22b31c19a0bd7f479eac7f11d0943f8e297bae
diff --git a/ci/general.yml b/ci/general.yml
index 03d096526e19baf680d381ef16ce9cfca716fd6b..216fb757c7b984c5910c40c8a2395b7447fbac2f 100644
--- a/ci/general.yml
+++ b/ci/general.yml
@@ -9,10 +9,10 @@ variables:
   GIT_SUBMODULE_STRATEGY: recursive
   PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
   FF_NETWORK_PER_BUILD: "true"
-  POETRY_REPOSITORIES_GITLAB_URL: "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/pypi"
-  POETRY_HTTP_BASIC_GITLAB_USERNAME: gitlab-ci-token
-  POETRY_HTTP_BASIC_GITLAB_PASSWORD: "$CI_JOB_TOKEN"
-  POETRY_PYPI_TOKEN_PYPI: "$PYPI_TOKEN"
+  POETRY_REPOSITORIES_GITLAB_URL: "$CI_API_V4_URL/projects/461/packages/pypi"
+  POETRY_HTTP_BASIC_GITLAB_USERNAME: aleksis
+  POETRY_HTTP_BASIC_GITLAB_PASSWORD: "$GITLAB_PUBLISH_TOKEN"
+  POETRY_PYPI_TOKEN_PYPI: "$GITLAB_PUBLISH_TOKEN"
 
 cache:
   key:
diff --git a/pyproject.toml b/pyproject.toml
index 9828956638a9e66c7f0c260f82c1673e29300701..524a896064fd0f458583d335e3bd5dfd6a113c6f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,5 @@
 [tool.poetry]
-name = "AlekSIS"
+name = "AlekSIS-Core"
 version = "2.0a3.dev0"
 packages = [
     { include = "aleksis" }
@@ -12,8 +12,8 @@ authors = ["Dominik George <dominik.george@teckids.org>", "Julian Leucker <leuck
 maintainers = ["Jonathan Weth <wethjo@katharineum.de>", "Dominik George <dominik.george@teckids.org>"]
 license = "EUPL-1.2-or-later"
 homepage = "https://aleksis.org/"
-repository = "https://edugit.org/AlekSIS/official/AlekSIS"
-documentation = "https://aleksis.org/AlekSIS/docs/html/"
+repository = "https://edugit.org/AlekSIS/official/AlekSIS-Core"
+documentation = "https://aleksis.org/AlekSIS-Core/docs/html/"
 keywords = ["SIS", "education", "school", "digitisation", "school apps"]
 classifiers = [
     "Development Status :: 3 - Alpha",