diff --git a/bin/table_generator b/bin/table_generator
index 6c04b01d99f0aac019740fcaa4812420d0dd74ef..9af52e2c375e5f02f3582c17a33f7b0a675b357e 100755
--- a/bin/table_generator
+++ b/bin/table_generator
@@ -40,6 +40,26 @@ d_toolchains = {
     }
 }
 
+# List of packages to be ignored (due to deprecation, split in other
+# packages, consolidation or moved to a different toolchain)
+ignored_pkgs = [
+    'basemap', # Deprecated in favour of Cartopy
+    'iccifort', # Renamed to intel-compilers
+    'itstool', # Renamed to ITSTool
+    'libfabric', # Not needed, since we won't install OpenMPI in JURECA booster (only place where it was relevant)
+    'meld', # meld is broken (segmentation fault) and it pulls in too much packages for something not so important
+    'nvptx-tools', # Integrated in GCC
+    'parallel-netcdf', # Renamed to PnetCDF
+    'scikit', # Split in multiple packages
+    'unzip', # Renamed to UnZip
+    'Boost', # Moved to GCCcore, so let's remove it here so it doesn't show up in MPI toolchains
+    'Boost.Python', # Moved to GCCcore, so let's remove it here so it doesn't show up in MPI toolchains
+    'Elemental', # Deprecated, let's drop it
+    'HDFView', # Latest release not compatible with latest HDF5, so let's ignore it for the time being
+    'Julia.CUDA', # Integrated in Julia
+    'Julia.MPI', # Integrated in Julia
+]
+
 def find_eb_files(path):
     eb_files = []
     for root, dirs, files in os.walk(path):
@@ -64,7 +84,7 @@ def sw_loop(eb_files):
     toolchains = d_toolchains['base'] + d_toolchains['compiler'] + [t for t in d_toolchains['mpi']] + [
         t for sublist in list(d_toolchains['mpi'].values()) for t in sublist]
 
-    version_matcher = re.compile('^[0-9]+')
+    version_matcher = re.compile('^v?[0-9]+')
 
     sw_dict = {}
 
@@ -74,7 +94,7 @@ def sw_loop(eb_files):
         eb_l = eb.split('-')
         eb_name = eb_l[0]
 
-        if eb_name == 'iccifort':
+        if eb_name in ignored_pkgs or '-'.join([eb_name, eb_l[1]]) in ignored_pkgs:
             continue
 
         if eb_l[1] == 'settings':
@@ -146,7 +166,7 @@ def table_formatter(table, compare_repo=False):
     global html
 
     sw_name_max_len = 30
-    owner_max_len = 12
+    owner_max_len = 16
 
     if emojis:
         len_padding = 1