diff --git a/conf/modules.config b/conf/modules.config
index 8c341266..ebb54516 100644
--- a/conf/modules.config
+++ b/conf/modules.config
@@ -52,18 +52,18 @@ process {
 
     withLabel: zstd {
         ext.conda = "$projectDir/environments/zstd/environment.yml"
-        ext.singularity = 'oras://dockerhub.ebi.ac.uk/gdp-public/pgsc_calc/singularity/zstd'
-        ext.singularity_version = ':amd64-1.4.8'
-        ext.docker = 'dockerhub.ebi.ac.uk/gdp-public/pgsc_calc/zstd'
-        ext.docker_version = ':1.4.8'
+        ext.singularity = 'oras://ghcr.io/pgscatalog/zstd'
+        ext.singularity_version = ':2-beta-singularity'
+        ext.docker = 'ghcr.io/pgscatalog/zstd'
+        ext.docker_version = ':2-beta'
     }
 
     withLabel: report {
         ext.conda = "$projectDir/environments/report/environment.yml"
-        ext.singularity = 'oras://dockerhub.ebi.ac.uk/gdp-public/pgsc_calc/singularity/report'
-        ext.singularity_version = ':2.00a5'
-        ext.docker = 'dockerhub.ebi.ac.uk/gdp-public/pgsc_calc/report'
-        ext.docker_version = ':2.00a5'
+        ext.singularity = 'oras://ghcr.io/pgscatalog/report'
+        ext.singularity_version = ':2-beta-singularity'
+        ext.docker = 'ghcr.io/pgscatalog/report'
+        ext.docker_version = ':2-beta'
     }
 
     withLabel: pyyaml {