diff --git a/.github/workflows/container-release.yml b/.github/workflows/container-release.yml
index a9fc73a..cc3f66c 100644
--- a/.github/workflows/container-release.yml
+++ b/.github/workflows/container-release.yml
@@ -64,10 +64,10 @@ jobs:
           IMAGE_NAME=$(docker images --format "{{.Repository}}:{{.Tag}}" | grep "flaskapi-guard-example" | head -n 1)
           echo "Using image: ${IMAGE_NAME}"
 
-          docker tag ${IMAGE_NAME} ghcr.io/${{ github.repository_owner }}/flaskapi-guard-example:latest
-          docker push ghcr.io/${{ github.repository_owner }}/flaskapi-guard-example:latest
+          docker tag ${IMAGE_NAME} ghcr.io/guard-core/flaskapi-guard-example:latest
+          docker push ghcr.io/guard-core/flaskapi-guard-example:latest
 
           if [[ "${{ env.IS_RELEASE }}" == "true" ]]; then
-            docker tag ${IMAGE_NAME} ghcr.io/${{ github.repository_owner }}/flaskapi-guard-example:${{ env.VERSION }}
-            docker push ghcr.io/${{ github.repository_owner }}/flaskapi-guard-example:${{ env.VERSION }}
+            docker tag ${IMAGE_NAME} ghcr.io/guard-core/flaskapi-guard-example:${{ env.VERSION }}
+            docker push ghcr.io/guard-core/flaskapi-guard-example:${{ env.VERSION }}
           fi
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 025c738..dad8917 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   publish:
     runs-on: ubuntu-latest
-    # environment: pypi
+    environment: pypi
     permissions:
       id-token: write
       contents: read
@@ -24,20 +24,14 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install build twine
+          pip install build
 
       - name: Build package
         run: |
           python -m build
 
       - name: Publish package
-        env:
-          TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }}
-          TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
-        run: |
-          twine upload dist/*
-          echo "VERSION=${{ github.event.release.tag_name }}" >> $GITHUB_ENV
-
+        uses: pypa/gh-action-pypi-publish@release/v1
       - name: Get and Update Version
         id: get_version
         run: |
diff --git a/.github/workflows/upstream-drift.yml b/.github/workflows/upstream-drift.yml
index 1ef70ea..20cd83f 100644
--- a/.github/workflows/upstream-drift.yml
+++ b/.github/workflows/upstream-drift.yml
@@ -30,7 +30,7 @@ jobs:
       - name: Checkout guard-core@master
         uses: actions/checkout@v7
         with:
-          repository: rennf93/guard-core
+          repository: Guard-Core/guard-core
           ref: master
           path: guard-core-upstream
           persist-credentials: false