diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a6228131..8ea6a48e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,9 +20,9 @@ jobs:
     strategy:
       matrix:
         node-version: [15.x]
-        os: [ubuntu-16.04, windows-latest, macos-latest]
+        os: [ubuntu-18.04, windows-latest, macos-latest]
         include:
-          - os: ubuntu-16.04
+          - os: ubuntu-18.04
             friendlyName: Ubuntu
           - os: windows-latest
             friendlyName: Windows
@@ -42,12 +42,15 @@ jobs:
                              gnome-keyring \
                              libsecret-1-dev \
                              dbus-x11 \
-                             python-gnomekeyring
-      if: ${{ matrix.os == 'ubuntu-16.04' }}
+                             python3-keyring \
+                             python3
+      if: ${{ matrix.os == 'ubuntu-18.04' }}
       name: Install additional dependencies
 
-    - run: npm install
-      name: Setup environment
+    - name: Setup environment
+      run: |
+        npm install
+        npm run build
 
     - run: |
         echo "Initialize dbus..."
@@ -57,13 +60,13 @@ jobs:
         eval $(echo -n "" | /usr/bin/gnome-keyring-daemon --login)
         eval $(/usr/bin/gnome-keyring-daemon --components=secrets --start)
         echo "Create a test key using script..."
-        python -c "import gnomekeyring;gnomekeyring.create_sync('login', '');"
+        python -c "import keyring;keyring.set_password('login', '');"
         npm test
-      if: ${{ matrix.os == 'ubuntu-16.04' }}
+      if: ${{ matrix.os == 'ubuntu-18.04' }}
       name: Run tests (Linux)
 
     - run: npm test
-      if: ${{ matrix.os != 'ubuntu-16.04' }}
+      if: ${{ matrix.os != 'ubuntu-18.04' }}
       name: Run tests (Windows/macOS)
 
     - run: |
@@ -83,7 +86,7 @@ jobs:
         docker run --rm -v ${PWD}:/project node-keytar/i386 /bin/bash -c "cd /project && npm run prebuild-electron-ia32 && rm -rf build"
         docker build -t node-keytar/arm64-cross-compile docker/arm64-cross-compile
         docker run --rm -v ${PWD}:/project node-keytar/arm64-cross-compile /bin/bash -c "cd /project && npm run prebuild-electron-arm64"
-      if: ${{ matrix.os == 'ubuntu-16.04' }}
+      if: ${{ matrix.os == 'ubuntu-18.04' }}
       name: Prebuild (Linux x86 + ARM64)
 
     - run: |
@@ -103,10 +106,12 @@ jobs:
     - uses: actions/checkout@v2
     - name: install additional dependencies
       run: |
-        apk add g++ make python2 libsecret-dev
+        apk add g++ make python3 libsecret-dev
 
-    - run: npm install
-      name: Setup environment
+    - name: Setup environment
+      run: |
+        npm install
+        npm run build
 
     - run: |
         npm run prebuild-node
@@ -139,7 +144,7 @@ jobs:
         node-version: 15.x
         registry-url: 'https://registry.npmjs.org'
 
-    - run: sudo apt-get install libsecret-1-dev
+    - run: sudo apt-get install libsecret-1-dev python3
       name: Install additional dependencies
 
     - run: npm install