diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 8fa134d4..c43ced47 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -16,6 +16,6 @@ Additional Guidelines:
 
 - Ensure your code follows established coding conventions
 - Include relevant tests and documentation updates.
-- If no one reviews your PR within a few days, please @-mention aklos.
+- If no one reviews your PR within a few days, please @-mention a-klos.
 
 Thank you for your contribution!
diff --git a/.gitmodules b/.gitmodules
index 7e0c0e1c..5ccdff12 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,7 +2,7 @@
 
 [submodule "rag-infrastructure"]
 	path = rag-infrastructure
-	url = git@ssh.dev.azure.com:v3/schwarzit-wiking/schwarzit.rag-template-sit-stackit/rag-infrastructure
+	url = git@github.com:stackitcloud/rag-infrastructure.git
 [submodule "rag-core-library"]
 	path = rag-core-library
-	url = git@ssh.dev.azure.com:v3/schwarzit-wiking/schwarzit.rag-template-sit-stackit/rag-core-library
+	url = git@github.com:stackitcloud/rag-core-library.git
diff --git a/build-and-test.yml b/build-and-test.yml
deleted file mode 100644
index f0413889..00000000
--- a/build-and-test.yml
+++ /dev/null
@@ -1,132 +0,0 @@
-pr:
-- develop
-- main
-
-pool:
-  vmImage: "ubuntu-latest"
-
-variables:
-- name: DOCKER_IMAGE_NAME
-  value: temp:$(Build.SourceBranchName)-$(Build.BuildId)
-
-stages:
-- stage: Build
-  jobs:
-  - job: BuildAndTestAdminBackend
-    steps:
-    - task: InstallSSHKey@0
-      displayName: Install SSH Key
-      inputs:
-        sshKeySecureFile: "id_rsa"
-        knownHostsEntry: "ssh.dev.azure.com"
-    - script: |
-        old_url="https://schwarzit-wiking@dev.azure.com/schwarzit-wiking/schwarzit.rag-template-sit-stackit/_git/full-use-case-example"
-        new_url="git@ssh.dev.azure.com:v3/schwarzit-wiking/schwarzit.rag-template-sit-stackit/full-use-case-example"
-
-        sed -i "s|$old_url|$new_url|g" $(Build.SourcesDirectory)/.git/config
-        ls $(Build.SourcesDirectory)/rag-infrastructure
-        git submodule init
-        git submodule update
-        git pull
-
-        docker build -t $DOCKER_IMAGE_NAME --build-arg dev=1 --build-arg TAG=debug -f admin-backend/Dockerfile .
-      displayName: "Building docker image."
-    # Note that the pyproject.toml is already copied into the docker image. Also note that copy
-    # pasting the whole /app folder will overwrite the existing .venv folder in the docker image
-    - script: |
-        docker run --rm --entrypoint make $DOCKER_IMAGE_NAME lint
-        LINTING_EXIT_CODE=$(echo $?)
-        echo "LINTING_EXIT_CODE is equal to '${LINTING_EXIT_CODE}'."
-        echo "##vso[task.setvariable variable=LINTING_EXIT_CODE]$LINTING_EXIT_CODE"
-      displayName: "Generating lint report."
-    - script: |
-        docker run --rm --entrypoint make $DOCKER_IMAGE_NAME test
-      displayName: "Running unit tests"
-    - script: |
-        echo "LINTING_EXIT_CODE is equal to '${LINTING_EXIT_CODE}'."
-        if [ $LINTING_EXIT_CODE -eq 0 ]; then
-          echo "Linting successful ==> continuing pipeline ..."
-        else
-            echo "Linting failed ==> aborting pipeline ..."
-          exit $LINTING_EXIT_CODE
-        fi
-      displayName: "Linting successful check"
-  - job: BuildAndTestDocumentExtractor
-    steps:
-    - task: InstallSSHKey@0
-      displayName: Install SSH Key
-      inputs:
-        sshKeySecureFile: "id_rsa"
-        knownHostsEntry: "ssh.dev.azure.com"
-    - script: |
-        old_url="https://schwarzit-wiking@dev.azure.com/schwarzit-wiking/schwarzit.rag-template-sit-stackit/_git/full-use-case-example"
-        new_url="git@ssh.dev.azure.com:v3/schwarzit-wiking/schwarzit.rag-template-sit-stackit/full-use-case-example"
-
-        sed -i "s|$old_url|$new_url|g" $(Build.SourcesDirectory)/.git/config
-        ls $(Build.SourcesDirectory)/rag-infrastructure
-        git submodule init
-        git submodule update
-        git pull
-
-        docker build -t $DOCKER_IMAGE_NAME --build-arg dev=1 --build-arg TAG=debug -f document-extractor/Dockerfile .
-      displayName: "Building docker image."
-    # Note that the pyproject.toml is already copied into the docker image. Also note that copy
-    # pasting the whole /app folder will overwrite the existing .venv folder in the docker image
-    - script: |
-        docker run --rm --entrypoint make $DOCKER_IMAGE_NAME lint
-        LINTING_EXIT_CODE=$(echo $?)
-        echo "LINTING_EXIT_CODE is equal to '${LINTING_EXIT_CODE}'."
-        echo "##vso[task.setvariable variable=LINTING_EXIT_CODE]$LINTING_EXIT_CODE"
-      displayName: "Generating lint report."
-    - script: |
-        docker run --rm --entrypoint make $DOCKER_IMAGE_NAME test
-      displayName: "Running unit tests"
-    - script: |
-        echo "LINTING_EXIT_CODE is equal to '${LINTING_EXIT_CODE}'."
-        if [ $LINTING_EXIT_CODE -eq 0 ]; then
-          echo "Linting successful ==> continuing pipeline ..."
-        else
-            echo "Linting failed ==> aborting pipeline ..."
-          exit $LINTING_EXIT_CODE
-        fi
-      displayName: "Linting successful check"
-  - job: BuildAndTestRAGBackend
-    steps:
-    # TODO: fix pulling of submodules
-    - task: InstallSSHKey@0
-      displayName: Install SSH Key
-      inputs:
-        sshKeySecureFile: "id_rsa"
-        knownHostsEntry: "ssh.dev.azure.com"
-    - script: |
-        old_url="https://schwarzit-wiking@dev.azure.com/schwarzit-wiking/schwarzit.rag-template-sit-stackit/_git/full-use-case-example"
-        new_url="git@ssh.dev.azure.com:v3/schwarzit-wiking/schwarzit.rag-template-sit-stackit/full-use-case-example"
-
-        sed -i "s|$old_url|$new_url|g" $(Build.SourcesDirectory)/.git/config
-        ls $(Build.SourcesDirectory)/rag-infrastructure
-        git submodule init
-        git submodule update
-        git pull
-
-        docker build -t $DOCKER_IMAGE_NAME --build-arg dev=1 --build-arg TAG=debug -f rag-backend/Dockerfile .
-      displayName: "Building docker image."
-    # Note that the pyproject.toml is already copied into the docker image. Also note that copy
-    # pasting the whole /app folder will overwrite the existing .venv folder in the docker image
-    - script: |
-        docker run --rm --entrypoint make $DOCKER_IMAGE_NAME lint
-        LINTING_EXIT_CODE=$(echo $?)
-        echo "LINTING_EXIT_CODE is equal to '${LINTING_EXIT_CODE}'."
-        echo "##vso[task.setvariable variable=LINTING_EXIT_CODE]$LINTING_EXIT_CODE"
-      displayName: "Generating lint report."
-    - script: |
-        docker run --rm --entrypoint make $DOCKER_IMAGE_NAME test
-      displayName: "Running unit tests"
-    - script: |
-        echo "LINTING_EXIT_CODE is equal to '${LINTING_EXIT_CODE}'."
-        if [ $LINTING_EXIT_CODE -eq 0 ]; then
-          echo "Linting successful ==> continuing pipeline ..."
-        else
-            echo "Linting failed ==> aborting pipeline ..."
-          exit $LINTING_EXIT_CODE
-        fi
-      displayName: "Linting successful check"
diff --git a/rag-core-library b/rag-core-library
index 18e4fa96..2bfa7867 160000
--- a/rag-core-library
+++ b/rag-core-library
@@ -1 +1 @@
-Subproject commit 18e4fa961c30d231471fb69697646b8410a3a7d7
+Subproject commit 2bfa78675a41f00cb69b51e83281aeb23a3a29cc
diff --git a/rag-infrastructure b/rag-infrastructure
index 026bf42f..43736e15 160000
--- a/rag-infrastructure
+++ b/rag-infrastructure
@@ -1 +1 @@
-Subproject commit 026bf42f1826807451cd3660b402ba7f7cee4b0d
+Subproject commit 43736e1589f178d8d837bfbf0b720ba373ae196e