diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..d93834d
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,69 @@
+---
+include:
+  - local: .gitlab-ci/versioning/gitversion.yml
+  - local: .gitlab-ci/git/create_tag.yml
+
+stages:
+  - build
+  - release
+
+gitversion:
+  extends: .versioning:gitversion
+  stage: .pre
+  tags:
+    - gitlab-org-docker
+  rules:
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Run this job when commits are pushed or merged to the default branch
+
+build:
+  stage: build
+  image: python:3.9.21
+  tags:
+    - gitlab-org-docker
+  rules:
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Run this job when commits are pushed or merged to the default branch
+  needs:
+    - job: gitversion
+      artifacts: true
+  script:
+    - sed -i "s/^__version__ = .*/__version__ = \"${GitVersion_MajorMinorPatch}\"/" src/PyPiUpdater/__init__.py
+    - cat src/PyPiUpdater/__init__.py
+    - python3 -m pip install build
+    - python3 -m build
+  artifacts:
+    paths:
+      - dist/*
+    expire_in: 1 day
+
+publish:
+  stage: release
+  image: python:3.9.21
+  tags:
+    - gitlab-org-docker
+  rules:
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Run this job when commits are pushed or merged to the default branch
+  variables:
+    TWINE_USERNAME: "__token__"
+    TWINE_PASSWORD: $TWINE_API
+  needs:
+    - job: build
+      artifacts: true
+  script:
+    - python3 -m pip install twine
+    - python3 -m twine upload dist/*
+
+create_tag:
+  extends: .git:create_tag
+  stage: release
+  tags:
+    - gitlab-org-docker
+  variables:
+    VERSION: $GitVersion_SemVer
+    TOKEN: $GITLAB_TOKEN
+  needs:
+    - job: gitversion
+      artifacts: true
+  rules:
+    - if: $CI_COMMIT_TAG
+      when: never # Do not run this job when a tag is created manually
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Run this job when commits are pushed or merged to the default branch
diff --git a/.woodpecker/woodpecker_ci.yml b/.woodpecker/woodpecker_ci.yml
index c531675..e015764 100644
--- a/.woodpecker/woodpecker_ci.yml
+++ b/.woodpecker/woodpecker_ci.yml
@@ -42,7 +42,7 @@ steps:
       - git config --global user.email "ci@noreply.boxyfoxy.net"
       - git config --global user.name "CI Bot"
       - git remote set-url origin https://CodeByMrFinchum:$${CI_TOKEN}@code.boxyfoxy.net/$${CI_REPO}.git
-      - . gitversion.env
+      - source gitversion.env
       - git tag $GitVersion_SemVer
       - git push origin tag $GitVersion_SemVer
 
@@ -54,14 +54,13 @@ steps:
     image: python:3.9.21
     commands:
       - ls
-      - cat gitversion.env
-      - export $(cat gitversion.env | xargs)
+      - source gitversion.env
       - sed -i "s/^__version__ = .*/__version__ = \"$GitVersion_SemVer\"/" src/PyPiUpdater/__init__.py
       - cat src/PyPiUpdater/__init__.py
       - python3 -m pip install build
       - python3 -m build
 
-  - name: publish_pypi
+  - name: release
     depends_on: [gitversion, tagging, build]
     when:
       event: push
@@ -75,18 +74,3 @@ steps:
       - ls
       - python3 -m pip install twine
       - python3 -m twine upload dist/*
-
-  - name: publish_forgejo
-    depends_on: [gitversion, tagging, build]
-    when:
-      event: push
-      branch: main
-    image: python:3.9.21
-    environment:
-      TWINE_PASSWORD:
-        from_secret: PKG_TOKEN
-      TWINE_USERNAME: "CodeByMrFinchum"
-    commands:
-      - ls
-      - python3 -m pip install twine
-      - python3 -m twine upload --verbose --repository-url https://code.boxyfoxy.net/api/packages/CodeByMrFinchum/pypi dist/*
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e847e5..c7a8815 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,5 @@
 # Changelog
 
-## 0.8-0.9: CI woodpecker (25.04.10-11)
-- Changes to the pipeline no
-
 ## 0.7.x
 ### 0.7.2: Removed Debugging Leftovers
 - Cleaned up code used for debugging.
diff --git a/README.md b/README.md
index ceb666a..c3f04c1 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,4 @@
 # PyPiUpdater
-Developed on my [forgejo instance](https://code.boxyfoxy.net/CodeByMrFinchum), [GitLab](https://gitlab.com/CodeByMrFinchum) is used as backup.
-
 **UNFINISHED** Still early code, functions might change drasticly
 
 **PyPiUpdater** is a Python library for managing updates of packages installed via `pip`.
diff --git a/pip_README.md b/pip_README.md
index 81c43b3..2fb85ac 100644
--- a/pip_README.md
+++ b/pip_README.md
@@ -1,3 +1,3 @@
 Simple program to update package from PyPi with pip.
 
-For more info see [PyPiUpdater forgejo](https://code.boxyfoxy.net/CodeByMrFinchum/PyPiUpdater) or backup repo [PyPiUpdater gitlab](https://gitlab.com/CodeByMrFinchum/PyPiUpdater#).
+For more info see [PyPiUpdater gitlab](https://gitlab.com/CodeByMrFinchum/PyPiUpdater#).