diff --git a/.circleci/config.yml b/.circleci/config.yml
index 726eea59e..e09beb18b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -59,14 +59,12 @@ commands:
             zypper --non-interactive --gpg-auto-import-keys install
             lsb-release
             rpm-build
-            rpmdevtools
             git
             tar
             make
             cmake
             gcc
             gcc-c++
-            pkg-config
             gettext-tools
             glibc-devel
             libboost_headers-devel
@@ -84,7 +82,6 @@ commands:
             gstreamer-plugins-base-devel
             libxine-devel
             vlc-devel
-            taglib-devel
             libQt5Core-devel
             libQt5Gui-devel
             libQt5Widgets-devel
@@ -347,6 +344,12 @@ jobs:
     environment:
       RPM_BUILD_NCPUS: "2"
     steps:
+      - run:
+          name: Update packages
+          command: zypper --non-interactive --gpg-auto-import-keys ref
+      - run:
+          name: Upgrade packages
+          command: zypper --non-interactive --gpg-auto-import-keys dup
       - install_opensuse_dependencies
       - checkout
       - cmake
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index aa52d460e..476c7ca56 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -6,13 +6,13 @@ jobs:
   build-linux:
     runs-on: ubuntu-latest
     container:
-      image: opensuse/tumbleweed
+      image: opensuse/leap:15.1
     steps:
     - uses: actions/checkout@v1
     - name: Update Packages
       run: zypper ref
     - name: Install Packages
-      run: zypper --non-interactive --gpg-auto-import-keys install lsb-release rpm-build rpmdevtools git tar make cmake gcc gcc-c++ pkg-config gettext-tools glibc-devel libboost_headers-devel boost-devel glib2-devel glib2-tools dbus-1-devel alsa-devel libnotify-devel libgnutls-devel protobuf-devel sqlite3-devel libpulse-devel gstreamer-devel gstreamer-plugins-base-devel libxine-devel vlc-devel taglib-devel libQt5Core-devel libQt5Gui-devel libQt5Widgets-devel libQt5Concurrent-devel libQt5Network-devel libQt5Sql-devel libQt5DBus-devel libQt5Test-devel libqt5-qtx11extras-devel libqt5-qtbase-common-devel libQt5Sql5-sqlite libqt5-linguist-devel libcdio-devel libgpod-devel libplist-devel libmtp-devel libusbmuxd-devel libchromaprint-devel desktop-file-utils update-desktop-files appstream-glib hicolor-icon-theme
+      run: zypper --non-interactive --gpg-auto-import-keys install lsb-release rpm-build git tar make cmake gcc gcc-c++ gettext-tools glibc-devel libboost_headers-devel boost-devel glib2-devel glib2-tools dbus-1-devel alsa-devel libnotify-devel libgnutls-devel protobuf-devel sqlite3-devel libpulse-devel gstreamer-devel gstreamer-plugins-base-devel libxine-devel vlc-devel taglib-devel libQt5Core-devel libQt5Gui-devel libQt5Widgets-devel libQt5Concurrent-devel libQt5Network-devel libQt5Sql-devel libQt5DBus-devel libQt5Test-devel libqt5-qtx11extras-devel libqt5-qtbase-common-devel libQt5Sql5-sqlite libqt5-linguist-devel libcdio-devel libgpod-devel libplist-devel libmtp-devel libusbmuxd-devel libchromaprint-devel desktop-file-utils update-desktop-files appstream-glib hicolor-icon-theme
     - name: Create Build Environment
       run: mkdir -p build
     - name: Configure CMake