diff --git a/easybuild/easyconfigs/p/pkgconfig/pkgconfig-1.5.1-GCCcore-10.2.0-python.eb b/easybuild/easyconfigs/p/pkgconfig/pkgconfig-1.5.1-GCCcore-10.2.0-python.eb
index de705909718..f7ba3e761c5 100644
--- a/easybuild/easyconfigs/p/pkgconfig/pkgconfig-1.5.1-GCCcore-10.2.0-python.eb
+++ b/easybuild/easyconfigs/p/pkgconfig/pkgconfig-1.5.1-GCCcore-10.2.0-python.eb
@@ -20,8 +20,8 @@ dependencies = [
     ('pkg-config', '0.29.2'),
 ]
 
-# Due to poetry doing the actual build of pkgconfig we need use_pip=False
-use_pip = False
+use_pip = True
 download_dep_fail = True
+sanity_pip_check = True
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/pkgconfig/pkgconfig-1.5.1-GCCcore-8.2.0-python.eb b/easybuild/easyconfigs/p/pkgconfig/pkgconfig-1.5.1-GCCcore-8.2.0-python.eb
index b3341c2f66d..50045a6a21b 100644
--- a/easybuild/easyconfigs/p/pkgconfig/pkgconfig-1.5.1-GCCcore-8.2.0-python.eb
+++ b/easybuild/easyconfigs/p/pkgconfig/pkgconfig-1.5.1-GCCcore-8.2.0-python.eb
@@ -1,32 +1,26 @@
-easyblock = 'PythonBundle'
+easyblock = 'PythonPackage'
 
 name = 'pkgconfig'
 version = '1.5.1'
 versionsuffix = '-python'
 
-homepage = 'http://github.com/matze/pkgconfig'
+homepage = 'https://github.com/matze/pkgconfig'
 description = """pkgconfig is a Python module to interface with the pkg-config command line tool"""
 
 toolchain = {'name': 'GCCcore', 'version': '8.2.0'}
 
+sources = ['%(name)s-%(version)s-py2.py3-none-any.whl']
+checksums = ['cddf2d7ecadb272178a942eb852a9dee46bda2adcc36c3416b0fef47a4ed9f38']
+unpack_sources = False
+
 multi_deps = {'Python': ['3.7.2', '2.7.15']}
 
 builddependencies = [('binutils', '2.31.1')]
 
 dependencies = [('pkg-config', '0.29.2')]
 
-# Due to poetry doing the actual build of pkgconfig we need use_pip=False
-use_pip = False
-
-exts_list = [
-    ('poetry', '0.12.12', {
-        'source_urls': ['https://pypi.python.org/packages/source/p/poetry/'],
-        'checksums': ['726420e7519e069d9245ebac3f1c367b7ef9aca420c6911a9261772c7c814a2d'],
-    }),
-    (name, version, {
-        'source_urls': ['https://pypi.python.org/packages/source/p/pkgconfig/'],
-        'checksums': ['97bfe3d981bab675d5ea3ef259045d7919c93897db7d3b59d4e8593cba8d354f'],
-    }),
-]
+use_pip = True
+download_dep_fail = True
+sanity_pip_check = True
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/pkgconfig/pkgconfig-1.5.1-GCCcore-8.3.0-Python-3.7.4.eb b/easybuild/easyconfigs/p/pkgconfig/pkgconfig-1.5.1-GCCcore-8.3.0-Python-3.7.4.eb
index 2e5d702fb16..aa70a35a310 100644
--- a/easybuild/easyconfigs/p/pkgconfig/pkgconfig-1.5.1-GCCcore-8.3.0-Python-3.7.4.eb
+++ b/easybuild/easyconfigs/p/pkgconfig/pkgconfig-1.5.1-GCCcore-8.3.0-Python-3.7.4.eb
@@ -1,4 +1,4 @@
-easyblock = 'PythonBundle'
+easyblock = 'PythonPackage'
 
 name = 'pkgconfig'
 version = '1.5.1'
@@ -9,6 +9,10 @@ description = """pkgconfig is a Python module to interface with the pkg-config c
 
 toolchain = {'name': 'GCCcore', 'version': '8.3.0'}
 
+sources = ['%(name)s-%(version)s-py2.py3-none-any.whl']
+checksums = ['cddf2d7ecadb272178a942eb852a9dee46bda2adcc36c3416b0fef47a4ed9f38']
+unpack_sources = False
+
 builddependencies = [('binutils', '2.32')]
 
 dependencies = [
@@ -16,18 +20,8 @@ dependencies = [
     ('pkg-config', '0.29.2'),
 ]
 
-# Due to poetry doing the actual build of pkgconfig we need use_pip=False
-use_pip = False
-
-exts_list = [
-    ('poetry', '0.12.17', {
-        'source_urls': ['https://pypi.python.org/packages/source/p/poetry/'],
-        'checksums': ['6e535de38df7e6ab46ff8d197f53632b071675287d1477efc7bf4a5c4c63bc3f'],
-    }),
-    (name, version, {
-        'source_urls': ['https://pypi.python.org/packages/source/p/pkgconfig/'],
-        'checksums': ['97bfe3d981bab675d5ea3ef259045d7919c93897db7d3b59d4e8593cba8d354f'],
-    }),
-]
+use_pip = True
+download_dep_fail = True
+sanity_pip_check = True
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/pkgconfig/pkgconfig-1.5.1-GCCcore-9.3.0-Python-3.8.2.eb b/easybuild/easyconfigs/p/pkgconfig/pkgconfig-1.5.1-GCCcore-9.3.0-Python-3.8.2.eb
index d4568e8c6c5..68ac38093cb 100644
--- a/easybuild/easyconfigs/p/pkgconfig/pkgconfig-1.5.1-GCCcore-9.3.0-Python-3.8.2.eb
+++ b/easybuild/easyconfigs/p/pkgconfig/pkgconfig-1.5.1-GCCcore-9.3.0-Python-3.8.2.eb
@@ -1,4 +1,4 @@
-easyblock = 'PythonBundle'
+easyblock = 'PythonPackage'
 
 name = 'pkgconfig'
 version = '1.5.1'
@@ -9,26 +9,21 @@ description = """pkgconfig is a Python module to interface with the pkg-config c
 
 toolchain = {'name': 'GCCcore', 'version': '9.3.0'}
 
-builddependencies = [('binutils', '2.34')]
+sources = [SOURCE_TAR_GZ]
+checksums = ['97bfe3d981bab675d5ea3ef259045d7919c93897db7d3b59d4e8593cba8d354f']
+
+builddependencies = [
+    ('binutils', '2.34'),
+    ('poetry', '1.0.9', versionsuffix),
+]
 
 dependencies = [
     ('Python', '3.8.2'),
     ('pkg-config', '0.29.2'),
 ]
 
-# Due to poetry doing the actual build of pkgconfig we need use_pip=False
-use_pip = False
-
-exts_list = [
-    # Not updating this since it is basically a build dep
-    ('poetry', '0.12.17', {
-        'source_urls': ['https://pypi.python.org/packages/source/p/poetry/'],
-        'checksums': ['6e535de38df7e6ab46ff8d197f53632b071675287d1477efc7bf4a5c4c63bc3f'],
-    }),
-    (name, version, {
-        'source_urls': ['https://pypi.python.org/packages/source/p/pkgconfig/'],
-        'checksums': ['97bfe3d981bab675d5ea3ef259045d7919c93897db7d3b59d4e8593cba8d354f'],
-    }),
-]
+use_pip = True
+download_dep_fail = True
+sanity_pip_check = True
 
 moduleclass = 'devel'