diff --git a/base-containers/base/Dockerfile b/base-containers/base/Dockerfile
index ffed1c2b0..f26e2facb 100644
--- a/base-containers/base/Dockerfile
+++ b/base-containers/base/Dockerfile
@@ -5,7 +5,7 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en  
 ENV LC_ALL en_US.UTF-8
 
-LABEL org.opencontainers.image.source=https://github.com/UCL-INGI/INGInious-containers
+LABEL org.opencontainers.image.source=https://github.com/INGInious/containers
 LABEL org.opencontainers.image.description="Base INGInious grading environment."
 
 LABEL org.inginious.grading.agent_version=3
diff --git a/base-containers/default/Dockerfile b/base-containers/default/Dockerfile
index f2500d9ed..0708c1a80 100644
--- a/base-containers/default/Dockerfile
+++ b/base-containers/default/Dockerfile
@@ -2,10 +2,10 @@
 
 #inherit from the base container, which have all the needed script to launch tasks
 ARG   VERSION=latest
-ARG   REGISTRY
+ARG   REGISTRY=ghcr.io
 FROM  ${REGISTRY}/inginious/env-base:${VERSION}
 
-LABEL org.opencontainers.image.source=https://github.com/UCL-INGI/INGInious-containers
+LABEL org.opencontainers.image.source=https://github.com/INGInious/containers
 LABEL org.opencontainers.image.description="Default INGInious grading environment."
 
 LABEL org.inginious.grading.name="default"