diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index f50bf42b..2407beed 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -40,7 +40,7 @@
 				"ms-azuretools.vscode-docker",
 				"ritwickdey.LiveServer",
 				"ms-vscode.makefile-tools",
-				"bungcip.better-toml",
+				"tamasfe.even-better-toml",
 				"ms-python.vscode-pylance",
 				"ms-azuretools.vscode-docker"
 			]
diff --git a/.github/workflows/release-package.yml b/.github/workflows/release-package.yml
index 02fb4507..3f4a2235 100644
--- a/.github/workflows/release-package.yml
+++ b/.github/workflows/release-package.yml
@@ -7,6 +7,9 @@ on:
 jobs:
   main:
     runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+    environment: pypi
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python 3.10
@@ -19,9 +22,10 @@ jobs:
       - name: Build package
         run: |
           make build
+      - name: Publish package to Pypi
+        uses: pypa/gh-action-pypi-publish@release/v1
         env:
-          TWINE_USERNAME: ${{ secrets.pypi_username }}
-          TWINE_PASSWORD: ${{ secrets.pypi_password }}
+          repository-url: https://pypi.org/project/UnleashClient/
       - name: Build docs
         run: |
           make install-docs
diff --git a/Makefile b/Makefile
index 5c2acc1a..9ac45091 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ test: lint pytest specification-test
 
 precommit: clean generate-requirements
 
-build: clean build-package upload
+build: clean build-package
 
 build-local: clean build-package
 
@@ -63,9 +63,6 @@ clean:
 build-package:
 	python -m build
 
-upload:
-	twine upload dist/*
-
 #-----------------------------------------------------------------------
 # Docs
 #-----------------------------------------------------------------------