diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 6d3ed08b..7e91ed8e 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -10,9 +10,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout branch
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
       - name: Setup python and install packages
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v2
         with:
           python-version: '3.6'
           architecture: x64
@@ -20,5 +20,6 @@ jobs:
         if: success()
         run: |
           pip install "poetry>=1.0.2"
+          poetry config pypi-token.pypi ${{ secrets.PYPI_API_TOKEN }}
           poetry build
-          poetry publish --username "${{ secrets.PYPI_USER }}" --password "${{ secrets.PYPI_PASSWORD }}"
+          poetry publish
diff --git a/.github/workflows/release-prep.yml b/.github/workflows/release-prep.yml
index d56523ed..fea84f7a 100644
--- a/.github/workflows/release-prep.yml
+++ b/.github/workflows/release-prep.yml
@@ -10,15 +10,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout branch
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
       - name: Setup python and install packages
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v2
         with:
           python-version: '3.6'
           architecture: x64
       - name: Check version change
         run: |
-          MASTER_VERSION="$(git show origin/master:pyproject.toml | sed -n -E "s/^version = \"(.+)\"/\1/p")"
+          git fetch origin master:master
+          MASTER_VERSION="$(git show master:pyproject.toml | sed -n -E "s/^version = \"(.+)\"/\1/p")"
           NEW_VERSION="$(sed -n -E "s/^version = \"(.+)\"/\1/p" pyproject.toml)"
           echo "Version on master: ${MASTER_VERSION}"
           echo "Version on release-prep: ${NEW_VERSION}"
@@ -31,9 +32,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout branch
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
       - name: Setup python and install packages
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v2
         with:
           python-version: '3.6'
           architecture: x64
@@ -51,6 +52,7 @@ jobs:
           mkdir -p ${HOME}/.esque
           poetry config repositories.devpi http://localhost:3141/root/stable/
           poetry config repositories.testpypi https://test.pypi.org/legacy/
+          poetry config pypi-token.testpypi ${{ secrets.TEST_PYPI_API_TOKEN }}
       - name: Publish to devpi
         if: success()
         run: |
@@ -71,7 +73,8 @@ jobs:
         if: success()
         run: |
           VERSION=$(sed -n -E "s/^version = \"(.+)\"/\1/p" pyproject.toml)
-          BUILD=$(git rev-list --count HEAD...origin/master)
+          git fetch origin master:master
+          BUILD=$(git rev-list --count HEAD...master)
           sed -i -E "s/^version = .*/version = \"${VERSION}.dev${BUILD}\"/" pyproject.toml
           poetry build
-          poetry publish --repository testpypi --username ${{ secrets.TEST_PYPI_USER }} --password ${{ secrets.TEST_PYPI_PASSWORD }}
\ No newline at end of file
+          poetry publish --repository testpypi
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index b90c24ae..973d18ec 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -16,9 +16,9 @@ jobs:
         python: ['3.6']
         os: ['ubuntu-latest']
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - name: Setup python
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python }}
           architecture: x64
@@ -37,7 +37,7 @@ jobs:
         python: ['3.6', '3.7', '3.8' ]
         librdkafka: ['1.1.0']
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - name: Fetch virtualenv cache
         uses: actions/cache@v1
         id: venv-cache
@@ -52,7 +52,7 @@ jobs:
           path: librdkafka
           key: librdkafka-${{ matrix.librdkafka }}
       - name: Setup python and install packages
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python }}
           architecture: x64